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

[ac at codespeak.net]

Author: ac
Date: Mon Jan 16 18:13:37 2006
New Revision: 22230

Modified:
   pypy/branch/arre-experiments/pypy/interpreter/argument.py
   pypy/branch/arre-experiments/pypy/interpreter/pyopcode.py
Log:
Fix some typos.

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	Mon Jan 16 18:13:37 2006
@@ -123,7 +123,7 @@
     def firstarg(self):
         if self.nargs <= 0:
             return None
-        return valuestack.top(nargs - 1)
+        return self.valuestack.top(self.nargs - 1)
 
     def __repr__(self):
         return 'ArgumentsFromValuestack(%r, %r)' % (self.valuestack, self.nargs)

Modified: pypy/branch/arre-experiments/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/branch/arre-experiments/pypy/interpreter/pyopcode.py	(original)
+++ pypy/branch/arre-experiments/pypy/interpreter/pyopcode.py	Mon Jan 16 18:13:37 2006
@@ -683,8 +683,10 @@
             nargs = oparg & 0xff
             args = ArgumentsFromValuestack(f.space, f.valuestack, nargs)
             w_function = f.valuestack.top(nargs)
-            w_result = f.space.call_args(w_function, args)
-            f.valuestack.drop(nargs + 1)
+            try:
+                w_result = f.space.call_args(w_function, args)
+            finally:
+                f.valuestack.drop(nargs + 1)
             f.valuestack.push(w_result)
         # XXX end of hack for performance
         else: