Author: Lars Wassermann <[email protected]>
Branch:
Changeset: r119:b7957355fd79
Date: 2013-03-04 17:56 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/b7957355fd79/
Log: renamed interpreter.stack_depth to interpreter.remaining_stack_depth
diff --git a/spyvm/interpreter.py b/spyvm/interpreter.py
--- a/spyvm/interpreter.py
+++ b/spyvm/interpreter.py
@@ -38,7 +38,7 @@
self.image = image
self.image_name = image_name
self.max_stack_depth = max_stack_depth
- self.stack_depth = max_stack_depth
+ self.remaining_stack_depth = max_stack_depth
self._loop = False
def interpret_with_w_frame(self, w_frame):
@@ -62,7 +62,7 @@
try:
w_new_context = self.c_loop(w_new_context)
except StackOverflow, e:
- self.stack_depth = self.max_stack_depth
+ self.remaining_stack_depth = self.max_stack_depth
w_new_context = e.w_context
def c_loop(self, w_active_context):
@@ -85,12 +85,12 @@
if not self._loop:
return w_new_frame # this test is done to not loop in test,
# but rather step just once where wanted
- if self.stack_depth == 1:
+ if self.remaining_stack_depth == 1:
raise StackOverflow(w_new_frame)
- self.stack_depth = self.stack_depth - 1
+ self.remaining_stack_depth -= 1
retval = self.c_loop(w_new_frame)
- self.stack_depth = self.stack_depth + 1
+ self.remaining_stack_depth += 1
return retval
def perform(self, w_receiver, selector, *arguments_w):
diff --git a/spyvm/test/test_interpreter.py b/spyvm/test/test_interpreter.py
--- a/spyvm/test/test_interpreter.py
+++ b/spyvm/test/test_interpreter.py
@@ -994,7 +994,7 @@
class StackTestInterpreter(interpreter.Interpreter):
def stack_frame(self, w_frame):
import sys
- stack_depth = self.max_stack_depth - self.stack_depth
+ stack_depth = self.max_stack_depth - self.remaining_stack_depth
for i in range(stack_depth + 1):
assert sys._getframe(4 + i * 6).f_code.co_name == 'c_loop'
assert sys._getframe(5 + stack_depth * 6).f_code.co_name == 'loop'
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
