[pypy-svn] r14862 - pypy/dist/pypy/interpreter/pyparser

[ludal at codespeak.net]

Author: ludal
Date: Thu Jul 21 15:42:48 2005
New Revision: 14862

Modified:
   pypy/dist/pypy/interpreter/pyparser/grammar.py
   pypy/dist/pypy/interpreter/pyparser/pythonparse.py
Log:
 this is probably not RPython so change it


Modified: pypy/dist/pypy/interpreter/pyparser/grammar.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/grammar.py	(original)
+++ pypy/dist/pypy/interpreter/pyparser/grammar.py	Thu Jul 21 15:42:48 2005
@@ -155,17 +155,21 @@
         items = []
         for node in self.stack[-elts_number:]:
             items += node.expand()
-        if rule.is_root():
-            node_type = SyntaxNode
-        else:
-            node_type = TempSyntaxNode
+        is_root = rule.is_root()
         # replace N elements with 1 element regrouping them
         if elts_number >= 1:
-            elem = node_type(rule.codename, source, items)
+            if is_root:
+                elem = SyntaxNode(rule.codename, source, items)
+            else:
+                elem = TempSyntaxNode(rule.codename, source, items)
             del self.stack[-elts_number:]
             self.stack.append(elem)
         elif elts_number == 0:
-            self.stack.append(node_type(rule.codename, source, []))
+            if is_root:
+                self.stack.append(SyntaxNode(rule.codename, source, []))
+            else:
+                self.stack.append(TempSyntaxNode(rule.codename, source, []))
+                
         if self.debug:
             self.stack[-1].dumpstr()
         return True

Modified: pypy/dist/pypy/interpreter/pyparser/pythonparse.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/pythonparse.py	(original)
+++ pypy/dist/pypy/interpreter/pyparser/pythonparse.py	Thu Jul 21 15:42:48 2005
@@ -41,8 +41,8 @@
         target = self.rules[goalnumber]
         src = Source(lines, flags)
         
-        if builder is None:
-            builder = grammar.BaseGrammarBuilder(debug=False, rules=self.rules)
+#        if builder is None:
+#            builder = grammar.BaseGrammarBuilder(debug=False, rules=self.rules)
         result = target.match(src, builder)
         # <HACK> XXX find a clean way to process encoding declarations
         builder.source_encoding = src.encoding