[pypy-svn] r16615 - in pypy/dist/pypy: interpreter tool

[hpk at codespeak.net]

Author: hpk
Date: Fri Aug 26 14:18:01 2005
New Revision: 16615

Modified:
   pypy/dist/pypy/interpreter/baseobjspace.py
   pypy/dist/pypy/tool/option.py
Log:
(hpk,ludal)

only offer 'pypy' and 'cpython' as parser module options. 



Modified: pypy/dist/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/dist/pypy/interpreter/baseobjspace.py	(original)
+++ pypy/dist/pypy/interpreter/baseobjspace.py	Fri Aug 26 14:18:01 2005
@@ -115,7 +115,7 @@
     def __init__(self, usemodules=(), 
                  nofaking=False, 
                  uselibfile=False,
-                 parser="recparser", 
+                 parser="pypy", 
                  compiler="pyparse",
                  translating=False,
                  geninterp=True,
@@ -190,11 +190,9 @@
         # that differs from the app-visible name (because you 
         # can specify implementation variants)
         builtinmodule_list = [(x, None) for x in modules]
-        if self.options.parser == "recparser":
+        if self.options.parser == "pypy":
             builtinmodule_list.append(('parser', 'recparser'))
             builtinmodule_list.append(('symbol', None))
-        elif self.options.parser == "parser":
-            builtinmodule_list.append(('parser', None))
         self._builtinmodule_list = builtinmodule_list
         return self._builtinmodule_list
 

Modified: pypy/dist/pypy/tool/option.py
==============================================================================
--- pypy/dist/pypy/tool/option.py	(original)
+++ pypy/dist/pypy/tool/option.py	Fri Aug 26 14:18:01 2005
@@ -11,7 +11,7 @@
     oldstyle = 0
     uselibfile = 0
     nofaking = 0
-    parser = "recparser" # "cpython" / "recparser" / "parser"
+    parser = "pypy" # "cpython" / "pypy" 
     compiler = "pyparse" # "cpython"
                          # "pyparse" pypy parser, cpython's compiler and transformer package
                          # "pyparseapp" same, running the compiler at app-level
@@ -60,7 +60,7 @@
     options.append(make_option(
         '--parser', action="store",type="string", dest="parser",
         help="select the parser module to use",
-        metavar="[recparser|cpython|parser]"))
+        metavar="[pypy|cpython]"))
 ## for this to work the option module need to be loaded before the grammar!
 ##     options.append(make_option(
 ##         '--version', action="store",type="string", dest="version",