Merge pull request #165 in G/fastr from jtulach/NoIOException to master

* commit 'c8319850':
  Wrap only IOException to RuntimeException. Leave other exceptions untouched.
  Adjusting the code to not expect IOException from PolyglotEngine.eval and co.

com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RCommand.java

@@ -216,6 +216,7 @@ public class RCommand {
                          */
                         try {
                             vm.eval(source);
+                            emitIO();
                         } catch (IncompleteSourceException | com.oracle.truffle.api.vm.IncompleteSourceException e) {
                             // read another line of input
                             consoleHandler.setPrompt(doEcho ? continuePrompt : null);
@@ -279,6 +280,7 @@ public class RCommand {
         PolyglotEngine.Value echoValue;
         try {
             echoValue = vm.eval(GET_ECHO);
+            emitIO();
             Object echo = echoValue.get();
             if (echo instanceof TruffleObject) {
                 RLogicalVector echoVec = echoValue.as(RLogicalVector.class);
@@ -296,4 +298,7 @@ public class RCommand {
     private static String getContinuePrompt() {
         return RRuntime.asString(RRuntime.asAbstractVector(RContext.getInstance().stateROptions.getValue("continue")));
     }
+
+    private static void emitIO() throws IOException {
+    }
 }

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java

@@ -53,12 +53,16 @@ public class FastRInterop {
 
             try {
                 callTarget = RContext.getInstance().getEnv().parse(sourceObject);
+                emitIO();
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
 
             return callTarget.call();
         }
+
+        private void emitIO() throws IOException {
+        }
     }
 
     @RBuiltin(name = ".fastr.interop.export", visibility = RVisibility.OFF, kind = RBuiltinKind.PRIMITIVE, parameterNames = {"name", "value"})

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/context/RContext.java

@@ -192,7 +192,7 @@ public final class RContext extends ExecutionContext implements TruffleObject {
             PolyglotEngine vm = info.apply(PolyglotEngine.newBuilder()).build();
             try {
                 setContext(vm.eval(GET_CONTEXT).as(RContext.class));
-            } catch (IOException e1) {
+            } catch (Exception e1) {
                 throw new RInternalError(e1, "error while initializing eval thread");
             }
             try {

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/generate/FastRSession.java

@@ -168,6 +168,7 @@ public final class FastRSession implements RSession {
             main = info.apply(PolyglotEngine.newBuilder()).build();
             try {
                 mainContext = main.eval(GET_CONTEXT).as(RContext.class);
+                emitIO();
             } catch (IOException e) {
                 throw new RuntimeException("error while retrieving test context", e);
             }
@@ -248,6 +249,7 @@ public final class FastRSession implements RSession {
                             try {
                                 vm.eval(source);
                                 input = consoleHandler.readLine();
+                                emitIO();
                             } catch (IncompleteSourceException | com.oracle.truffle.api.vm.IncompleteSourceException e) {
                                 String additionalInput = consoleHandler.readLine();
                                 if (additionalInput == null) {
@@ -289,4 +291,7 @@ public final class FastRSession implements RSession {
     public String name() {
         return "FastR";
     }
+
+    static void emitIO() throws IOException {
+    }
 }