SketchRunner: Redirect all errors to PDE console (#212)

* SketchRunner: Redirect all errors to PDE console Signed-off-by: Ce Gao <ce.gao@outlook.com> * RLangPApplet: Remove the code about = Signed-off-by: Ce Gao <ce.gao@outlook.com>
processing-r · Aug 12, 2017 · de0a844 · de0a844
1 parent 591cc12
commit de0a844
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/rprocessing/RLangPApplet.java b/src/rprocessing/RLangPApplet.java
@@ -106,6 +106,7 @@ public void prePassCode() {
     SEXP source = RParser.parseSource(this.programText + "\n", "inline-string");
     if (isSameClass(source, ExpressionVector.class)) {
       ExpressionVector ev = (ExpressionVector) source;
+      // Stores the expressions except size().
       List<SEXP> sexps = new ArrayList<SEXP>();
       for (int i = ev.length() - 1; i >= 0; --i) {
         if (isSameClass(ev.get(i), FunctionCall.class)
@@ -116,6 +117,7 @@ && isSameClass(((FunctionCall) ev.get(i)).getFunction(), Symbol.class)) {
             sexps.add(ev.get(i));
           } else if (((Symbol) ((FunctionCall) ev.get(i)).getFunction()).getPrintName()
               .equals(Constant.SIZE_NAME)) {
+            // size function is defined in global namespace.
             log("size function is defined in global namespace.");
             hasSize = true;
             sizeFunction = ev.get(i);

diff --git a/src/rprocessing/mode/run/SketchRunner.java b/src/rprocessing/mode/run/SketchRunner.java
@@ -8,7 +8,6 @@
 import processing.core.PConstants;
 import rprocessing.Runner;
 import rprocessing.SketchPositionListener;
-import rprocessing.exception.REvalException;
 import rprocessing.exception.RMIRuntimeException;
 import rprocessing.exception.RSketchError;
 import rprocessing.mode.RLangMode;
@@ -132,12 +131,7 @@ public void sketchMoved(final Point leftTop) {
             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()));
-            } else {
-              modeService.handleSketchException(id, exception);
-            }
+            modeService.handleSketchException(id, convertREvalError(exception));
           } finally {
             log("Handling sketch stoppage...");
             modeService.handleSketchStopped(id);
@@ -228,8 +222,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().");
@@ -247,7 +241,7 @@ public void run() {
     }));
   }
 
-  private SketchException convertREvalError(final REvalException exception) {
+  private SketchException convertREvalError(final Exception exception) {
     return new SketchException(exception.getMessage());
   }
 }