[pypy-svn] r22439 - pypy/branch/arre-experiments/pypy/interpreter

[ac at codespeak.net]

Author: ac
Date: Thu Jan 19 14:28:03 2006
New Revision: 22439

Modified:
   pypy/branch/arre-experiments/pypy/interpreter/argument.py
   pypy/branch/arre-experiments/pypy/interpreter/function.py
Log:
A bugfix and a tweak.

Modified: pypy/branch/arre-experiments/pypy/interpreter/argument.py
==============================================================================
--- pypy/branch/arre-experiments/pypy/interpreter/argument.py	(original)
+++ pypy/branch/arre-experiments/pypy/interpreter/argument.py	Thu Jan 19 14:28:03 2006
@@ -197,9 +197,9 @@
                 scope_w[i + blindargs] = self.valuestack.top(self.nargs - 1 - i)
             if has_vararg:
                 if blindargs > co_argcount:
-                    startarg_w = extravarargs
+                    stararg_w = extravarargs
                     for i in range(self.nargs):
-                        startarg_w.append(self.valuestack.top(self.nargs - 1 - i))
+                        stararg_w.append(self.valuestack.top(self.nargs - 1 - i))
                 else:
                     stararg_w = [None] * (self.nargs + blindargs - co_argcount)
                     for i in range(co_argcount - blindargs, self.nargs):

Modified: pypy/branch/arre-experiments/pypy/interpreter/function.py
==============================================================================
--- pypy/branch/arre-experiments/pypy/interpreter/function.py	(original)
+++ pypy/branch/arre-experiments/pypy/interpreter/function.py	Thu Jan 19 14:28:03 2006
@@ -37,8 +37,7 @@
                                        self.closure)
         sig = self.code.signature()
         # XXX start of hack for performance
-        if (isinstance(frame, PyFrame) and
-            frame.setfastscope is PyFrame.setfastscope):
+        if frame.setfastscope is PyFrame.setfastscope:
             args_matched = args.parse_into_scope(frame.fastlocals_w, self.name,
                                                  sig, self.defs_w)
             frame.init_cells(args_matched)