diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
index eeed7e583d8093c46c2f862fee6f3c801759b980..6151ad2bbaccb09068f29d7f2ff6148e3d298a7d 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/RRuntimeASTAccessImpl.java
@@ -38,8 +38,7 @@ import com.oracle.truffle.api.instrumentation.StandardTags.RootTag;
import com.oracle.truffle.api.instrumentation.StandardTags.StatementTag;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.nodes.RootNode;
-import com.oracle.truffle.r.launcher.RCommand;
-import com.oracle.truffle.r.launcher.RscriptCommand;
+import com.oracle.truffle.r.launcher.RMain;
import com.oracle.truffle.r.nodes.RASTUtils;
import com.oracle.truffle.r.nodes.RRootNode;
import com.oracle.truffle.r.nodes.access.variables.ReadVariableNode;
@@ -353,7 +352,8 @@ class RRuntimeASTAccessImpl implements RRuntimeASTAccess {
@Override
public Object rcommandMain(String[] args, String[] env, boolean intern) {
IORedirect redirect = handleIORedirect(args, intern);
- Object result = RCommand.doMain(redirect.args, env, redirect.in, redirect.out, redirect.err);
+ assert env == null : "re-enable env arguments";
+ int result = RMain.runR(redirect.args, redirect.in, redirect.out, redirect.err);
return redirect.getInternResult(result);
}
@@ -362,7 +362,8 @@ class RRuntimeASTAccessImpl implements RRuntimeASTAccess {
IORedirect redirect = handleIORedirect(args, intern);
// TODO argument parsing can fail with ExitException, which needs to be handled correctly in
// nested context
- Object result = RscriptCommand.doMain(redirect.args, env, redirect.in, redirect.out, redirect.err);
+ assert env == null : "re-enable env arguments";
+ int result = RMain.runRscript(redirect.args, redirect.in, redirect.out, redirect.err);
return redirect.getInternResult(result);
}
@@ -381,9 +382,8 @@ class RRuntimeASTAccessImpl implements RRuntimeASTAccess {
this.intern = intern;
}
- private Object getInternResult(Object result) {
+ private Object getInternResult(int result) {
if (intern) {
- int status = (int) result;
ByteArrayOutputStream bos = (ByteArrayOutputStream) out;
String s = new String(bos.toByteArray());
RStringVector sresult;
@@ -393,8 +393,8 @@ class RRuntimeASTAccessImpl implements RRuntimeASTAccess {
String[] lines = s.split("\n");
sresult = RDataFactory.createStringVector(lines, RDataFactory.COMPLETE_VECTOR);
}
- if (status != 0) {
- setResultAttr(status, sresult);
+ if (result != 0) {
+ setResultAttr(result, sresult);
}
return sresult;
} else {
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
index 3b7eb5535210ed6c49e3009df37ab3e7cebd05c8..2b20fe5aa805ccd146c72bcb69f8669fdbb659c7 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/REmbedded.java
@@ -31,7 +31,7 @@ import org.graalvm.polyglot.Source;
import com.oracle.truffle.r.launcher.ConsoleHandler;
import com.oracle.truffle.r.launcher.RCmdOptions;
-import com.oracle.truffle.r.launcher.RCommand;
+import com.oracle.truffle.r.launcher.REPL;
import com.oracle.truffle.r.launcher.RStartParams;
import com.oracle.truffle.r.runtime.RSource.Internal;
import com.oracle.truffle.r.runtime.RSuicide;
@@ -76,7 +76,7 @@ public class REmbedded {
EmbeddedConsoleHandler embeddedConsoleHandler = new EmbeddedConsoleHandler();
- consoleHandler = RCommand.createConsoleHandler(options, embeddedConsoleHandler, System.in, System.out);
+ consoleHandler = ConsoleHandler.createConsoleHandler(options, embeddedConsoleHandler, System.in, System.out);
InputStream input = consoleHandler.createInputStream();
boolean useEmbedded = consoleHandler == embeddedConsoleHandler;
OutputStream stdOut = useEmbedded ? embeddedConsoleHandler.createStdOutputStream(System.out) : System.out;
@@ -133,7 +133,7 @@ public class REmbedded {
RContext ctx = RContext.getInstance();
ctx.completeEmbeddedInitialization();
ctx.getRFFI().initializeEmbedded(ctx);
- int status = RCommand.readEvalPrint(context, consoleHandler, false);
+ int status = REPL.readEvalPrint(context, consoleHandler, false);
context.leave();
context.close();
Utils.systemExit(status);
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RMain.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RMain.java
deleted file mode 100644
index 756460ef888d57204945037a9bb2ec535d07e235..0000000000000000000000000000000000000000
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RMain.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.truffle.r.engine.shell;
-
-import com.oracle.truffle.r.launcher.RCommand;
-import com.oracle.truffle.r.launcher.RscriptCommand;
-
-/**
- * Convenience class that allows the R/Rscript entry to be chosen by an initial argument.
- */
-public class RMain {
-
- public static void main(String[] args) {
- boolean rscript = false;
- if (args.length > 0) {
- String arg = args[0];
- switch (arg) {
- case "R":
- case "r":
- break;
-
- case "Rscript":
- case "rscript":
- rscript = true;
- break;
-
- default:
- System.out.println(arg);
- usage();
- }
- String[] xargs = shiftArgs(args);
- if (rscript) {
- RscriptCommand.main(xargs);
- } else {
- RCommand.main(xargs);
- }
- } else {
- usage();
- }
- }
-
- private static void usage() {
- System.out.println("usage: [R|Rscript] ...");
- System.exit(1);
- }
-
- private static String[] shiftArgs(String[] args) {
- String[] nargs = new String[args.length - 1];
- System.arraycopy(args, 1, nargs, 0, nargs.length);
- return nargs;
- }
-}
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java
index 1c8751f429813ce950212c512f21515d182da04f..9147fe22f8851f65924adf1041fd1f3b5d509f6c 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/ConsoleHandler.java
@@ -22,21 +22,81 @@
*/
package com.oracle.truffle.r.launcher;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.List;
+import java.util.function.Supplier;
import org.graalvm.polyglot.Context;
import org.graalvm.polyglot.Value;
import org.graalvm.polyglot.proxy.ProxyExecutable;
import org.graalvm.polyglot.proxy.ProxyObject;
+import com.oracle.truffle.r.launcher.RCmdOptions.RCmdOption;
+
/**
* The interface to a source of input/output for the context, which may have different
* implementations for different contexts.
*/
public abstract class ConsoleHandler {
+ public static ConsoleHandler createConsoleHandler(RCmdOptions options, DelegatingConsoleHandler useDelegatingWrapper, InputStream inStream, OutputStream outStream) {
+ /*
+ * Whether the input is from stdin, a file (-f), or an expression on the command line (-e)
+ * it goes through the console. N.B. -f and -e can't be used together and this is already
+ * checked.
+ */
+ RStartParams rsp = new RStartParams(options, false);
+ String fileArgument = rsp.getFileArgument();
+ if (fileArgument != null) {
+ List<String> lines;
+ try {
+ /*
+ * If initial==false, ~ expansion will not have been done and the open will fail.
+ * It's harmless to always do it.
+ */
+ File file = fileArgument.startsWith("~") ? new File(System.getProperty("user.home") + fileArgument.substring(1)) : new File(fileArgument);
+ lines = Files.readAllLines(file.toPath());
+ } catch (IOException e) {
+ throw RMain.fatal("cannot open file '%s': No such file or directory", fileArgument);
+ }
+ return new StringConsoleHandler(lines, outStream);
+ } else if (options.getStringList(RCmdOption.EXPR) != null) {
+ List<String> exprs = options.getStringList(RCmdOption.EXPR);
+ for (int i = 0; i < exprs.size(); i++) {
+ exprs.set(i, REPL.unescapeSpace(exprs.get(i)));
+ }
+ return new StringConsoleHandler(exprs, outStream);
+ } else {
+ boolean isInteractive = options.getBoolean(RCmdOption.INTERACTIVE);
+ if (!isInteractive && rsp.askForSave()) {
+ throw RMain.fatal("you must specify '--save', '--no-save' or '--vanilla'");
+ }
+ boolean useReadLine = isInteractive && !rsp.noReadline();
+ if (useDelegatingWrapper != null) {
+ /*
+ * If we are in embedded mode, the creation of ConsoleReader and the ConsoleHandler
+ * should be lazy, as these may not be necessary and can cause hangs if stdin has
+ * been redirected.
+ */
+ Supplier<ConsoleHandler> delegateFactory = useReadLine ? () -> new JLineConsoleHandler(inStream, outStream, rsp.isSlave())
+ : () -> new DefaultConsoleHandler(inStream, outStream, isInteractive);
+ useDelegatingWrapper.setDelegate(delegateFactory);
+ return useDelegatingWrapper;
+ } else {
+ if (useReadLine) {
+ return new JLineConsoleHandler(inStream, outStream, rsp.isSlave());
+ } else {
+ return new DefaultConsoleHandler(inStream, outStream, isInteractive);
+ }
+ }
+ }
+ }
+
/**
* Read a line of input, newline is <b>NOT</b> included in result.
*/
@@ -92,10 +152,10 @@ public abstract class ConsoleHandler {
};
}
- private static class PolyglotWrapper implements ProxyObject {
+ private static final class PolyglotWrapper implements ProxyObject {
private static final String GET_PROMPT_KEY = "getPrompt";
private static final String SET_PROMPT_KEY = "setPrompt";
- private static final String[] keys = new String[] { GET_PROMPT_KEY, SET_PROMPT_KEY };
+ private static final String[] keys = new String[]{GET_PROMPT_KEY, SET_PROMPT_KEY};
private final GetPromptWrapper getPrompt;
private final SetPromptWrapper setPrompt;
@@ -131,7 +191,7 @@ public abstract class ConsoleHandler {
}
}
- private static class GetPromptWrapper implements ProxyExecutable {
+ private static final class GetPromptWrapper implements ProxyExecutable {
private final ConsoleHandler target;
private GetPromptWrapper(ConsoleHandler target) {
@@ -144,7 +204,7 @@ public abstract class ConsoleHandler {
}
}
- private static class SetPromptWrapper implements ProxyExecutable {
+ private static final class SetPromptWrapper implements ProxyExecutable {
private final ConsoleHandler target;
private SetPromptWrapper(ConsoleHandler target) {
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java
index d2bad321f9ef438516d096a184c9bdb58366cf85..234a6e2ac73cf16380723116ebea87e1b5c456b9 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleCompleter.java
@@ -53,7 +53,7 @@ public class JLineConsoleCompleter implements Completer {
if (isTesting) {
throw e;
}
- throw RCommand.fatal(e, "error while determining completion");
+ throw RMain.fatal(e, "error while determining completion");
}
}
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleHandler.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleHandler.java
index bf6fc6c9b54242ecae2f001062490f0231322069..85aaaebd722fe6f3c4201979e3361afce422094f 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleHandler.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/JLineConsoleHandler.java
@@ -49,7 +49,7 @@ public class JLineConsoleHandler extends ConsoleHandler {
console.setHandleUserInterrupt(true);
console.setExpandEvents(false);
} catch (IOException ex) {
- throw RCommand.fatal(ex, "unexpected error opening console reader");
+ throw RMain.fatal(ex, "unexpected error opening console reader");
}
}
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RAbstractLauncher.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RAbstractLauncher.java
deleted file mode 100644
index e3e043fe7ea9ef132bdb0022d8badf2af08aebc2..0000000000000000000000000000000000000000
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RAbstractLauncher.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.truffle.r.launcher;
-
-import java.io.Closeable;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.graalvm.launcher.AbstractLanguageLauncher;
-import org.graalvm.options.OptionCategory;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Context.Builder;
-
-import com.oracle.truffle.r.launcher.RCmdOptions.Client;
-import com.oracle.truffle.r.launcher.RCmdOptions.RCmdOption;
-import static com.oracle.truffle.r.launcher.RCommand.fatal;
-import java.io.File;
-import java.io.IOException;
-import org.graalvm.polyglot.Source;
-
-public abstract class RAbstractLauncher extends AbstractLanguageLauncher implements Closeable {
-
- private final Client client;
- protected final InputStream inStream;
- protected final OutputStream outStream;
- protected final OutputStream errStream;
- protected RCmdOptions options;
- private boolean useJVM;
- protected ConsoleHandler consoleHandler;
- protected Context context;
-
- RAbstractLauncher(Client client, String[] env, InputStream inStream, OutputStream outStream, OutputStream errStream) {
- this.client = client;
- assert env == null : "re-enble environment variables";
- this.inStream = inStream;
- this.outStream = outStream;
- this.errStream = errStream;
- }
-
- @Override
- protected List<String> preprocessArguments(List<String> arguments, Map<String, String> polyglotOptions) {
- boolean[] recognizedArgsIndices = new boolean[arguments.size()];
- this.options = RCmdOptions.parseArguments(client, arguments.toArray(new String[arguments.size()]), true, recognizedArgsIndices);
- List<String> unrecognizedArgs = new ArrayList<>();
- for (int i = 0; i < arguments.size(); i++) {
- if ("--jvm.help".equals(arguments.get(i))) {
- // This condition should be removed when the Launcher handles --jvm.help
- // correctly.
- printJvmHelp();
- throw exit();
- } else if ("--jvm".equals(arguments.get(i))) {
- useJVM = true;
- } else if (!recognizedArgsIndices[i]) {
- unrecognizedArgs.add(arguments.get(i));
- }
- }
-
- return unrecognizedArgs;
- }
-
- protected abstract String[] getArguments();
-
- @Override
- protected void launch(Builder contextBuilder) {
- this.consoleHandler = RCommand.createConsoleHandler(options, null, inStream, outStream);
- this.context = contextBuilder.allowAllAccess(true).allowHostAccess(useJVM).arguments("R", getArguments()).in(consoleHandler.createInputStream()).out(
- outStream).err(errStream).build();
- this.consoleHandler.setContext(context);
- try {
- Source src = Source.newBuilder("R", ".fastr.set.consoleHandler", "<set-console-handler>").internal(true).build();
- context.eval(src).execute(consoleHandler.getPolyglotWrapper());
- } catch (IOException e) {
- throw fatal(e, "error while setting console handler");
- }
- }
-
- @Override
- protected String getLanguageId() {
- return "R";
- }
-
- @Override
- protected void printHelp(OptionCategory maxCategory) {
- RCmdOptions.printHelp(client);
- }
-
- @Override
- protected void collectArguments(Set<String> opts) {
- for (RCmdOption option : RCmdOption.values()) {
- if (option.shortName != null) {
- opts.add(option.shortName);
- }
- if (option.plainName != null) {
- opts.add(option.plainName);
- }
- }
- }
-
- @Override
- protected String[] getDefaultLanguages() {
- if ("llvm".equals(System.getenv("FASTR_RFFI"))) {
- return new String[]{getLanguageId(), "llvm"};
- }
- return super.getDefaultLanguages();
- }
-
- @Override
- public void close() {
- if (context != null) {
- context.close();
- }
- }
-
- // The following code is copied from org.graalvm.launcher.Launcher and it should be removed
- // when the Launcher handles --jvm.help correctly.
-
- private static void printJvmHelp() {
- System.out.print("JVM options:");
- printOption("--jvm.classpath <...>", "A " + File.pathSeparator + " separated list of classpath entries that will be added to the JVM's classpath");
- printOption("--jvm.D<name>=<value>", "Set a system property");
- printOption("--jvm.esa", "Enable system assertions");
- printOption("--jvm.ea[:<packagename>...|:<classname>]", "Enable assertions with specified granularity");
- printOption("--jvm.agentlib:<libname>[=<options>]", "Load native agent library <libname>");
- printOption("--jvm.agentpath:<pathname>[=<options>]", "Load native agent library by full pathname");
- printOption("--jvm.javaagent:<jarpath>[=<options>]", "Load Java programming language agent");
- printOption("--jvm.Xbootclasspath/a:<...>", "A " + File.pathSeparator + " separated list of classpath entries that will be added to the JVM's boot classpath");
- printOption("--jvm.Xmx<size>", "Set maximum Java heap size");
- printOption("--jvm.Xms<size>", "Set initial Java heap size");
- printOption("--jvm.Xss<size>", "Set java thread stack size");
- }
-
- private static void printOption(String option, String description, int indentation) {
- String indent = spaces(indentation);
- String desc = wrap(description != null ? description : "");
- String nl = System.lineSeparator();
- String[] descLines = desc.split(nl);
- int optionWidth = 45;
- if (option.length() >= optionWidth && description != null) {
- System.out.println(indent + option + nl + indent + spaces(optionWidth) + descLines[0]);
- } else {
- System.out.println(indent + option + spaces(optionWidth - option.length()) + descLines[0]);
- }
- for (int i = 1; i < descLines.length; i++) {
- System.out.println(indent + spaces(optionWidth) + descLines[i]);
- }
- }
-
- static void printOption(String option, String description) {
- printOption(option, description, 2);
- }
-
- private static String spaces(int length) {
- return new String(new char[length]).replace('\0', ' ');
- }
-
- private static String wrap(String s) {
- final int width = 120;
- StringBuilder sb = new StringBuilder(s);
- int cursor = 0;
- while (cursor + width < sb.length()) {
- int i = sb.lastIndexOf(" ", cursor + width);
- if (i == -1 || i < cursor) {
- i = sb.indexOf(" ", cursor + width);
- }
- if (i != -1) {
- sb.replace(i, i + 1, System.lineSeparator());
- cursor = i;
- } else {
- break;
- }
- }
- return sb.toString();
- }
-
- // End of copied code
-}
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCmdOptions.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCmdOptions.java
index e9842604ba493260456bbadfb53592923db0d5e2..2ddb715ef2010bc3aa7779c004d5e5b414463d38 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCmdOptions.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCmdOptions.java
@@ -50,7 +50,7 @@ public final class RCmdOptions {
EITHER {
@Override
public String usage() {
- throw RCommand.fatal("can't call usage() on Client.EITHER");
+ throw RMain.fatal("can't call usage() on Client.EITHER");
}
};
@@ -194,6 +194,21 @@ public final class RCmdOptions {
}
}
+ public void addInteractive() {
+ setValue(RCmdOption.INTERACTIVE, true);
+ if (arguments == null || arguments.length == 0) {
+ arguments = new String[]{"--interactive"};
+ } else {
+ String[] oldArgs = arguments;
+ arguments = new String[arguments.length + 1];
+ arguments[0] = oldArgs[0];
+ arguments[1] = "--interactive";
+ for (int i = 1; i < oldArgs.length; i++) {
+ arguments[i + 1] = oldArgs[i];
+ }
+ }
+ }
+
public void setValue(RCmdOption option, boolean value) {
setValue(optionValues, option, value);
}
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/REPL.java
similarity index 62%
rename from com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java
rename to com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/REPL.java
index 261cc14678eefddc32b9aca2a248dddf3f6949a5..9be847012a900478db027bcba5734ddfb0eb1d16 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/REPL.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,181 +26,22 @@ import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Context.Builder;
import org.graalvm.polyglot.PolyglotException;
import org.graalvm.polyglot.Source;
-
-import com.oracle.truffle.r.launcher.RCmdOptions.Client;
-import com.oracle.truffle.r.launcher.RCmdOptions.RCmdOption;
+import org.graalvm.polyglot.Value;
import jline.console.UserInterruptException;
-/*
- * TODO:
- *
- * - create a replacement for "executor"
- *
- * - fatal needs to be handled more carefully in nested/spawned contexts
- */
-
/**
- * Emulates the (Gnu)R command as precisely as possible.
+ * Implements the read-eval-print loop.
+ *
+ * @see #readEvalPrint(Context, ConsoleHandler, File, boolean)
*/
-public class RCommand extends RAbstractLauncher {
-
- RCommand(String[] env, InputStream inStream, OutputStream outStream, OutputStream errStream) {
- super(Client.R, env, inStream, outStream, errStream);
- }
-
- @Override
- protected String[] getArguments() {
- return options.getArguments();
- }
-
- @Override
- protected void launch(Builder contextBuilder) {
- super.launch(contextBuilder);
- StartupTiming.timestamp("VM Created");
- StartupTiming.printSummary();
- }
-
- private int execute(String[] args) {
- StartupTiming.timestamp("Main Entered");
- ArrayList<String> argsList = new ArrayList<>(Arrays.asList(args));
- if (System.console() != null) {
- // add "--interactive" to force interactive mode
- boolean addArg = true;
- for (String arg : args) {
- if ("--interactive".equals(arg)) {
- addArg = false;
- break;
- }
- }
- if (addArg) {
- if (argsList.size() == 0) {
- argsList.add("--interactive");
- } else {
- argsList.add(1, "--interactive");
- }
- }
- }
-
- launch(argsList.toArray(new String[0]));
- if (context != null) {
- File srcFile = null;
- String fileOption = options.getString(RCmdOption.FILE);
- if (fileOption != null) {
- srcFile = new File(fileOption);
- }
-
- return readEvalPrint(context, consoleHandler, srcFile, true);
- } else {
- return 0;
- }
- }
-
- // CheckStyle: stop system..print check
- public static RuntimeException fatal(String message, Object... args) {
- System.out.println("FATAL: " + String.format(message, args));
- System.exit(-1);
- return new RuntimeException();
- }
-
- public static RuntimeException fatal(Throwable t, String message, Object... args) {
- t.printStackTrace();
- System.out.println("FATAL: " + String.format(message, args));
- System.exit(-1);
- return null;
- }
-
- static String[] prependCommand(String[] args) {
- String[] result = new String[args.length + 1];
- result[0] = "R";
- System.arraycopy(args, 0, result, 1, args.length);
- return result;
- }
-
- public static void main(String[] args) {
- try {
- System.exit(doMain(prependCommand(args), null, System.in, System.out, System.err));
- // never returns
- throw fatal("main should never return");
- } catch (Throwable t) {
- throw fatal(t, "error during REPL execution");
- }
- }
-
- public static int doMain(String[] args, String[] env, InputStream inStream, OutputStream outStream, OutputStream errStream) {
- try (RCommand rcmd = new RCommand(env, inStream, outStream, errStream)) {
- return rcmd.execute(args);
- }
- }
-
- public static ConsoleHandler createConsoleHandler(RCmdOptions options, DelegatingConsoleHandler useDelegatingWrapper, InputStream inStream, OutputStream outStream) {
- /*
- * Whether the input is from stdin, a file (-f), or an expression on the command line (-e)
- * it goes through the console. N.B. -f and -e can't be used together and this is already
- * checked.
- */
- RStartParams rsp = new RStartParams(options, false);
- String fileArgument = rsp.getFileArgument();
- if (fileArgument != null) {
- List<String> lines;
- try {
- /*
- * If initial==false, ~ expansion will not have been done and the open will fail.
- * It's harmless to always do it.
- */
- File file = fileArgument.startsWith("~") ? new File(System.getProperty("user.home") + fileArgument.substring(1)) : new File(fileArgument);
- lines = Files.readAllLines(file.toPath());
- } catch (IOException e) {
- throw fatal("cannot open file '%s': No such file or directory", fileArgument);
- }
- return new StringConsoleHandler(lines, outStream);
- } else if (options.getStringList(RCmdOption.EXPR) != null) {
- List<String> exprs = options.getStringList(RCmdOption.EXPR);
- for (int i = 0; i < exprs.size(); i++) {
- exprs.set(i, unescapeSpace(exprs.get(i)));
- }
- return new StringConsoleHandler(exprs, outStream);
- } else {
- boolean isInteractive = options.getBoolean(RCmdOption.INTERACTIVE);
- if (!isInteractive && rsp.askForSave()) {
- throw fatal("you must specify '--save', '--no-save' or '--vanilla'");
- }
- boolean useReadLine = isInteractive && !rsp.noReadline();
- if (useDelegatingWrapper != null) {
- /*
- * If we are in embedded mode, the creation of ConsoleReader and the ConsoleHandler
- * should be lazy, as these may not be necessary and can cause hangs if stdin has
- * been redirected.
- */
- Supplier<ConsoleHandler> delegateFactory = useReadLine ? () -> new JLineConsoleHandler(inStream, outStream, rsp.isSlave())
- : () -> new DefaultConsoleHandler(inStream, outStream, isInteractive);
- useDelegatingWrapper.setDelegate(delegateFactory);
- return useDelegatingWrapper;
- } else {
- if (useReadLine) {
- return new JLineConsoleHandler(inStream, outStream, rsp.isSlave());
- } else {
- return new DefaultConsoleHandler(inStream, outStream, isInteractive);
- }
- }
- }
- }
-
+public class REPL {
/**
* The standard R script escapes spaces to "~+~" in "-e" and "-f" commands.
*/
@@ -275,7 +116,7 @@ public class RCommand extends RAbstractLauncher {
context.eval(src);
}
} catch (InterruptedException ex) {
- throw fatal("Unexpected interrup error");
+ throw RMain.fatal("Unexpected interrup error");
} catch (PolyglotException e) {
if (e.isIncompleteSource()) {
if (continuePrompt == null) {
@@ -314,7 +155,7 @@ public class RCommand extends RAbstractLauncher {
} else if (e2.isCancelled()) {
continue;
}
- throw fatal(e, "error while calling quit");
+ throw RMain.fatal(e, "error while calling quit");
}
} catch (UserInterruptException e) {
// interrupted by ctrl-c
@@ -374,7 +215,7 @@ public class RCommand extends RAbstractLauncher {
}
}
- private static boolean doEcho(ExecutorService executor, Context context) throws InterruptedException, ExecutionException {
+ private static boolean doEcho(ExecutorService executor, Context context) throws InterruptedException {
try {
if (executor != null) {
return executor.submit(() -> doEcho(context)).get();
@@ -382,12 +223,12 @@ public class RCommand extends RAbstractLauncher {
return doEcho(context);
}
} catch (ExecutionException ex) {
- throw fatal(ex, "error while retrieving echo");
+ throw RMain.fatal(ex, "error while retrieving echo");
} catch (PolyglotException e) {
if (e.isExit()) {
throw new ExitException(e.getExitStatus());
}
- throw fatal(e, "error while retrieving echo");
+ throw RMain.fatal(e, "error while retrieving echo");
}
}
@@ -403,12 +244,12 @@ public class RCommand extends RAbstractLauncher {
return getPrompt(context);
}
} catch (ExecutionException ex) {
- throw fatal(ex, "error while retrieving prompt");
+ throw RMain.fatal(ex, "error while retrieving prompt");
} catch (PolyglotException e) {
if (e.isExit()) {
throw new ExitException(e.getExitStatus());
}
- throw fatal(e, "error while retrieving prompt");
+ throw RMain.fatal(e, "error while retrieving prompt");
}
}
@@ -424,12 +265,12 @@ public class RCommand extends RAbstractLauncher {
return getPrompt(context);
}
} catch (ExecutionException ex) {
- throw fatal(ex, "error while retrieving continue prompt");
+ throw RMain.fatal(ex, "error while retrieving continue prompt");
} catch (PolyglotException e) {
if (e.isExit()) {
throw new ExitException(e.getExitStatus());
}
- throw fatal(e, "error while retrieving continue prompt");
+ throw RMain.fatal(e, "error while retrieving continue prompt");
}
}
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RMain.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RMain.java
new file mode 100644
index 0000000000000000000000000000000000000000..2e0af3afcd0e7712bcb00f863a01da3c18bc0084
--- /dev/null
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RMain.java
@@ -0,0 +1,410 @@
+/*
+ * Copyright (c) 2018, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 3 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 3 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.launcher;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.graalvm.launcher.AbstractLanguageLauncher;
+import org.graalvm.options.OptionCategory;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Context.Builder;
+import org.graalvm.polyglot.PolyglotException;
+import org.graalvm.polyglot.Source;
+
+import com.oracle.truffle.r.launcher.RCmdOptions.Client;
+import com.oracle.truffle.r.launcher.RCmdOptions.RCmdOption;
+
+/**
+ * Main entry point for the R engine. The first argument must be either {@code 'R'} or
+ * {@code 'Rscript'} and decides which of the two R commands will be run.
+ */
+public final class RMain extends AbstractLanguageLauncher implements Closeable {
+
+ public static void main(String[] args) {
+ new RMain().launch(args);
+ }
+
+ public static int runR(String[] args, InputStream inStream, OutputStream outStream, OutputStream errStream) {
+ return runROrRScript("R", args, inStream, outStream, errStream);
+ }
+
+ public static int runRscript(String[] args, InputStream inStream, OutputStream outStream, OutputStream errStream) {
+ return runROrRScript("Rscript", args, inStream, outStream, errStream);
+ }
+
+ private static int runROrRScript(String command, String[] args, InputStream inStream, OutputStream outStream, OutputStream errStream) {
+ String[] newArgs = new String[args.length + 1];
+ System.arraycopy(args, 0, newArgs, 1, args.length);
+ newArgs[0] = command;
+ try (RMain cmd = new RMain(false, inStream, outStream, errStream)) {
+ cmd.launch(newArgs);
+ return cmd.execute();
+ }
+ }
+
+ /**
+ * Tells this R launcher to not process the {@code --jvm} and {@code --jvm.help}. Normally such
+ * arguments are processed by the native launcher, but if there is no native launcher, we need
+ * to explicitly process them in this class since the Truffle launcher does not count on this
+ * eventuality.
+ */
+ private static final boolean ignoreJvmArguments = "true".equals(System.getProperty("fastr.internal.ignorejvmargs"));
+
+ protected final InputStream inStream;
+ protected final OutputStream outStream;
+ protected final OutputStream errStream;
+
+ /**
+ * In launcher mode {@link #launch(String[])} runs the command and uses {@link System#exit(int)}
+ * to terminate and return the status. In non-launcher mode, {@link #launch(String[])} only
+ * prepares the {@link Context} and then {@link #execute()} executes the command itself and
+ * returns the status.
+ */
+ protected final boolean launcherMode;
+
+ private Client client;
+ private RCmdOptions options;
+ private ConsoleHandler consoleHandler;
+ private String[] rArguments;
+ private boolean useJVM;
+ private Context preparedContext; // to transfer between launch and execute when !launcherMode
+
+ private RMain(boolean launcherMode, InputStream inStream, OutputStream outStream, OutputStream errStream) {
+ this.launcherMode = launcherMode;
+ this.inStream = inStream;
+ this.outStream = outStream;
+ this.errStream = errStream;
+ }
+
+ private RMain() {
+ this.launcherMode = true;
+ this.inStream = System.in;
+ this.outStream = System.out;
+ this.errStream = System.err;
+ }
+
+ @Override
+ protected List<String> preprocessArguments(List<String> arguments, Map<String, String> polyglotOptions) {
+ String clientName = arguments.size() > 0 ? arguments.get(0).trim() : null;
+ if ("R".equals(clientName)) {
+ client = Client.R;
+ } else if ("Rscript".equals(clientName)) {
+ client = Client.RSCRIPT;
+ } else {
+ System.err.printf("RMain: the first argument must be either 'R' or 'Rscript'. Given was '%s'.\n", clientName);
+ System.err.println("If you did not run RMain class explicitly, then this is a bug in launcher script, please report it at http://github.com/oracle/fastr.");
+ if (launcherMode) {
+ System.exit(1);
+ }
+ return arguments;
+ }
+ boolean[] recognizedArgsIndices = new boolean[arguments.size()];
+ options = RCmdOptions.parseArguments(client, arguments.toArray(new String[arguments.size()]), true, recognizedArgsIndices);
+ if (System.console() != null && client == Client.R) {
+ options.addInteractive();
+ }
+ List<String> unrecognizedArgs = new ArrayList<>();
+ for (int i = 0; i < arguments.size(); i++) {
+ if (!ignoreJvmArguments && "--jvm.help".equals(arguments.get(i))) {
+ // This condition should be removed when FastR always ships with native launcher
+ // that handles this option for us
+ printJvmHelp();
+ throw exit();
+ } else if (!ignoreJvmArguments && "--jvm".equals(arguments.get(i))) {
+ useJVM = true;
+ } else
+
+ if (!recognizedArgsIndices[i]) {
+ unrecognizedArgs.add(arguments.get(i));
+ }
+ }
+ return unrecognizedArgs;
+ }
+
+ @Override
+ protected void validateArguments(Map<String, String> polyglotOptions) {
+ if (options == null) {
+ // preprocessArguments did not set the value
+ return;
+ }
+ if (client == Client.RSCRIPT) {
+ try {
+ rArguments = preprocessRScriptOptions(options);
+ } catch (PrintHelp e) {
+ printHelp(OptionCategory.USER);
+ }
+ } else {
+ rArguments = this.options.getArguments();
+ }
+ }
+
+ @Override
+ protected void launch(Builder contextBuilder) {
+ assert client != null;
+ if (rArguments == null) {
+ // validateArguments did not set the value
+ return;
+ }
+ this.consoleHandler = ConsoleHandler.createConsoleHandler(options, null, inStream, outStream);
+ Builder contextBuilderAllowAll = contextBuilder.allowAllAccess(true);
+ if (ignoreJvmArguments) {
+ contextBuilderAllowAll = contextBuilderAllowAll.allowHostAccess(useJVM);
+ }
+ Context context = preparedContext = contextBuilderAllowAll.arguments("R", rArguments).in(consoleHandler.createInputStream()).out(outStream).err(errStream).build();
+ this.consoleHandler.setContext(context);
+ try {
+ Source src = Source.newBuilder("R", ".fastr.set.consoleHandler", "<set-console-handler>").internal(true).build();
+ context.eval(src).execute(consoleHandler.getPolyglotWrapper());
+ } catch (IOException e) {
+ throw fatal(e, "error while setting console handler");
+ }
+ if (launcherMode) {
+ try {
+ System.exit(execute(context));
+ } finally {
+ context.close();
+ }
+ }
+ }
+
+ protected int execute() {
+ if (preparedContext == null) {
+ // launch did not set the value
+ return 1;
+ }
+ return execute(preparedContext);
+ }
+
+ protected int execute(Context context) {
+ String fileOption = options.getString(RCmdOption.FILE);
+ File srcFile = null;
+ if (fileOption != null) {
+ if (client == Client.RSCRIPT) {
+ return executeFile(context, fileOption);
+ }
+ srcFile = new File(fileOption);
+ }
+ return REPL.readEvalPrint(context, consoleHandler, srcFile, true);
+ }
+
+ @Override
+ protected String getLanguageId() {
+ return "R";
+ }
+
+ @Override
+ protected void printHelp(OptionCategory maxCategory) {
+ assert client != null;
+ RCmdOptions.printHelp(client);
+ }
+
+ @Override
+ protected void collectArguments(Set<String> opts) {
+ for (RCmdOption option : RCmdOption.values()) {
+ if (option.shortName != null) {
+ opts.add(option.shortName);
+ }
+ if (option.plainName != null) {
+ opts.add(option.plainName);
+ }
+ }
+ }
+
+ @Override
+ protected String[] getDefaultLanguages() {
+ if ("llvm".equals(System.getenv("FASTR_RFFI"))) {
+ return new String[]{getLanguageId(), "llvm"};
+ }
+ return super.getDefaultLanguages();
+ }
+
+ @Override
+ public void close() {
+ if (preparedContext != null) {
+ preparedContext.close();
+ }
+ }
+
+ private static int executeFile(Context context, String fileOption) {
+ Source src;
+ try {
+ src = Source.newBuilder("R", new File(fileOption)).interactive(false).build();
+ } catch (IOException ex) {
+ System.err.printf("IO error while reading the source file '%s'.\nDetails: '%s'.", fileOption, ex.getLocalizedMessage());
+ return 1;
+ }
+ try {
+ context.eval(src);
+ return 0;
+ } catch (Throwable ex) {
+ if (ex instanceof PolyglotException && ((PolyglotException) ex).isExit()) {
+ return ((PolyglotException) ex).getExitStatus();
+ }
+ // Internal exceptions are reported by the engine already
+ return 1;
+ }
+ }
+
+ // CheckStyle: stop system..print check
+ public static RuntimeException fatal(String message, Object... args) {
+ System.out.println("FATAL: " + String.format(message, args));
+ System.exit(-1);
+ return new RuntimeException();
+ }
+
+ public static RuntimeException fatal(Throwable t, String message, Object... args) {
+ t.printStackTrace();
+ System.out.println("FATAL: " + String.format(message, args));
+ System.exit(-1);
+ return null;
+ }
+
+ // CheckStyle: stop system..print check
+
+ private static String[] preprocessRScriptOptions(RCmdOptions options) throws PrintHelp {
+ String[] arguments = options.getArguments();
+ int resultArgsLength = arguments.length;
+ int firstNonOptionArgIndex = options.getFirstNonOptionArgIndex();
+ // Now reformat the args, setting --slave and --no-restore as per the spec
+ ArrayList<String> adjArgs = new ArrayList<>(resultArgsLength + 1);
+ adjArgs.add(arguments[0]);
+ adjArgs.add("--slave");
+ options.setValue(RCmdOption.SLAVE, true);
+ adjArgs.add("--no-restore");
+ options.setValue(RCmdOption.NO_RESTORE, true);
+ // Either -e options are set or first non-option arg is a file
+ if (options.getStringList(RCmdOption.EXPR) == null) {
+ if (firstNonOptionArgIndex == resultArgsLength) {
+ throw new PrintHelp();
+ } else {
+ options.setValue(RCmdOption.FILE, arguments[firstNonOptionArgIndex]);
+ }
+ }
+ String defaultPackagesArg = options.getString(RCmdOption.DEFAULT_PACKAGES);
+ String defaultPackagesEnv = System.getenv("R_DEFAULT_PACKAGES");
+ if (defaultPackagesArg == null && defaultPackagesEnv == null) {
+ defaultPackagesArg = "datasets,utils,grDevices,graphics,stats";
+ }
+ if (defaultPackagesEnv == null) {
+ options.setValue(RCmdOption.DEFAULT_PACKAGES, defaultPackagesArg);
+ }
+ // copy up to non-option args
+ int rx = 1;
+ while (rx < firstNonOptionArgIndex) {
+ adjArgs.add(arguments[rx]);
+ rx++;
+ }
+ if (options.getString(RCmdOption.FILE) != null) {
+ adjArgs.add("--file=" + options.getString(RCmdOption.FILE));
+ rx++; // skip over file arg
+ firstNonOptionArgIndex++;
+ }
+
+ if (firstNonOptionArgIndex < resultArgsLength) {
+ adjArgs.add("--args");
+ while (rx < resultArgsLength) {
+ adjArgs.add(arguments[rx++]);
+ }
+ }
+ return adjArgs.toArray(new String[adjArgs.size()]);
+ }
+
+ @SuppressWarnings("serial")
+ static class PrintHelp extends Exception {
+ @Override
+ public synchronized Throwable fillInStackTrace() {
+ return this;
+ }
+ }
+
+ // The following code is copied from org.graalvm.launcher.Launcher and it should be removed
+ // when the R launcher always ships native version that handles --jvm.help for us.
+
+ private static void printJvmHelp() {
+ System.out.println("JVM options:");
+ printOption("--jvm.classpath <...>", "A " + File.pathSeparator + " separated list of classpath entries that will be added to the JVM's classpath");
+ printOption("--jvm.D<name>=<value>", "Set a system property");
+ printOption("--jvm.esa", "Enable system assertions");
+ printOption("--jvm.ea[:<packagename>...|:<classname>]", "Enable assertions with specified granularity");
+ printOption("--jvm.agentlib:<libname>[=<options>]", "Load native agent library <libname>");
+ printOption("--jvm.agentpath:<pathname>[=<options>]", "Load native agent library by full pathname");
+ printOption("--jvm.javaagent:<jarpath>[=<options>]", "Load Java programming language agent");
+ printOption("--jvm.Xbootclasspath/a:<...>", "A " + File.pathSeparator + " separated list of classpath entries that will be added to the JVM's boot classpath");
+ printOption("--jvm.Xmx<size>", "Set maximum Java heap size");
+ printOption("--jvm.Xms<size>", "Set initial Java heap size");
+ printOption("--jvm.Xss<size>", "Set java thread stack size");
+ }
+
+ private static void printOption(String option, String description, int indentation) {
+ String indent = spaces(indentation);
+ String desc = wrap(description != null ? description : "");
+ String nl = System.lineSeparator();
+ String[] descLines = desc.split(nl);
+ int optionWidth = 45;
+ if (option.length() >= optionWidth && description != null) {
+ System.out.println(indent + option + nl + indent + spaces(optionWidth) + descLines[0]);
+ } else {
+ System.out.println(indent + option + spaces(optionWidth - option.length()) + descLines[0]);
+ }
+ for (int i = 1; i < descLines.length; i++) {
+ System.out.println(indent + spaces(optionWidth) + descLines[i]);
+ }
+ }
+
+ static void printOption(String option, String description) {
+ printOption(option, description, 2);
+ }
+
+ private static String spaces(int length) {
+ return new String(new char[length]).replace('\0', ' ');
+ }
+
+ private static String wrap(String s) {
+ final int width = 120;
+ StringBuilder sb = new StringBuilder(s);
+ int cursor = 0;
+ while (cursor + width < sb.length()) {
+ int i = sb.lastIndexOf(" ", cursor + width);
+ if (i == -1 || i < cursor) {
+ i = sb.indexOf(" ", cursor + width);
+ }
+ if (i != -1) {
+ sb.replace(i, i + 1, System.lineSeparator());
+ cursor = i;
+ } else {
+ break;
+ }
+ }
+ return sb.toString();
+ }
+
+ // End of copied code
+}
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RStartParams.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RStartParams.java
index fba99e9eff339554c6369c391cd9873efc78dbd2..20e36f864816a3a6996386e0eea19315c3092dda 100644
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RStartParams.java
+++ b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RStartParams.java
@@ -97,7 +97,7 @@ public class RStartParams {
List<String> expressions = options.getStringList(EXPR);
if (file != null) {
if (expressions != null) {
- throw RCommand.fatal("cannot use -e with -f or --file");
+ throw RMain.fatal("cannot use -e with -f or --file");
}
this.askForSave = false;
this.save = false;
@@ -105,7 +105,7 @@ public class RStartParams {
// means stdin, but still implies NO_SAVE
file = null;
} else {
- file = RCommand.unescapeSpace(file);
+ file = REPL.unescapeSpace(file);
}
this.interactive = false;
} else if (expressions != null) {
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RscriptCommand.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RscriptCommand.java
deleted file mode 100644
index 2f3915b32c31bc311a92ee1c3dd7ee9fc1b8c05c..0000000000000000000000000000000000000000
--- a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RscriptCommand.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 3 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 3 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.truffle.r.launcher;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.graalvm.options.OptionCategory;
-import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.polyglot.Source;
-
-import com.oracle.truffle.r.launcher.RCmdOptions.Client;
-import com.oracle.truffle.r.launcher.RCmdOptions.RCmdOption;
-
-/**
- * Emulates the (Gnu)Rscript command as precisely as possible. in GnuR, Rscript is a genuine wrapper
- * to R, as evidenced by the script {@code print(commandArgs())}. We don't implement it quite that
- * way but the effect is similar.
- *
- */
-public final class RscriptCommand extends RAbstractLauncher {
-
- private String[] rScriptArguments;
-
- RscriptCommand(String[] env, InputStream inStream, OutputStream outStream, OutputStream errStream) {
- super(Client.RSCRIPT, env, inStream, outStream, errStream);
- }
-
- @Override
- protected void validateArguments(Map<String, String> polyglotOptions) {
- try {
- this.rScriptArguments = preprocessRScriptOptions(options);
- } catch (PrintHelp e) {
- printHelp(OptionCategory.USER);
- }
- }
-
- @Override
- protected String[] getArguments() {
- return rScriptArguments;
- }
-
- protected int execute(String[] args) {
- launch(args);
- if (context != null) {
- String fileOption = options.getString(RCmdOption.FILE);
- if (fileOption != null) {
- return executeFile(fileOption);
- } else {
- return RCommand.readEvalPrint(context, consoleHandler, null, true);
- }
- } else {
- return 0;
- }
- }
-
- private int executeFile(String fileOption) {
- Source src;
- try {
- src = Source.newBuilder("R", new File(fileOption)).interactive(false).build();
- } catch (IOException ex) {
- System.err.printf("IO error while reading the source file '%s'.\nDetails: '%s'.", fileOption, ex.getLocalizedMessage());
- return 1;
- }
- try {
- context.eval(src);
- return 0;
- } catch (Throwable ex) {
- if (ex instanceof PolyglotException && ((PolyglotException) ex).isExit()) {
- return ((PolyglotException) ex).getExitStatus();
- }
- // Internal exceptions are reported by the engine already
- return 1;
- }
- }
-
- // CheckStyle: stop system..print check
-
- private static String[] preprocessRScriptOptions(RCmdOptions options) throws PrintHelp {
- String[] arguments = options.getArguments();
- int resultArgsLength = arguments.length;
- int firstNonOptionArgIndex = options.getFirstNonOptionArgIndex();
- // Now reformat the args, setting --slave and --no-restore as per the spec
- ArrayList<String> adjArgs = new ArrayList<>(resultArgsLength + 1);
- adjArgs.add(arguments[0]);
- adjArgs.add("--slave");
- options.setValue(RCmdOption.SLAVE, true);
- adjArgs.add("--no-restore");
- options.setValue(RCmdOption.NO_RESTORE, true);
- // Either -e options are set or first non-option arg is a file
- if (options.getStringList(RCmdOption.EXPR) == null) {
- if (firstNonOptionArgIndex == resultArgsLength) {
- throw new PrintHelp();
- } else {
- options.setValue(RCmdOption.FILE, arguments[firstNonOptionArgIndex]);
- }
- }
- String defaultPackagesArg = options.getString(RCmdOption.DEFAULT_PACKAGES);
- String defaultPackagesEnv = System.getenv("R_DEFAULT_PACKAGES");
- if (defaultPackagesArg == null && defaultPackagesEnv == null) {
- defaultPackagesArg = "datasets,utils,grDevices,graphics,stats";
- }
- if (defaultPackagesEnv == null) {
- options.setValue(RCmdOption.DEFAULT_PACKAGES, defaultPackagesArg);
- }
- // copy up to non-option args
- int rx = 1;
- while (rx < firstNonOptionArgIndex) {
- adjArgs.add(arguments[rx]);
- rx++;
- }
- if (options.getString(RCmdOption.FILE) != null) {
- adjArgs.add("--file=" + options.getString(RCmdOption.FILE));
- rx++; // skip over file arg
- firstNonOptionArgIndex++;
- }
-
- if (firstNonOptionArgIndex < resultArgsLength) {
- adjArgs.add("--args");
- while (rx < resultArgsLength) {
- adjArgs.add(arguments[rx++]);
- }
- }
- return adjArgs.toArray(new String[adjArgs.size()]);
- }
-
- @SuppressWarnings("serial")
- static class PrintHelp extends Exception {
- }
-
- public static void main(String[] args) {
- System.exit(doMain(RCommand.prependCommand(args), null, System.in, System.out, System.err));
- throw RCommand.fatal("should not reach here");
- }
-
- public static int doMain(String[] args, String[] env, InputStream inStream, OutputStream outStream, OutputStream errStream) {
- try (RscriptCommand rcmd = new RscriptCommand(env, inStream, outStream, errStream)) {
- return rcmd.execute(args);
- }
- }
-}
diff --git a/com.oracle.truffle.r.native/run/Makefile b/com.oracle.truffle.r.native/run/Makefile
index 6c95f70f2be506512687fe560f317ef3c63a7b49..5ee2435d2478265e312c3c2ff61985036fa8fffc 100644
--- a/com.oracle.truffle.r.native/run/Makefile
+++ b/com.oracle.truffle.r.native/run/Makefile
@@ -100,6 +100,8 @@ ifeq ($(FASTR_RFFI),llvm)
endif
cp Makeconf.etc $(FASTR_ETC_DIR)/Makeconf
+ ## deploy helper script that can build native-image of FastR and update the launchers in GraalVM
+ cp install_r_native_image $(FASTR_BIN_DIR)
## prepare the configuration artefacts for the manual FastR configuration in GraalVM
cp configure_fastr $(FASTR_BIN_DIR)
chmod +x $(FASTR_BIN_DIR)/configure_fastr
diff --git a/com.oracle.truffle.r.native/run/install_r_native_image b/com.oracle.truffle.r.native/run/install_r_native_image
new file mode 100755
index 0000000000000000000000000000000000000000..a9faede2aaea8b984dd852329917ee2a781b9a18
--- /dev/null
+++ b/com.oracle.truffle.r.native/run/install_r_native_image
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# This script is deployed as <FASTR>/bin/install_r_native_image
+set -e
+
+source="${BASH_SOURCE[0]}"
+# "un-link" the source path
+while [ -h "$source" ] ; do
+ prev_source="$source"
+ source="$(readlink "$source")";
+ if [[ "$source" != /* ]]; then
+ # if the link was relative, it was relative to where it came from
+ dir="$( cd -P "$( dirname "$prev_source" )" && pwd )"
+ source="$dir/$source"
+ fi
+done
+fastr_home="$(dirname "$source")/.."
+
+silent=0
+uninstall=0
+for arg in "$@"; do
+ if [[ $arg == "--silent" ]]; then
+ silent=1
+ elif [[ $arg == "uninstall" ]]; then
+ uninstall=1
+ elif [[ $arg == "--help" ]]; then
+ echo "Usage: install_r_native_image [uninstall] [--silent]"
+ echo "When 'uninstall' argument is not present: builds and installs native image of the R runtime."
+ echo "When 'uninstall' argument is present: uninstalls previously installed native image of the R runtime."
+ echo "Use the --silent option to turn off the confirmation when installing."
+ fi
+done
+
+if [[ $uninstall -eq 1 ]]; then
+ echo "Uninstalling native image of R runtime..."
+ mv "$fastr_home/bin/exec_R.backup" "$fastr_home/bin/exec/R"
+ mv "$fastr_home/bin/Rscript.backup" "$fastr_home/bin/Rscript"
+ rm -f "$fastr_home/bin/RorRscriptDispatcher"
+ echo "Native image of R runtime uninstalled"
+ exit 0
+fi
+
+if [[ $silent -eq 0 ]]; then
+ echo "This script is going to build a native image of the R runtime and update the R launchers to use that image as the default, i.e., when '--jvm' option is not used."
+ echo "The build takes several minutes and needs a minimum of 6GB of RAM and 150MB of free disk space. The computer may lag during the build."
+ read -p "Are you sure you want to build and install the native image of the R runtime? (Yy/Nn) " -n 1 -r
+ echo
+ if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+ echo "Installation cancelled..."
+ exit 2
+ fi
+fi
+
+cd "$fastr_home/bin"
+../../../../bin/native-image --no-server --language:R
+cp "exec/R" "exec_R.backup"
+cp "Rscript" "Rscript.backup"
+sed -e '/^## REMOVE FOR NATIVE IMAGE: BEGIN/,/^## REMOVE FOR NATIVE IMAGE: END/d;' "exec_R.backup" | \
+ sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" R "${FASTR_INTERNAL_ARGS[@]}" "$@"|' > "exec/R"
+sed -e '/^## REMOVE FOR NATIVE IMAGE: BEGIN/,/^## REMOVE FOR NATIVE IMAGE: END/d;' "Rscript.backup" | \
+ sed -e 's|^exec "$JAVA_HOME/bin/java" .*|exec "$R_HOME/bin/RMain" Rscript "${FASTR_INTERNAL_ARGS[@]}" "$@"|' > "Rscript"
diff --git a/com.oracle.truffle.r.release/src/R_legacy b/com.oracle.truffle.r.release/src/R_legacy
index ebb220d571adfc974108e1a5e998100b1cd59595..b2640a971ea01b1ace066af0cfe708aa8f3a48f3 100755
--- a/com.oracle.truffle.r.release/src/R_legacy
+++ b/com.oracle.truffle.r.release/src/R_legacy
@@ -23,6 +23,7 @@ for i in $(seq 1 ${dir_count}); do
JRE="$( dirname "$JRE" )"
done
+## REMOVE FOR NATIVE IMAGE: BEGIN
absolute_cp=()
jvm_args=()
launcher_args=()
@@ -67,6 +68,7 @@ JAVA_HOME="$( dirname "$JRE" )"
cp="$(IFS=: ; echo "${absolute_cp[*]}")"
cp="$JAVA_HOME/jre/languages/R/legacy/fastr-legacy-launcher.jar:$cp"
+## REMOVE FOR NATIVE IMAGE: END
# internal variable used to pass args to child R processes
if [ -z "$FASTR_INTERNAL_ARGS" ]; then
FASTR_INTERNAL_ARGS=()
@@ -74,4 +76,4 @@ fi
# we can invoke FastR directly, but we do have to set R_HOME
export R_HOME="$JRE/languages/R"
-exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx8g "${jvm_args[@]}" com.oracle.truffle.r.legacylauncher.LegacyLauncher com.oracle.truffle.r.launcher.RCommand "${FASTR_INTERNAL_ARGS[@]}" "${launcher_args[@]}"
+exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx8g "${jvm_args[@]}" com.oracle.truffle.r.legacylauncher.LegacyLauncher com.oracle.truffle.r.launcher.RMain R "${FASTR_INTERNAL_ARGS[@]}" "${launcher_args[@]}"
diff --git a/com.oracle.truffle.r.release/src/Rscript_legacy b/com.oracle.truffle.r.release/src/Rscript_legacy
index f34da5ce8299f912f9434d1be900a7d6672593f2..88ab22b81b430c516974e0fbb780c3ba6a50e7c8 100755
--- a/com.oracle.truffle.r.release/src/Rscript_legacy
+++ b/com.oracle.truffle.r.release/src/Rscript_legacy
@@ -23,6 +23,7 @@ for i in $(seq 1 ${dir_count}); do
JRE="$( dirname "$JRE" )"
done
+## REMOVE FOR NATIVE IMAGE: BEGIN
absolute_cp=()
jvm_args=()
launcher_args=()
@@ -67,6 +68,7 @@ JAVA_HOME="$( dirname "$JRE" )"
cp="$(IFS=: ; echo "${absolute_cp[*]}")"
cp="$JAVA_HOME/jre/languages/R/legacy/fastr-legacy-launcher.jar:$cp"
+## REMOVE FOR NATIVE IMAGE: END
# internal variable used to pass args to child R processes
if [ -z "$FASTR_INTERNAL_ARGS" ]; then
FASTR_INTERNAL_ARGS=()
@@ -74,4 +76,4 @@ fi
# we can invoke FastR directly, but we do have to set R_HOME
export R_HOME="$JRE/languages/R"
-exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx4g "${jvm_args[@]}" com.oracle.truffle.r.legacylauncher.LegacyLauncher com.oracle.truffle.r.launcher.RscriptCommand "${FASTR_INTERNAL_ARGS[@]}" "${launcher_args[@]}"
+exec "$JAVA_HOME/bin/java" -cp "$cp" -noverify -Dgraal.TruffleCompilationThreshold=10000 -Dgraal.TruffleCompilerThreads=2 -Xmx4g "${jvm_args[@]}" com.oracle.truffle.r.legacylauncher.LegacyLauncher com.oracle.truffle.r.launcher.RMain Rscript "${FASTR_INTERNAL_ARGS[@]}" "${launcher_args[@]}"
diff --git a/mx.fastr/mx_fastr.py b/mx.fastr/mx_fastr.py
index 6907e4a77125a2db3166400a66467efaf5cd3ccc..c8cac58a4d60a62365b206c387e1f056187a33cb 100644
--- a/mx.fastr/mx_fastr.py
+++ b/mx.fastr/mx_fastr.py
@@ -45,10 +45,10 @@ was passed as an mx global option.
_fastr_suite = mx.suite('fastr')
-_command_class_dict = {'r': "com.oracle.truffle.r.launcher.RCommand",
- 'rscript': "com.oracle.truffle.r.launcher.RscriptCommand",
- 'rrepl': "com.oracle.truffle.tools.debug.shell.client.SimpleREPLClient",
- 'rembed': "com.oracle.truffle.r.engine.shell.REmbedded",
+_command_class_dict = {'r': ["com.oracle.truffle.r.launcher.RMain", "R"],
+ 'rscript': ["com.oracle.truffle.r.launcher.RMain", "Rscript"],
+ 'rrepl': ["com.oracle.truffle.tools.debug.shell.client.SimpleREPLClient"],
+ 'rembed': ["com.oracle.truffle.r.engine.shell.REmbedded"],
}
# benchmarking support
def r_path():
@@ -104,7 +104,7 @@ def do_run_r(args, command, extraVmArgs=None, jdk=None, **kwargs):
vmArgs = _sanitize_vmArgs(jdk, vmArgs)
if command:
- vmArgs.append(_command_class_dict[command.lower()])
+ vmArgs.extend(_command_class_dict[command.lower()])
return mx.run_java(vmArgs + args, jdk=jdk, **kwargs)
def r_classpath(args):
diff --git a/mx.fastr/mx_fastr_dists.py b/mx.fastr/mx_fastr_dists.py
index e18e321abc008c086c04250fd03a70f35d0c8a51..ee304ad2356c0554e79e9de0b7a9e701556becc8 100644
--- a/mx.fastr/mx_fastr_dists.py
+++ b/mx.fastr/mx_fastr_dists.py
@@ -268,6 +268,7 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
"bin/fastr_jars/graal-sdk*",
],
},
+ "dependency:fastr:FASTR_LAUNCHER",
],
"LICENSE_FASTR" : "file:LICENSE",
"3rd_party_licenses_fastr.txt" : "file:3rd_party_licenses.txt",
diff --git a/mx.fastr/native-image.properties b/mx.fastr/native-image.properties
index 48ad9b11c82930294f222d907b0acacefeb2043f..b0cc90d91ab5aedb578d11286463aca565819be9 100644
--- a/mx.fastr/native-image.properties
+++ b/mx.fastr/native-image.properties
@@ -1,16 +1,22 @@
# This file contains native-image arguments needed to fastr
#
-ImageName = R
+ImageName = RMain
Requires = tool:truffle
JavaArgs = \
-Dfastr.resource.factory.class=com.oracle.truffle.r.nodes.builtin.EagerResourceHandlerFactory \
-Dfastr.internal.grid.awt.support=false \
+ -Dfastr.internal.usemxbeans=false \
+ -Dfastr.internal.usenativeeventloop=false \
+ -Dfastr.internal.defaultdownloadmethod=wget \
+ -Dfastr.internal.ignorejvmargs=true \
-Xmx6G
-Args = -H:Class=com.oracle.truffle.r.launcher.RCommand \
- -H:MaxRuntimeCompileMethods=8000 \
+LauncherClass = com.oracle.truffle.r.launcher.RMain
+LauncherClassPath = lib/graalvm/launcher-common.jar:languages/R/fastr-launcher.jar
+
+Args = -H:MaxRuntimeCompileMethods=8000 \
-H:-TruffleCheckFrameImplementation \
-H:+TruffleCheckNeverPartOfCompilation
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 63d619f77549af7038a38bd5689e18fc32dc449c..6eaff94f25cbb4f111ef35d084a6eca7bcf657fb 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -366,6 +366,14 @@ suite = {
],
},
+ "FASTR_LAUNCHER" : {
+ "description" : "launcher for the GraalVM (at the moment used only when native image is installed)",
+ "dependencies" : ["com.oracle.truffle.r.launcher"],
+ "distDependencies" : [
+ "sdk:GRAAL_SDK"
+ ],
+ },
+
"FASTR" : {
"description" : "class files for compiling against FastR in a separate suite",
"dependencies" : [