[pypy-svn] r63753 - pypy/trunk/pypy/interpreter/stablecompiler

[benjamin at codespeak.net]

Author: benjamin
Date: Mon Apr  6 23:50:03 2009
New Revision: 63753

Modified:
   pypy/trunk/pypy/interpreter/stablecompiler/ast.py
   pypy/trunk/pypy/interpreter/stablecompiler/transformer.py
Log:
hack stablecompiler, so test_astbuilder passes

Modified: pypy/trunk/pypy/interpreter/stablecompiler/ast.py
==============================================================================
--- pypy/trunk/pypy/interpreter/stablecompiler/ast.py	(original)
+++ pypy/trunk/pypy/interpreter/stablecompiler/ast.py	Mon Apr  6 23:50:03 2009
@@ -524,19 +524,20 @@
         return "For(%s, %s, %s, %s)" % (repr(self.assign), repr(self.list), repr(self.body), repr(self.else_))
 
 class From(Node):
-    def __init__(self, modname, names, lineno=None):
+    def __init__(self, modname, names, level, lineno=None):
         self.modname = modname
         self.names = names
+        self.level = level
         self.lineno = lineno
 
     def getChildren(self):
-        return self.modname, self.names
+        return self.modname, self.names, self.level
 
     def getChildNodes(self):
         return ()
 
     def __repr__(self):
-        return "From(%s, %s)" % (repr(self.modname), repr(self.names))
+        return "From(%s, %s, %d)" % (repr(self.modname), repr(self.names), self.level)
 
 class Function(Node):
     def __init__(self, decorators, name, argnames, defaults, flags, doc, code, lineno=None):

Modified: pypy/trunk/pypy/interpreter/stablecompiler/transformer.py
==============================================================================
--- pypy/trunk/pypy/interpreter/stablecompiler/transformer.py	(original)
+++ pypy/trunk/pypy/interpreter/stablecompiler/transformer.py	Mon Apr  6 23:50:03 2009
@@ -484,7 +484,7 @@
         fromname = self.com_dotted_name(nodelist[1])
         if nodelist[3][0] == stable_parser.tokens['STAR']:
             return From(fromname, [('*', None)],
-                        lineno=nodelist[0][2])
+                        0, lineno=nodelist[0][2])
         else:
             if nodelist[3][0] == stable_parser.tokens['LPAR']:
                 node = nodelist[4]
@@ -493,7 +493,7 @@
                 if node[-1][0] == stable_parser.tokens['COMMA']:
                     self.syntaxerror("trailing comma not allowed without surrounding parentheses", node)
             return From(fromname, self.com_import_as_names(node),
-                        lineno=nodelist[0][2])
+                        0, lineno=nodelist[0][2])
 
     def global_stmt(self, nodelist):
         # global: NAME (',' NAME)*