From 51e7b1b2475e47a1f8a04a5fec0b78579f69ce9a Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Thu, 12 Apr 2018 11:46:35 +0200
Subject: [PATCH 1/2] Launcher fix: let the polyglot options to be processed by
 the polyglot launcher

---
 .../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 @@ private enum RCmdOptionType {
     }
 
     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.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);
         }
     }
 

From 1b2a0dd011056b18ae0e734202d2b91697712f38 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Thu, 12 Apr 2018 11:59:52 +0200
Subject: [PATCH 2/2] Fix version in TruffleRLanguageImpl

---
 .../src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java
index 17940abb3e..d610f8b2df 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java
@@ -58,7 +58,7 @@
 import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
 import com.oracle.truffle.r.runtime.nodes.RBaseNode;
 
-@TruffleLanguage.Registration(name = "R", id = "R", version = "3.3.2", mimeType = {RRuntime.R_APP_MIME, RRuntime.R_TEXT_MIME}, interactive = true)
+@TruffleLanguage.Registration(name = "R", id = "R", version = "3.4.0", mimeType = {RRuntime.R_APP_MIME, RRuntime.R_TEXT_MIME}, interactive = true)
 @ProvidedTags({StandardTags.CallTag.class, StandardTags.StatementTag.class, StandardTags.RootTag.class, RSyntaxTags.LoopTag.class, FunctionBodyBlockTag.class})
 public final class TruffleRLanguageImpl extends TruffleRLanguage {