[pypy-svn] r13493 - pypy/branch/pypy-translation-snapshot/interpreter

[pedronis at codespeak.net]

Author: pedronis
Date: Thu Jun 16 23:36:43 2005
New Revision: 13493

Modified:
   pypy/branch/pypy-translation-snapshot/interpreter/eval.py
   pypy/branch/pypy-translation-snapshot/interpreter/pyopcode.py
Log:
merge tweaks to make the rtyper happy



Modified: pypy/branch/pypy-translation-snapshot/interpreter/eval.py
==============================================================================
--- pypy/branch/pypy-translation-snapshot/interpreter/eval.py	(original)
+++ pypy/branch/pypy-translation-snapshot/interpreter/eval.py	Thu Jun 16 23:36:43 2005
@@ -19,7 +19,7 @@
 
     def exec_code(self, space, w_globals, w_locals):
         "Implements the 'exec' statement."
-        frame = self.create_frame(space, w_globals)
+        frame = self.create_frame(space, w_globals, None)
         frame.setdictscope(w_locals)
         return frame.run()
 

Modified: pypy/branch/pypy-translation-snapshot/interpreter/pyopcode.py
==============================================================================
--- pypy/branch/pypy-translation-snapshot/interpreter/pyopcode.py	(original)
+++ pypy/branch/pypy-translation-snapshot/interpreter/pyopcode.py	Thu Jun 16 23:36:43 2005
@@ -626,7 +626,7 @@
         block = pyframe.FinallyBlock(f, f.next_instr + offsettoend)
         f.blockstack.push(block)
 
-    def CALL_FUNCTION(f, oparg, w_star=None, w_starstar=None):
+    def call_function(f, oparg, w_star=None, w_starstar=None):
         n_arguments = oparg & 0xff
         n_keywords = (oparg>>8) & 0xff
         keywords = {}
@@ -642,18 +642,21 @@
         w_result = f.space.call_args(w_function, args)
         f.valuestack.push(w_result)
 
+    def CALL_FUNCTION(f, oparg):
+        f.call_function(oparg)
+
     def CALL_FUNCTION_VAR(f, oparg):
         w_varargs = f.valuestack.pop()
-        f.CALL_FUNCTION(oparg, w_varargs)
+        f.call_function(oparg, w_varargs)
 
     def CALL_FUNCTION_KW(f, oparg):
         w_varkw = f.valuestack.pop()
-        f.CALL_FUNCTION(oparg, None, w_varkw)
+        f.call_function(oparg, None, w_varkw)
 
     def CALL_FUNCTION_VAR_KW(f, oparg):
         w_varkw = f.valuestack.pop()
         w_varargs = f.valuestack.pop()
-        f.CALL_FUNCTION(oparg, w_varargs, w_varkw)
+        f.call_function(oparg, w_varargs, w_varkw)
 
     def MAKE_FUNCTION(f, numdefaults):
         w_codeobj = f.valuestack.pop()