[GR-5176] Don't skip arguments when pre-parsing in RCommand.

PullRequest: fastr/1225

com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RCommand.java

@@ -31,6 +31,7 @@ import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -144,13 +145,17 @@ public class RCommand {
         boolean useJVM = false;
         RLauncher launcher = new RLauncher(Client.R);
         Map<String, String> polyglotOptions = new HashMap<>();
-        for (int i = 1; i < argsList.size(); i++) {
-            String arg = argsList.get(i);
-            if ("--jvm".equals(arg)) {
-                useJVM = true;
-                argsList.remove(i);
-            } else if (launcher.parsePolyglotOption("R", polyglotOptions, arg)) {
-                argsList.remove(i);
+        Iterator<String> iterator = argsList.iterator();
+        if (iterator.hasNext()) {
+            iterator.next(); // skip first argument
+            while (iterator.hasNext()) {
+                String arg = iterator.next();
+                if ("--jvm".equals(arg)) {
+                    useJVM = true;
+                    iterator.remove();
+                } else if (launcher.parsePolyglotOption("R", polyglotOptions, arg)) {
+                    iterator.remove();
+                }
             }
         }
         if (launcher.runPolyglotAction()) {