[pypy-svn] r35939 - in pypy/branch/ast-experiments/pypy/interpreter: . pyparser pyparser/test stablecompiler

[adim at codespeak.net]

Author: adim
Date: Thu Dec 21 17:40:55 2006
New Revision: 35939

Modified:
   pypy/branch/ast-experiments/pypy/interpreter/pycompiler.py
   pypy/branch/ast-experiments/pypy/interpreter/pyparser/astbuilder.py
   pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonparse.py
   pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonutil.py
   pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astbuilder.py
   pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astcompiler.py
   pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_pytokenizer.py
   pypy/branch/ast-experiments/pypy/interpreter/stablecompiler/transformer.py
Log:
renamed get_pyparser_for_version to make_pyparser

Modified: pypy/branch/ast-experiments/pypy/interpreter/pycompiler.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/pycompiler.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/pycompiler.py	Thu Dec 21 17:40:55 2006
@@ -200,10 +200,9 @@
          the whole source after having only added a new '\n')
     """
     def __init__(self, space):
-        from pyparser.pythonparse import get_pyparser_for_version
-        from pypy.tool.option import Options
+        from pyparser.pythonparse import make_pyparser
         PyCodeCompiler.__init__(self, space)
-        self.parser = get_pyparser_for_version(Options.version)
+        self.parser = make_pyparser()
         self.additional_rules = {}
 
     

Modified: pypy/branch/ast-experiments/pypy/interpreter/pyparser/astbuilder.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/pyparser/astbuilder.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/pyparser/astbuilder.py	Thu Dec 21 17:40:55 2006
@@ -1062,6 +1062,7 @@
     """A builder that directly produce the AST"""
 
     def __init__(self, parser=None, debug=0, space=None):
+        # XXX: parser must become mandatory
         if parser is None:
             from pythonparse import PYTHON_PARSER
             parser = pythonparse.PYTHON_PARSER

Modified: pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonparse.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonparse.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonparse.py	Thu Dec 21 17:40:55 2006
@@ -173,14 +173,14 @@
 
 
 
-def get_pyparser_for_version(version):
+def make_pyparser(version=Options.version):
     parser = PythonParser(predefined_symbols=symbol.sym_name)
     return build_parser_for_version(version, parser=parser)
 
 # unfortunately the command line options are not parsed yet
-debug_print( "Loading grammar %s" % Options.version )
+# debug_print( "Loading grammar %s" % Options.version )
 # XXX: remove PYTHON_PARSER
-PYTHON_PARSER = get_pyparser_for_version(Options.version)
+PYTHON_PARSER = make_pyparser()
 
 ## XXX BROKEN
 ## def grammar_rules( space ):

Modified: pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonutil.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonutil.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/pyparser/pythonutil.py	Thu Dec 21 17:40:55 2006
@@ -69,19 +69,19 @@
 
 
 def pypy_parse(source, mode='exec', lineno=False):
-    from pypy.interpreter.pyparser.pythonparse import PythonParser, get_pyparser_for_version
+    from pypy.interpreter.pyparser.pythonparse import PythonParser, make_pyparser
     from pypy.interpreter.pyparser.astbuilder import AstBuilder
     # parser = build_parser_for_version("2.4", PythonParser())
-    parser = get_pyparser_for_version('2.4')
+    parser = make_pyparser('2.4')
     builder = TupleBuilder(parser)
     parser.parse_source(source, mode, builder)
     return builder.stack[-1].as_tuple(lineno)
 
 
 def source2ast(source, mode='exec', version='2.4', space=None):
-    from pypy.interpreter.pyparser.pythonparse import PythonParser, get_pyparser_for_version
+    from pypy.interpreter.pyparser.pythonparse import PythonParser, make_pyparser
     from pypy.interpreter.pyparser.astbuilder import AstBuilder
-    parser = get_pyparser_for_version(version)
+    parser = make_pyparser(version)
     builder = AstBuilder(parser, space=space)
     parser.parse_source(source, mode, builder)
     return builder

Modified: pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astbuilder.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astbuilder.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astbuilder.py	Thu Dec 21 17:40:55 2006
@@ -1,5 +1,4 @@
 import os
-from pypy.tool.option import Options
 
 from pypy.interpreter.pyparser import pythonparse
 from pypy.interpreter.pyparser.astbuilder import AstBuilder
@@ -210,8 +209,8 @@
     builtin = dict(int=int, long=long, float=float, complex=complex)
 
 # Create parser from Grammar_stable, not current grammar.
-stable_parser = pythonparse.get_pyparser_for_version('stable')
-python_parser = pythonparse.get_pyparser_for_version(Options.version) # 'native') # 2.5a')
+stable_parser = pythonparse.make_pyparser('stable')
+python_parser = pythonparse.make_pyparser() # 'native') # 2.5a')
 
 def tuple_parse_expr(expr, target='single'):
     t = Transformer("dummyfile")

Modified: pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astcompiler.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astcompiler.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_astcompiler.py	Thu Dec 21 17:40:55 2006
@@ -39,7 +39,7 @@
     return rcode
 
 # Create parser from Grammar_stable, not current grammar.
-stable_parser = pythonparse.get_pyparser_for_version('stable')
+stable_parser = pythonparse.make_pyparser('stable')
 
 def compile_with_testcompiler(expr, mode='exec', space=FakeSpace()):
     mode2 = 'exec' # xxx exec: single not really tested

Modified: pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_pytokenizer.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_pytokenizer.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/pyparser/test/test_pytokenizer.py	Thu Dec 21 17:40:55 2006
@@ -1,7 +1,9 @@
 from pypy.interpreter.pyparser.pythonlexer import Source, TokenError, \
      match_encoding_declaration
 from pypy.interpreter.pyparser.grammar import Token, GrammarElement
-from pypy.interpreter.pyparser.pythonparse import PYTHON_PARSER as P
+from pypy.interpreter.pyparser.pythonparse import make_pyparser
+
+P = make_pyparser()
 
 EQUAL = P.EQUAL
 ENDMARKER = P.ENDMARKER

Modified: pypy/branch/ast-experiments/pypy/interpreter/stablecompiler/transformer.py
==============================================================================
--- pypy/branch/ast-experiments/pypy/interpreter/stablecompiler/transformer.py	(original)
+++ pypy/branch/ast-experiments/pypy/interpreter/stablecompiler/transformer.py	Thu Dec 21 17:40:55 2006
@@ -26,7 +26,7 @@
 # and replace OWNER, ORGANIZATION, and YEAR as appropriate.
 
 # make sure we import the parser with the correct grammar
-from pypy.interpreter.pyparser.pythonparse import get_pyparser_for_version
+from pypy.interpreter.pyparser.pythonparse import make_pyparser
 
 from pypy.interpreter.stablecompiler.ast import *
 import parser
@@ -37,7 +37,7 @@
 # stable_grammar, _ = pythonparse.get_grammar_file("stable")
 # stable_parser = pythonparse.python_grammar(stable_grammar)
 
-stable_parser = get_pyparser_for_version('stable')
+stable_parser = make_pyparser('stable')
 
 class symbol:
     pass