Skip to content
Snippets Groups Projects
Commit 6757224c authored by Lukas Stadler's avatar Lukas Stadler
Browse files

don't skip arguments in RScriptCommand

parent 7be5fdcb
Branches
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ import java.io.OutputStream; ...@@ -27,6 +27,7 @@ import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import org.graalvm.options.OptionCategory; import org.graalvm.options.OptionCategory;
...@@ -116,13 +117,17 @@ public class RscriptCommand { ...@@ -116,13 +117,17 @@ public class RscriptCommand {
}; };
boolean useJVM = false; boolean useJVM = false;
Map<String, String> polyglotOptions = new HashMap<>(); Map<String, String> polyglotOptions = new HashMap<>();
for (int i = 1; i < argsList.size(); i++) { Iterator<String> iterator = argsList.iterator();
String arg = argsList.get(i); if (iterator.hasNext()) {
if ("--jvm".equals(arg)) { iterator.next(); // skip first argument
useJVM = true; while (iterator.hasNext()) {
argsList.remove(i); String arg = iterator.next();
} else if (launcher.parsePolyglotOption("R", polyglotOptions, arg)) { if ("--jvm".equals(arg)) {
argsList.remove(i); useJVM = true;
iterator.remove();
} else if (launcher.parsePolyglotOption("R", polyglotOptions, arg)) {
iterator.remove();
}
} }
} }
if (launcher.runPolyglotAction()) { if (launcher.runPolyglotAction()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment