clean up runtime behavior around syntax errors and other exceptions

jdf · Aug 30, 2010 · fe9a45e · fe9a45e
1 parent 272657c
commit fe9a45e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/runtime/src/jycessing/PAppletJythonDriver.java b/runtime/src/jycessing/PAppletJythonDriver.java
@@ -26,6 +26,7 @@
 import org.python.core.PyException;
 import org.python.core.PyObject;
 import org.python.core.PyStringMap;
+import org.python.core.PySyntaxError;
 import org.python.util.InteractiveConsole;
 
 import processing.core.PApplet;
@@ -68,10 +69,18 @@ abstract public class PAppletJythonDriver extends PApplet {
     // the source file name, so that errors have the file name instead of
     // "<string>"
     private void interpretSketch() {
-        Py.setSystemState(interp.getSystemState());
-        Py.exec(Py.compile_flags(programText, pySketchPath, CompileMode.exec,
-                new CompilerFlags()), interp.getLocals(), null);
-        Py.flushLine();
+        try {
+            Py.setSystemState(interp.getSystemState());
+            Py.exec(Py.compile_flags(programText, pySketchPath,
+                    CompileMode.exec, new CompilerFlags()), interp.getLocals(),
+                    null);
+            Py.flushLine();
+        } catch (Throwable t) {
+            while (t.getCause() != null)
+                t = t.getCause();
+            t.printStackTrace(System.err);
+            System.exit(-1);
+        }
     }
 
     public PAppletJythonDriver(final InteractiveConsole interp,

diff --git a/runtime/src/jycessing/Runner.java b/runtime/src/jycessing/Runner.java
@@ -212,7 +212,6 @@ public static void runSketch(final String[] args, final String sketchPath,
             PApplet.runSketch(args, applet);
         } catch (Throwable t) {
             Py.printException(t);
-            throw new RuntimeException(t);
         } finally {
             interp.cleanup();
         }