*: Add exception handler

Signed-off-by: Ce Gao <[email protected]>

Author: gaocegege

src/rprocessing/RLangPApplet.java

@@ -4,6 +4,7 @@
 import java.awt.Window;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
@@ -12,6 +13,7 @@
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
+import org.renjin.eval.EvalException;
 import org.renjin.parser.RParser;
 import org.renjin.script.RenjinScriptEngine;
 import org.renjin.sexp.Closure;
@@ -20,8 +22,6 @@
 import org.renjin.sexp.SEXP;
 import org.renjin.sexp.Symbol;
 
-import com.jogamp.newt.opengl.GLWindow;
-
 import processing.awt.PSurfaceAWT;
 import processing.core.PApplet;
 import processing.core.PConstants;
@@ -30,10 +30,13 @@
 import processing.opengl.PSurfaceJOGL;
 import rprocessing.applet.BuiltinApplet;
 import rprocessing.exception.NotFoundException;
+import rprocessing.exception.RSketchError;
 import rprocessing.util.Constant;
 import rprocessing.util.Printer;
 import rprocessing.util.RScriptReader;
 
+import com.jogamp.newt.opengl.GLWindow;
+
 /**
  * RlangPApplet PApplet for R language, powered by Renjin.
  * 
@@ -61,6 +64,8 @@ public class RLangPApplet extends BuiltinApplet {
 
   private final CountDownLatch finishedLatch = new CountDownLatch(1);
 
+  private RSketchError terminalException = null;
+
   /**
    * Mode for Processing.
    * 
@@ -144,7 +149,7 @@ public void addPAppletToRContext() {
     this.renjinEngine.put("stdout", stdout);
   }
 
-  public void runBlock(final String[] arguments) {
+  public void runBlock(final String[] arguments) throws RSketchError {
     log("runBlock");
     PApplet.runSketch(arguments, this);
     try {
@@ -161,8 +166,7 @@ public void runBlock(final String[] arguments) {
       }
     } finally {
       Thread.setDefaultUncaughtExceptionHandler(null);
-      if (PApplet.platform == PConstants.MACOSX
-          && Arrays.asList(arguments).contains("fullScreen")) {
+      if (PApplet.platform == PConstants.MACOSX && Arrays.asList(arguments).contains("fullScreen")) {
         // Frame should be OS-X fullscreen, and it won't stop being that unless the jvm
         // exits or we explicitly tell it to minimize.
         // (If it's disposed, it'll leave a gray blank window behind it.)
@@ -182,9 +186,9 @@ public void runBlock(final String[] arguments) {
         surface.setVisible(false);
       }
     }
-    // if (terminalException != null) {
-    // throw terminalException;
-    // }
+    if (terminalException != null) {
+      throw terminalException;
+    }
   }
 
   private static void macosxFullScreenToggle(final Window window) {
@@ -242,6 +246,28 @@ public void exitActual() {
     finishedLatch.countDown();
   }
 
+  /**
+   * @see processing.core.PApplet#start()
+   */
+  @Override
+  public void start() {
+    // I want to quit on runtime exceptions.
+    // Processing just sits there by default.
+    Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+      @Override
+      public void uncaughtException(final Thread t, final Throwable e) {
+        terminalException = toSketchException(e);
+        try {
+          handleMethods("dispose");
+        } catch (final Exception noop) {
+          // give up
+        }
+        finishedLatch.countDown();
+      }
+    });
+    super.start();
+  }
+
   /**
    * @see processing.core.PApplet#settings()
    */
@@ -270,7 +296,8 @@ public void setup() {
       try {
         this.renjinEngine.eval(this.programText);
       } catch (ScriptException exception) {
-        log(exception.toString());
+        terminalException = toSketchException(exception);
+        exitActual();
       }
     } else if (this.mode == Mode.ACTIVE) {
       Object obj = this.renjinEngine.get(Constant.SETUP_NAME);
@@ -348,4 +375,19 @@ protected void wrapProcessingVariables() {
   private static boolean isSameClass(Object obj, Class clazz) {
     return obj.getClass().equals(clazz);
   }
+
+  private static RSketchError toSketchException(Throwable t) {
+    if (t instanceof RuntimeException && t.getCause() != null) {
+      t = t.getCause();
+    }
+    if (t instanceof RSketchError) {
+      return (RSketchError) t;
+    }
+    if (t instanceof EvalException) {
+      final RSketchError e = (RSketchError) t;
+      return e;
+    }
+    log("No exception type detected.");
+    return null;
+  }
 }

src/rprocessing/Runner.java

@@ -2,10 +2,9 @@
 
 import javax.script.ScriptException;
 
-import org.renjin.eval.EvalException;
 
 import rprocessing.exception.NotFoundException;
-import rprocessing.exception.REvalException;
+import rprocessing.exception.RSketchError;
 import rprocessing.lancher.StandaloneSketch;
 import rprocessing.util.Printer;
 import rprocessing.util.StreamPrinter;
@@ -18,6 +17,8 @@
 public class Runner {
 
   public static RunnableSketch sketch;
+  private static final String CORE_TEXT =
+      RScriptReader.readResourceAsText(Runner.class, "r/core.R");
 
   private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
 
@@ -49,29 +50,20 @@ public static void main(final String[] args) throws Exception {
   }
 
   public static synchronized void runSketchBlocking(final RunnableSketch sketch,
-      final Printer stdout, final Printer stderr)
-      throws REvalException, NotFoundException, ScriptException {
+      final Printer stdout, final Printer stderr) throws NotFoundException, RSketchError {
     runSketchBlocking(sketch, stdout, stderr, null);
   }
 
   public static synchronized void runSketchBlocking(final RunnableSketch sketch,
       final Printer stdout, final Printer stderr,
-      final SketchPositionListener sketchPositionListener)
-      throws REvalException, NotFoundException, ScriptException {
+      final SketchPositionListener sketchPositionListener) throws NotFoundException, RSketchError {
     final String[] args = sketch.getPAppletArguments();
 
     log("Tring to initialize RLangPApplet.");
     RLangPApplet rp = new RLangPApplet(sketch.getMainCode(), stdout);
     log("Adding processing variable into R top context.");
     rp.addPAppletToRContext();
-    rp.evaluateCoreCode();
 
-    try {
-      // Run Sketch.
-      rp.runBlock(args);
-      log("Down");
-    } catch (EvalException ee) {
-      throw new REvalException(ee.getMessage());
-    }
+    rp.runBlock(args);
   }
 }

src/rprocessing/exception/RSketchError.java

@@ -0,0 +1,47 @@
+package rprocessing.exception;
+
+/**
+ * Error type for Processing.R
+ * 
+ * @author github.com/gaocegege
+ */
+public class RSketchError extends Exception {
+  private static final long serialVersionUID = 6563629093797155634L;
+  public final String fileName;
+  public final int line;
+  public final int column;
+
+  public RSketchError(final String message) {
+    this(message, null);
+  }
+
+  public RSketchError(final String message, final String fileName) {
+    this(message, fileName, -1, -1);
+  }
+
+  public RSketchError(final String message, final String fileName, final int line) {
+    this(message, fileName, line, 0);
+  }
+
+  public RSketchError(final String message, final String fileName, final int line, final int column) {
+    super(message);
+
+    this.fileName = fileName;
+    this.line = line;
+    this.column = column;
+  }
+
+  @Override
+  public String toString() {
+    if (fileName == null) {
+      return getMessage();
+    }
+    if (line == -1) {
+      return getMessage() + " in " + fileName;
+    }
+    if (column == -1) {
+      return getMessage() + " at line " + line + " of " + fileName;
+    }
+    return getMessage() + " at " + line + ":" + column + " in " + fileName;
+  }
+}

src/rprocessing/mode/run/SketchRunner.java

@@ -10,6 +10,7 @@
 import rprocessing.SketchPositionListener;
 import rprocessing.exception.REvalException;
 import rprocessing.exception.RMIRuntimeException;
+import rprocessing.exception.RSketchError;
 import rprocessing.mode.RLangMode;
 import rprocessing.mode.run.RMIUtils.RMIProblem;
 import rprocessing.util.Printer;
@@ -124,15 +125,16 @@ public void sketchMoved(final Point leftTop) {
                 }
               }
             };
+            log("Run the sketch.");
             Runner.runSketchBlocking(sketch, stdout, stderr, sketchPositionListener);
-          } catch (final REvalException exception) {
+          } catch (final RSketchError exception) {
             log("Sketch runner caught " + exception);
-            modeService.handleSketchException(id,
-                convertREvalError(exception, sketch.codeFileNames));
+            modeService.handleSketchException(id, exception);
           } catch (final Exception exception) {
+            log("Sketch runner caught Exception:" + exception);
             if (exception.getCause() != null && exception.getCause() instanceof REvalException) {
               modeService.handleSketchException(id,
-                  convertREvalError((REvalException) exception.getCause(), sketch.codeFileNames));
+                  convertREvalError((REvalException) exception.getCause()));
             } else {
               modeService.handleSketchException(id, exception);
             }
@@ -141,6 +143,7 @@ public void sketchMoved(final Point leftTop) {
             modeService.handleSketchStopped(id);
           }
         } catch (final RemoteException exception) {
+          log("Sketch runner caught RemoteException:" + exception);
           log(exception.toString());
         }
         // Exiting; no need to interrupt and join it later.
@@ -225,8 +228,8 @@ private static void startSketchRunner(final String id) throws RMIRuntimeExceptio
     }
   }
 
-  private static void launch(final String id, final ModeService modeService)
-      throws RMIProblem, RemoteException {
+  private static void launch(final String id, final ModeService modeService) throws RMIProblem,
+      RemoteException {
     final SketchRunner sketchRunner = new SketchRunner(id, modeService);
     final SketchService stub = (SketchService) RMIUtils.export(sketchRunner);
     log("Calling mode's handleReady().");
@@ -244,8 +247,7 @@ public void run() {
     }));
   }
 
-  private SketchException convertREvalError(final REvalException exception,
-      final String[] fileNames) {
+  private SketchException convertREvalError(final REvalException exception) {
     return new SketchException(exception.getMessage());
   }
 }