From 3ac7f0969bb2e882c89eb5af3976f4f59b36cd74 Mon Sep 17 00:00:00 2001
From: Christian Humer <christian.humer@oracle.com>
Date: Mon, 19 Oct 2015 21:09:53 +0200
Subject: [PATCH] Fix RscriptCommand for new launcher in GraalVM.
---
.../src/com/oracle/truffle/r/engine/shell/RscriptCommand.java | 2 +-
.../src/com/oracle/truffle/r/runtime/Utils.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RscriptCommand.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RscriptCommand.java
index 25c2493fb4..1bb5fd5766 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RscriptCommand.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/RscriptCommand.java
@@ -60,7 +60,7 @@ public class RscriptCommand {
// Either -e options are set or first non-option arg is a file
if (options.getStringList(EXPR) == null) {
if (firstNonOptionArgIndex == resultArgsLength) {
- System.err.println("filename is missing");
+ RCmdOptions.printHelp(RCmdOptions.Client.RSCRIPT, 0);
Utils.exit(2);
} else {
options.setValue(FILE, arguments[firstNonOptionArgIndex]);
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
index 536fd2bd6d..5fea2d6cdb 100644
--- a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
+++ b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/Utils.java
@@ -127,7 +127,7 @@ public final class Utils {
*/
public static RuntimeException exit(int status) {
RPerfStats.report();
- if (RContext.getInstance().getOptions().getString(RCmdOption.DEBUGGER) != null) {
+ if (RContext.getInstance() != null && RContext.getInstance().getOptions() != null && RContext.getInstance().getOptions().getString(RCmdOption.DEBUGGER) != null) {
throw new DebugExitException();
} else {
try {
--
GitLab