From e12324853c76e35bd2b3b130438d1727b0febe61 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Thu, 12 Apr 2018 11:46:35 +0200
Subject: [PATCH] Launcher fix: let the polyglot options to be processed by the
polyglot launcher
(cherry picked from commit 51e7b1b2475e47a1f8a04a5fec0b78579f69ce9a)
---
.../src/com/oracle/truffle/r/launcher/RCmdOptions.java | 1 -
.../src/com/oracle/truffle/r/launcher/RscriptCommand.java | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
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 d0cb3e769d..c199d40550 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
@@ -64,7 +64,6 @@ public final class RCmdOptions {
}
public enum RCmdOption {
- HELP(RCmdOptionType.BOOLEAN, true, "h", "help", false, "Print short help message and exit"),
VERSION(RCmdOptionType.BOOLEAN, true, "version", false, "Print version info and exit"),
ENCODING(RCmdOptionType.STRING, false, "encoding=ENC", null, "Specify encoding to be used for stdin"),
SAVE(RCmdOptionType.BOOLEAN, true, "save", false, "Do save workspace at the end of the session"),
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
index 99ce2d589b..9dfc9438eb 100644
--- 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
@@ -31,6 +31,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.graalvm.options.OptionCategory;
import org.graalvm.polyglot.PolyglotException;
import org.graalvm.polyglot.Source;
@@ -52,13 +53,11 @@ public final class RscriptCommand extends RAbstractLauncher {
}
@Override
- protected List<String> preprocessArguments(List<String> arguments, Map<String, String> polyglotOptions) {
- List<String> unrecognizedArgs = super.preprocessArguments(arguments, polyglotOptions);
+ protected void validateArguments(Map<String, String> polyglotOptions) {
try {
this.rScriptArguments = preprocessRScriptOptions(options);
- return unrecognizedArgs;
} catch (PrintHelp e) {
- return Collections.singletonList("--help");
+ printHelp(OptionCategory.USER);
}
}
--
GitLab