[pypy-commit] lang-smalltalk storage-interpreter-refactoring: Finished refactoring. Tests green and compiling.

[anton_gulenko]

Author: Anton Gulenko <anton.gulenko at googlemail.com>
Branch: storage-interpreter-refactoring
Changeset: r950:1551fe558ac2
Date: 2014-07-25 09:05 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/1551fe558ac2/

Log:	Finished refactoring. Tests green and compiling.

diff --git a/spyvm/interpreter_bytecodes.py b/spyvm/interpreter_bytecodes.py
--- a/spyvm/interpreter_bytecodes.py
+++ b/spyvm/interpreter_bytecodes.py
@@ -1,5 +1,5 @@
 
-from spyvm.shadow import ContextPartShadow
+from spyvm.shadow import ContextPartShadow, ClassShadow
 from spyvm import model, primitives, wrapper, error
 from spyvm.tool.bitmanipulation import splitter
 from rpython.rlib import objectmodel, unroll, jit
@@ -357,7 +357,6 @@
                 primitives.exitFromHeadlessExecution(self, "doesNotUnderstand:", w_message)
             return self._sendSpecialSelector(interp, receiver, "doesNotUnderstand", [w_message])
         except error.MethodNotFound:
-            from spyvm.shadow import ClassShadow
             s_class = receiver.class_shadow(self.space)
             assert isinstance(s_class, ClassShadow)
             raise error.Exit("Missing doesNotUnderstand in hierarchy of %s" % s_class.getname())
@@ -509,6 +508,7 @@
         if self.gettemp(1).is_nil(self.space):
             self.settemp(1, self.space.w_true) # mark unwound
             self.push(self.gettemp(0)) # push the first argument
+            from spyvm.interpreter import Return
             try:
                 self.bytecodePrimValue(interp, 0)
             except Return, nlr:
diff --git a/targetimageloadingsmalltalk.py b/targetimageloadingsmalltalk.py
--- a/targetimageloadingsmalltalk.py
+++ b/targetimageloadingsmalltalk.py
@@ -72,7 +72,7 @@
         print_error("Exited: %s" % e.msg)
         return -1
     except error.SmalltalkException, e:
-        print_error("Unhandled Smalltalk Exception type %s. Message: %s" % (e.exception_type, e.msg)
+        print_error("Unhandled %s. Message: %s" % (e.exception_type, e.msg))
         return -1
     except BaseException, e:
         print_error("Exception: %s" % str(e))