fix -CC and -LD invocation

timfel · timfel · commit 46ea17b25865 · 2019-03-08T09:35:42.000+01:00
diff --git a/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java b/graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java
@@ -146,7 +146,8 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                     break;
                 case "-CC":
                     if (wantsExperimental) {
-                        if (i != defaultEnvironmentArgs.size()) {
+                        if (i != defaultEnvironmentArgs.size() + 1) {
+                            // +1 because we need the --experimental-options
                             throw new IllegalArgumentException("-CC must be the first given argument");
                         }
                         GraalPythonCC.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));
@@ -155,7 +156,8 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S
                     }
                 case "-LD":
                     if (wantsExperimental) {
-                        if (i != defaultEnvironmentArgs.size()) {
+                        if (i != defaultEnvironmentArgs.size() + 1) {
+                            // +1 because we need the --experimental-options
                             throw new IllegalArgumentException("-LD must be the first given argument");
                         }
                         GraalPythonLD.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,8 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S`
`146`	`146`	`break;`
`147`	`147`	`case "-CC":`
`148`	`148`	`if (wantsExperimental) {`
`149`		`- if (i != defaultEnvironmentArgs.size()) {`
	`149`	`+ if (i != defaultEnvironmentArgs.size() + 1) {`
	`150`	`+ // +1 because we need the --experimental-options`
`150`	`151`	`throw new IllegalArgumentException("-CC must be the first given argument");`
`151`	`152`	`}`
`152`	`153`	`GraalPythonCC.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));`
`@@ -155,7 +156,8 @@ protected List<String> preprocessArguments(List<String> givenArgs, Map<String, S`
`155`	`156`	`}`
`156`	`157`	`case "-LD":`
`157`	`158`	`if (wantsExperimental) {`
`158`		`- if (i != defaultEnvironmentArgs.size()) {`
	`159`	`+ if (i != defaultEnvironmentArgs.size() + 1) {`
	`160`	`+ // +1 because we need the --experimental-options`
`159`	`161`	`throw new IllegalArgumentException("-LD must be the first given argument");`
`160`	`162`	`}`
`161`	`163`	`GraalPythonLD.main(arguments.subList(i + 1, arguments.size()).toArray(new String[0]));`