[pypy-commit] lang-smalltalk storage: Fixed console output when executing an entire image.

anton_gulenko noreply at buildbot.pypy.org
Thu Jul 10 12:56:59 CEST 2014


Author: Anton Gulenko <anton.gulenko at googlemail.com>
Branch: storage
Changeset: r881:54246f8c1106
Date: 2014-07-10 12:41 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/54246f8c1106/

Log:	Fixed console output when executing an entire image.

diff --git a/targetimageloadingsmalltalk.py b/targetimageloadingsmalltalk.py
--- a/targetimageloadingsmalltalk.py
+++ b/targetimageloadingsmalltalk.py
@@ -163,6 +163,8 @@
 
 def result_string(w_result):
     # This will also print contents of strings/symbols/numbers
+    if not w_result:
+        return ""
     return w_result.as_repr_string().replace('\r', '\n')
 
 def compile_code(interp, w_receiver, code):
@@ -232,6 +234,7 @@
     return w_active_context.as_context_get_shadow(space)
 
 def execute_context(interp, s_frame, measure=False):
+    print "" # Line break after image-loading-indicator characters
     try:
         return interp.interpret_toplevel(s_frame.w_self())
     except error.Exit, e:


More information about the pypy-commit mailing list