[pypy-svn] r23970 - in pypy/dist/pypy: interpreter/pyparser rpython rpython/lltypesystem

nik at codespeak.net nik at codespeak.net
Sat Mar 4 11:05:59 CET 2006


Author: nik
Date: Sat Mar  4 11:05:56 2006
New Revision: 23970

Modified:
   pypy/dist/pypy/interpreter/pyparser/pythonparse.py
   pypy/dist/pypy/rpython/lltypesystem/rpbc.py
   pypy/dist/pypy/rpython/rpbc.py
Log:
fix an annotation problem in the parser. add an import lost in some
ootype refactoring. this makes translation work again for me.


Modified: pypy/dist/pypy/interpreter/pyparser/pythonparse.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/pythonparse.py	(original)
+++ pypy/dist/pypy/interpreter/pyparser/pythonparse.py	Sat Mar  4 11:05:56 2006
@@ -172,7 +172,10 @@
 
 
 def grammar_rules( space ):
-    return space.wrap( PYTHON_PARSER.rules )
+    w_rules = space.newdict([])
+    for key, value in PYTHON_PARSER.rules.iteritems():
+        space.setitem(w_rules, space.wrap(key), space.wrap(value))
+    return w_rules
 
 
 def make_rule( space, w_rule ):

Modified: pypy/dist/pypy/rpython/lltypesystem/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rpbc.py	Sat Mar  4 11:05:56 2006
@@ -7,7 +7,6 @@
      typeOf, Void, ForwardReference, Struct, Bool, \
      Ptr, malloc, nullptr
 from pypy.rpython.rmodel import Repr, TyperError, inputconst, inputdesc
-from pypy.rpython.rmodel import warning, mangle, CanBeNull
 from pypy.rpython import robject
 from pypy.rpython import rtuple
 from pypy.rpython.rpbc import samesig,\

Modified: pypy/dist/pypy/rpython/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/rpbc.py	Sat Mar  4 11:05:56 2006
@@ -8,7 +8,7 @@
      typeOf, Void, Bool, nullptr, frozendict, Ptr, Struct, malloc
 from pypy.rpython.error import TyperError
 from pypy.rpython.rmodel import Repr, inputconst, HalfConcreteWrapper, CanBeNull, \
-        mangle, inputdesc
+        mangle, inputdesc, warning
 from pypy.rpython import rclass
 from pypy.rpython import robject
 



More information about the Pypy-commit mailing list