You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/04/19 05:41:35 UTC
[groovy] branch GROOVY-9513 updated: Remove flags for just enabling
indy
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-9513
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY-9513 by this push:
new e8cc9cb Remove flags for just enabling indy
e8cc9cb is described below
commit e8cc9cbafaca82c4a4fa077cc6c9c53aa2096a41
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Apr 19 13:41:14 2020 +0800
Remove flags for just enabling indy
---
src/bin/groovyConsole_completion | 2 +-
src/bin/groovy_completion | 2 +-
src/bin/groovyc_completion | 2 +-
src/main/java/groovy/ui/GroovyMain.java | 8 --------
.../codehaus/groovy/tools/FileSystemCompiler.java | 8 --------
.../main/java/org/codehaus/groovy/ant/Groovy.java | 13 ------------
.../main/java/org/codehaus/groovy/ant/Groovyc.java | 23 ----------------------
.../groovy/cli/picocli/CliBuilderTest.groovy | 20 ++-----------------
8 files changed, 5 insertions(+), 73 deletions(-)
diff --git a/src/bin/groovyConsole_completion b/src/bin/groovyConsole_completion
index 9803661..e41890b 100644
--- a/src/bin/groovyConsole_completion
+++ b/src/bin/groovyConsole_completion
@@ -90,7 +90,7 @@ function _picocli_groovyConsole() {
PREV_WORD=${COMP_WORDS[COMP_CWORD-1]}
COMMANDS=""
- FLAG_OPTS="-cp -classpath --classpath -h --help -V --version -pa --parameters -pr --enable-preview -i --indy"
+ FLAG_OPTS="-cp -classpath --classpath -h --help -V --version -pa --parameters -pr --enable-preview -i"
ARG_OPTS="-D --define --configscript"
COMPREPLY=( $(compgen -W "${FLAG_OPTS} ${ARG_OPTS} ${COMMANDS}" -- ${CURR_WORD}) )
diff --git a/src/bin/groovy_completion b/src/bin/groovy_completion
index 9fc1fa7..dfe0750 100644
--- a/src/bin/groovy_completion
+++ b/src/bin/groovy_completion
@@ -90,7 +90,7 @@ function _picocli_groovy() {
PREV_WORD=${COMP_WORDS[COMP_CWORD-1]}
COMMANDS=""
- FLAG_OPTS="-d --debug -n -p -pa --parameters -pr --enable-preview --indy -h --help -v --version"
+ FLAG_OPTS="-d --debug -n -p -pa --parameters -pr --enable-preview -h --help -v --version"
ARG_OPTS="-cp -classpath --classpath -D --define --disableopt -c --encoding -e -i -l -a --autosplit --configscript -b --basescript"
COMPREPLY=( $(compgen -W "${FLAG_OPTS} ${ARG_OPTS} ${COMMANDS}" -- ${CURR_WORD}) )
diff --git a/src/bin/groovyc_completion b/src/bin/groovyc_completion
index d4591f1..a66a4f8 100644
--- a/src/bin/groovyc_completion
+++ b/src/bin/groovyc_completion
@@ -90,7 +90,7 @@ function _picocli_groovyc() {
PREV_WORD=${COMP_WORDS[COMP_CWORD-1]}
COMMANDS=""
- FLAG_OPTS="-e --exception -pa --parameters -pr --enable-preview -j --jointCompilation --indy -h --help -v --version"
+ FLAG_OPTS="-e --exception -pa --parameters -pr --enable-preview -j --jointCompilation -h --help -v --version"
ARG_OPTS="-cp -classpath --classpath -sourcepath --sourcepath --temp --encoding -d -b --basescript -J -F --configscript"
case ${CURR_WORD} in
diff --git a/src/main/java/groovy/ui/GroovyMain.java b/src/main/java/groovy/ui/GroovyMain.java
index 26ff489..8ec2ba5 100644
--- a/src/main/java/groovy/ui/GroovyMain.java
+++ b/src/main/java/groovy/ui/GroovyMain.java
@@ -216,9 +216,6 @@ public class GroovyMain {
@Option(names = {"-a", "--autosplit"}, arity = "0..1", paramLabel = "<splitPattern>", description = "Split lines using splitPattern (default '\\s') using implicit 'split' variable")
private String splitPattern;
- @Option(names = {"--indy"}, description = "Enables compilation using invokedynamic")
- private boolean indy;
-
@Option(names = {"--configscript"}, paramLabel = "<script>", description = "A script for tweaking the configuration options")
private String configscript;
@@ -295,11 +292,6 @@ public class GroovyMain {
main.conf.getOptimizationOptions().put(optimization, false);
}
- if (indy) {
- System.setProperty("groovy.target.indy", "true");
- main.conf.getOptimizationOptions().put("indy", true);
- }
-
if (scriptBaseClass != null) {
main.conf.setScriptBaseClass(scriptBaseClass);
}
diff --git a/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java
index a7da4b9..35acd76 100644
--- a/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java
+++ b/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java
@@ -378,9 +378,6 @@ public class FileSystemCompiler {
@Option(names = "-F", paramLabel = "<flag>", description = "Passed to javac for joint compilation")
private List<String> flags;
- @Option(names = {"--indy"}, description = "Enables compilation using invokedynamic")
- private boolean indy;
-
@Option(names = {"--configscript"}, paramLabel = "<script>", description = "A script for tweaking the configuration options")
private String configScript;
@@ -425,11 +422,6 @@ public class FileSystemCompiler {
configuration.setJointCompilationOptions(compilerOptions);
}
- if (indy) {
- configuration.getOptimizationOptions().put("int", Boolean.FALSE);
- configuration.getOptimizationOptions().put("indy", Boolean.TRUE);
- }
-
final List<String> transformations = new ArrayList<>();
if (compileStatic) {
transformations.add("ast(groovy.transform.CompileStatic)");
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index 12c3c96..69c6131 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -120,7 +120,6 @@ public class Groovy extends Java {
private boolean includeAntRuntime = true;
private boolean useGroovyShell = false;
- private boolean indy = false;
private String scriptBaseClass;
private String configscript;
@@ -298,14 +297,6 @@ public class Groovy extends Java {
this.configscript = configscript;
}
- /**
- * Sets the indy flag to enable or disable invokedynamic
- *
- * @param indy true means invokedynamic support is active
- */
- public void setIndy(final boolean indy) {
- this.indy = indy;
- }
/**
* Set the script base class name
@@ -568,10 +559,6 @@ public class Groovy extends Java {
if (scriptBaseClass != null) {
configuration.setScriptBaseClass(scriptBaseClass);
}
- if (indy) {
- configuration.getOptimizationOptions().put("indy", Boolean.TRUE);
- configuration.getOptimizationOptions().put("int", Boolean.FALSE);
- }
if (configscript != null) {
Binding binding = new Binding();
binding.setVariable("configuration", configuration);
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
index de46112..f2a9a24 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
@@ -119,7 +119,6 @@ import java.util.StringTokenizer;
* <li>includeDestClasses</li>
* <li>jointCompilationOptions</li>
* <li>stacktrace</li>
- * <li>indy</li>
* <li>scriptBaseClass</li>
* <li>stubdir</li>
* <li>keepStubs</li>
@@ -218,7 +217,6 @@ public class Groovyc extends MatchingTask {
private File stubDir;
private boolean keepStubs;
private boolean forceLookupUnnamedFiles;
- private boolean useIndy;
private String scriptBaseClass;
private String configscript;
@@ -705,24 +703,6 @@ public class Groovyc extends MatchingTask {
}
/**
- * Set the indy flag.
- *
- * @param useIndy the indy flag
- */
- public void setIndy(boolean useIndy) {
- this.useIndy = useIndy;
- }
-
- /**
- * Get the value of the indy flag.
- *
- * @return if to use indy
- */
- public boolean getIndy() {
- return this.useIndy;
- }
-
- /**
* Set the base script class name for the scripts (must derive from Script)
*
* @param scriptBaseClass Base class name for scripts (must derive from Script)
@@ -1206,9 +1186,6 @@ public class Groovyc extends MatchingTask {
if (previewFeatures) {
commandLineList.add("--enable-preview");
}
- if (useIndy) {
- commandLineList.add("--indy");
- }
if (scriptBaseClass != null) {
commandLineList.add("-b");
commandLineList.add(scriptBaseClass);
diff --git a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
index c0de44a..1c331c8 100644
--- a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
+++ b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
@@ -898,7 +898,6 @@ class CliBuilderTest extends GroovyTestCase {
V(longOpt: 'version', 'cli.option.version.description')
pa(longOpt: 'parameters', 'cli.option.parameters.description')
pr(longOpt: 'enable-preview', 'cli.option.preview.description')
- i(longOpt: 'indy', 'cli.option.indy.description')
D(longOpt: 'define', args: 2, argName: 'name=value', valueSeparator: '=', 'cli.option.define.description')
_(longOpt: 'configscript', args: 1, 'cli.option.configscript.description')
}
@@ -918,13 +917,7 @@ class CliBuilderTest extends GroovyTestCase {
assert cli.parse(['--enable-preview']).'enable-preview'
assert cli.parse(['--enable-preview']).pr
- assert cli.parse(['--indy']).indy
- assert cli.parse(['--indy']).i
resetPrintWriter()
- cli.writer = printWriter
- assert cli.parse(['-indy']) == null
- assertTrue(stringWriter.toString().startsWith('error: Unmatched argument'))
- assertTrue(stringWriter.toString().contains('-ndy'))
assert cli.parse(['--help']).help
assert cli.parse(['--help']).h
@@ -957,7 +950,6 @@ class CliBuilderTest extends GroovyTestCase {
V(longOpt: 'version', 'cli.option.version.description')
pa(longOpt: 'parameters', 'cli.option.parameters.description')
pr(longOpt: 'enable-preview', 'cli.option.preview.description')
- i(longOpt: 'indy', 'cli.option.indy.description')
D(longOpt: 'define', args: 2, argName: 'name=value', valueSeparator: '=', 'cli.option.define.description')
_(longOpt: 'configscript', args: 1, 'cli.option.configscript.description')
}
@@ -974,10 +966,6 @@ class CliBuilderTest extends GroovyTestCase {
assert cli.parse(['-enable-preview']).'enable-preview'
assert cli.parse(['-pr']).pr
- assert cli.parse(['--indy']).i
- assert cli.parse(['-indy']).i
- assert cli.parse(['-i']).indy
-
assert cli.parse(['--help']).h
assert cli.parse(['-help']).h
assert cli.parse(['-h']).help
@@ -1023,13 +1011,12 @@ class CliBuilderTest extends GroovyTestCase {
V(longOpt: 'version', 'cli.option.version.description')
pa(longOpt: 'parameters', 'cli.option.parameters.description')
pr(longOpt: 'enable-preview', 'cli.option.preview.description')
- i(longOpt: 'indy', 'cli.option.indy.description')
D(longOpt: 'define', args: 2, argName: 'String', valueSeparator: '=', 'cli.option.define.description')
_(longOpt: 'configscript', args: 1, 'cli.option.configscript.description')
}
cli.usage()
def expectedUsage = """\
-Usage: groovy [-hiV] [-cp] [-pa] [-pr] [-configscript=PARAM]
+Usage: groovy [-hV] [-cp] [-pa] [-pr] [-configscript=PARAM]
[-D=<String>=<String>]...
-configscript, --configscript=PARAM
cli.option.configscript.description
@@ -1038,7 +1025,6 @@ Usage: groovy [-hiV] [-cp] [-pa] [-pr] [-configscript=PARAM]
-D, -define, --define=<String>=<String>
cli.option.define.description
-h, -help, --help cli.option.help.description
- -i, -indy, --indy cli.option.indy.description
-pa, -parameters, --parameters
cli.option.parameters.description
-pr, -enable-preview, --enable-preview
@@ -1054,20 +1040,18 @@ Usage: groovy [-hiV] [-cp] [-pa] [-pr] [-configscript=PARAM]
V(longOpt: 'version', 'cli.option.version.description')
pa(longOpt: 'parameters', 'cli.option.parameters.description')
pr(longOpt: 'enable-preview', 'cli.option.preview.description')
- i(longOpt: 'indy', 'cli.option.indy.description')
D(longOpt: 'define', args: 2, argName: 'String', valueSeparator: '=', 'cli.option.define.description')
_(longOpt: 'configscript', args: 1, 'cli.option.configscript.description')
}
cli.usage()
expectedUsage = """\
-Usage: groovy [-hiV] [-cp] [-pa] [-pr] [--configscript=PARAM]
+Usage: groovy [-hV] [-cp] [-pa] [-pr] [--configscript=PARAM]
[-D=<String>=<String>]...
--configscript=PARAM cli.option.configscript.description
-cp, --classpath cli.option.cp.description
-D, --define=<String>=<String>
cli.option.define.description
-h, --help cli.option.help.description
- -i, --indy cli.option.indy.description
-pa, --parameters cli.option.parameters.description
-pr, --enable-preview cli.option.preview.description
-V, --version cli.option.version.description"""