Runner: Fix the bad code because of rebase

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

Author: gaocegege

src/rprocessing/RLangPApplet.java

@@ -11,6 +11,7 @@
 
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
 
 import org.renjin.eval.EvalException;
 import org.renjin.parser.RParser;
@@ -98,8 +99,12 @@ public RLangPApplet(final String programText, final Printer stdout) throws NotFo
     this.mode = this.detectMode();
   }
 
-  public void evaluateCoreCode() throws ScriptException {
-    this.renjinEngine.eval(CORE_TEXT);
+  public void evaluateCoreCode() throws RSketchError {
+    try {
+      this.renjinEngine.eval(CORE_TEXT);
+    } catch (final ScriptException se) {
+      throw toSketchException(se);
+    }
   }
 
   /**

src/rprocessing/Runner.java

@@ -1,8 +1,5 @@
 package rprocessing;
 
-import javax.script.ScriptException;
-
-
 import rprocessing.exception.NotFoundException;
 import rprocessing.exception.RSketchError;
 import rprocessing.lancher.StandaloneSketch;
@@ -17,8 +14,6 @@
 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"));
 
@@ -63,6 +58,7 @@ public static synchronized void runSketchBlocking(final RunnableSketch sketch,
     RLangPApplet rp = new RLangPApplet(sketch.getMainCode(), stdout);
     log("Adding processing variable into R top context.");
     rp.addPAppletToRContext();
+    rp.evaluateCoreCode();
 
     rp.runBlock(args);
   }