[pypy-svn] r13442 - pypy/branch/pycompiler/module/recparser

[adim at codespeak.net]

Author: adim
Date: Wed Jun 15 16:24:39 2005
New Revision: 13442

Modified:
   pypy/branch/pycompiler/module/recparser/__init__.py
   pypy/branch/pycompiler/module/recparser/ebnfparse.py
   pypy/branch/pycompiler/module/recparser/tuplebuilder.py
Log:
misc tidy


Modified: pypy/branch/pycompiler/module/recparser/__init__.py
==============================================================================
--- pypy/branch/pycompiler/module/recparser/__init__.py	(original)
+++ pypy/branch/pycompiler/module/recparser/__init__.py	Wed Jun 15 16:24:39 2005
@@ -7,6 +7,11 @@
 import pythonparse
 debug_print( "Loading grammar %s" % pythonparse.PYTHON_GRAMMAR )
 
+from pypy.interpreter.mixedmodule import MixedModule
+class Module(MixedModule):
+    interpleveldefs = {}
+    appleveldefs = {}
+
 ## from pypy.interpreter.mixedmodule import MixedModule 
 ## class Module(MixedModule):
 ##     """The builtin parser module. 

Modified: pypy/branch/pycompiler/module/recparser/ebnfparse.py
==============================================================================
--- pypy/branch/pycompiler/module/recparser/ebnfparse.py	(original)
+++ pypy/branch/pycompiler/module/recparser/ebnfparse.py	Wed Jun 15 16:24:39 2005
@@ -75,6 +75,7 @@
 
 
 class EBNFVisitor(object):
+    
     def __init__(self):
         self.rules = {}
         self.terminals = {}

Modified: pypy/branch/pycompiler/module/recparser/tuplebuilder.py
==============================================================================
--- pypy/branch/pycompiler/module/recparser/tuplebuilder.py	(original)
+++ pypy/branch/pycompiler/module/recparser/tuplebuilder.py	Wed Jun 15 16:24:39 2005
@@ -3,43 +3,43 @@
 from syntaxtree import TOKEN_MAP, SYMBOLS # , NT_OFFSET
 
 
-def _expand_nodes( nodes ):
+def _expand_nodes(nodes):
     expanded = []
     for n in nodes:
-        if n[0]==-2:
-            expanded.extend( expand_nodes(n[1:]) )
+        if n[0] == -2:
+            expanded.extend(expand_nodes(n[1:]))
         else:
             expanded.append(n)
     return tuple(expanded)
 
-def expand_nodes( nodes ):
-    r = _expand_nodes( nodes )
+def expand_nodes(nodes):
+    r = _expand_nodes(nodes)
     for n in nodes:
-        assert type(n[0])==int
+        assert type(n[0]) == int
     return r
 
 class TupleBuilder(BaseGrammarBuilder):
     """A builder that directly produce the AST"""
 
-    def __init__( self, rules=None, debug=0, lineno=True ):
+    def __init__(self, rules=None, debug=0, lineno=True):
         BaseGrammarBuilder.__init__(self, rules, debug )
         self.lineno = lineno
 
-    def alternative( self, rule, source ):
+    def alternative(self, rule, source):
         # Do nothing, keep rule on top of the stack
         if rule.is_root():
             node = [ SYMBOLS.get( rule.name, (0,rule.name) ) ]
-            node +=  expand_nodes( [self.stack[-1]] )
+            node += expand_nodes( [self.stack[-1]] )
             self.stack[-1] = tuple(node)
         return True
 
     def sequence(self, rule, source, elts_number):
         """ """
         if rule.is_root():
-            node  = [ SYMBOLS.get( rule.name, (0,rule.name) ) ]
+            node = [SYMBOLS.get( rule.name, (0, rule.name) )]
         else:
-            node = [ -2 ]
-        if elts_number>0:
+            node = [-2]
+        if elts_number > 0:
             node += expand_nodes( self.stack[-elts_number:] )
             self.stack[-elts_number:] = [tuple(node)]
         else:
@@ -47,7 +47,7 @@
         return True
 
     def token(self, name, value, source):
-        num = TOKEN_MAP.get( name, -1)
+        num = TOKEN_MAP.get(name, -1)
         lineno = source.current_line()
         if value is None:
             if name not in ("NEWLINE", "INDENT", "DEDENT", "ENDMARKER"):