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/01/25 17:34:42 UTC

[groovy] branch GROOVY_3_0_X updated: remove need for compiler config from parser creation

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
     new 89b06ed  remove need for compiler config from parser creation
89b06ed is described below

commit 89b06ede87cd7e2faec00a7eeeb3e1eb44c2ea86
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Mon Jan 20 20:38:50 2020 +0800

    remove need for compiler config from parser creation
    
    (cherry picked from commit 6a7bf3677c0e7488f5dd2ae89c4bd21420392cfb)
---
 .../groovy/control/CompilerConfiguration.java         |  2 +-
 .../codehaus/groovy/control/ParserPluginFactory.java  |  9 +++++----
 src/test/groovy/bugs/Groovy9213.groovy                |  4 +---
 .../groovy/control/CompilerConfigurationTest.java     |  2 +-
 .../java/org/apache/groovy/parser/Antlr4Parser.java   |  3 ++-
 .../groovy/parser/antlr4/Antlr4ParserPlugin.java      | 19 ++++---------------
 .../groovy/parser/antlr4/Antlr4PluginFactory.java     | 14 +-------------
 .../org/apache/groovy/parser/antlr4/AstBuilder.java   |  6 ------
 .../apache/groovy/parser/antlr4/GroovydocManager.java |  6 ------
 .../org/apache/groovy/parser/antlr4/TestUtils.groovy  | 15 ++++++---------
 10 files changed, 21 insertions(+), 59 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index c86483a..ce97a13 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -871,7 +871,7 @@ public class CompilerConfiguration {
     public ParserPluginFactory getPluginFactory() {
         if (pluginFactory == null) {
             pluginFactory = !Boolean.parseBoolean(getSystemPropertySafe("groovy.antlr4", "true"))
-                                ? ParserPluginFactory.antlr2() : ParserPluginFactory.antlr4(this);
+                                ? ParserPluginFactory.antlr2() : ParserPluginFactory.antlr4();
         }
         return pluginFactory;
     }
diff --git a/src/main/java/org/codehaus/groovy/control/ParserPluginFactory.java b/src/main/java/org/codehaus/groovy/control/ParserPluginFactory.java
index 495757b..a4c6ccd 100644
--- a/src/main/java/org/codehaus/groovy/control/ParserPluginFactory.java
+++ b/src/main/java/org/codehaus/groovy/control/ParserPluginFactory.java
@@ -25,13 +25,16 @@ import org.codehaus.groovy.antlr.AntlrParserPluginFactory;
  * A factory of parser plugin instances.
  */
 public abstract class ParserPluginFactory {
+
+    public abstract ParserPlugin createParserPlugin();
+
     /**
      * Creates the ANTLR 4 parser.
      *
      * @return the factory for the parser
      */
-    public static ParserPluginFactory antlr4(final CompilerConfiguration compilerConfiguration) {
-        return new Antlr4PluginFactory(compilerConfiguration);
+    public static ParserPluginFactory antlr4() {
+        return new Antlr4PluginFactory();
     }
 
     /**
@@ -43,6 +46,4 @@ public abstract class ParserPluginFactory {
     public static ParserPluginFactory antlr2() {
         return new AntlrParserPluginFactory();
     }
-
-    public abstract ParserPlugin createParserPlugin();
 }
diff --git a/src/test/groovy/bugs/Groovy9213.groovy b/src/test/groovy/bugs/Groovy9213.groovy
index 8431a04..770abd9 100644
--- a/src/test/groovy/bugs/Groovy9213.groovy
+++ b/src/test/groovy/bugs/Groovy9213.groovy
@@ -43,9 +43,7 @@ final class Groovy9213 {
 
     @Test(timeout=15000L)
     void testUnmatchedParenInLongScript4() {
-        def config = new CompilerConfiguration()
-        config.pluginFactory = antlr4(config)
-
+        def config = new CompilerConfiguration(pluginFactory: antlr4())
         new GroovyShell(config).evaluate('''
             int a = 0
             (
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index 0badf33..90561b7 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -114,7 +114,7 @@ public final class CompilerConfigurationTest {
         init.setTargetDirectory(tergetDirectory);
         init.setDefaultScriptExtension(".jpp");
         init.setJointCompilationOptions(Collections.singletonMap("somekey", "somevalue"));
-        ParserPluginFactory pluginFactory = ParserPluginFactory.antlr4(init);
+        ParserPluginFactory pluginFactory = ParserPluginFactory.antlr4();
         init.setPluginFactory(pluginFactory);
 
         assertEquals(WarningMessage.POSSIBLE_ERRORS, init.getWarningLevel());
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/Antlr4Parser.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/Antlr4Parser.java
index 7cb14fb..a9d380c 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/Antlr4Parser.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/Antlr4Parser.java
@@ -25,6 +25,7 @@ import org.codehaus.groovy.control.CompilerConfiguration;
  * The Antlr4 parser for creating a module node.
  */
 public class Antlr4Parser extends AbstractParser {
+
     private final CompilerConfiguration compilerConfiguration;
 
     public Antlr4Parser() {
@@ -33,7 +34,7 @@ public class Antlr4Parser extends AbstractParser {
 
     public Antlr4Parser(CompilerConfiguration compilerConfiguration) {
         this.compilerConfiguration = compilerConfiguration;
-        compilerConfiguration.setPluginFactory(new Antlr4PluginFactory(compilerConfiguration));
+        compilerConfiguration.setPluginFactory(new Antlr4PluginFactory());
     }
 
     @Override
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java
index e8eff46..819165e 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4ParserPlugin.java
@@ -20,7 +20,6 @@ package org.apache.groovy.parser.antlr4;
 
 import org.codehaus.groovy.GroovyBugError;
 import org.codehaus.groovy.ast.ModuleNode;
-import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.ParserPlugin;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.io.StringReaderSource;
@@ -29,24 +28,12 @@ import org.codehaus.groovy.syntax.Reduction;
 
 import java.io.IOException;
 import java.io.Reader;
-import java.util.Optional;
 
 /**
  * A parser plugin for the new parser.
  */
 public class Antlr4ParserPlugin implements ParserPlugin {
 
-    private final CompilerConfiguration compilerConfiguration;
-
-    public Antlr4ParserPlugin() {
-        this.compilerConfiguration = null;
-    }
-
-    @Deprecated
-    public Antlr4ParserPlugin(final CompilerConfiguration compilerConfiguration) {
-        this.compilerConfiguration = compilerConfiguration;
-    }
-
     @Override
     public Reduction parseCST(final SourceUnit sourceUnit, final Reader reader) {
         if (!sourceUnit.getSource().canReopenSource()) {
@@ -64,8 +51,10 @@ public class Antlr4ParserPlugin implements ParserPlugin {
 
     @Override
     public ModuleNode buildAST(final SourceUnit sourceUnit, final ClassLoader classLoader, final Reduction cst) {
-        CompilerConfiguration compilerConfiguration = Optional.ofNullable(this.compilerConfiguration).orElseGet(sourceUnit::getConfiguration);
-        AstBuilder builder = new AstBuilder(sourceUnit, compilerConfiguration.isGroovydocEnabled(), compilerConfiguration.isRuntimeGroovydocEnabled());
+        AstBuilder builder = new AstBuilder(sourceUnit,
+                sourceUnit.getConfiguration().isGroovydocEnabled(),
+                sourceUnit.getConfiguration().isRuntimeGroovydocEnabled()
+        );
         return builder.buildAST();
     }
 }
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4PluginFactory.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4PluginFactory.java
index ee433ca..48e166e 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4PluginFactory.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/Antlr4PluginFactory.java
@@ -18,7 +18,6 @@
  */
 package org.apache.groovy.parser.antlr4;
 
-import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.ParserPlugin;
 import org.codehaus.groovy.control.ParserPluginFactory;
 
@@ -27,19 +26,8 @@ import org.codehaus.groovy.control.ParserPluginFactory;
  */
 public class Antlr4PluginFactory extends ParserPluginFactory {
 
-    private final CompilerConfiguration compilerConfiguration;
-
-    public Antlr4PluginFactory() {
-        this.compilerConfiguration = null;
-    }
-
-    @Deprecated
-    public Antlr4PluginFactory(final CompilerConfiguration compilerConfiguration) {
-        this.compilerConfiguration = compilerConfiguration;
-    }
-
     @Override
     public ParserPlugin createParserPlugin() {
-        return new Antlr4ParserPlugin(compilerConfiguration);
+        return new Antlr4ParserPlugin();
     }
 }
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index 05a83dd..d1d5948 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -282,7 +282,6 @@ import org.codehaus.groovy.ast.stmt.TryCatchStatement;
 import org.codehaus.groovy.ast.stmt.WhileStatement;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilePhase;
-import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.messages.SyntaxErrorMessage;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
@@ -339,11 +338,6 @@ import static org.codehaus.groovy.runtime.DefaultGroovyMethods.last;
  */
 public class AstBuilder extends GroovyParserBaseVisitor<Object> {
 
-    @Deprecated
-    public AstBuilder(final SourceUnit sourceUnit, final CompilerConfiguration compilerConfiguration) {
-        this(sourceUnit, compilerConfiguration.isGroovydocEnabled(), compilerConfiguration.isRuntimeGroovydocEnabled());
-    }
-
     public AstBuilder(final SourceUnit sourceUnit, final boolean groovydocEnabled, final boolean runtimeGroovydocEnabled) {
         this.sourceUnit = sourceUnit;
         this.moduleNode = new ModuleNode(sourceUnit);
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java
index f872a2d..ea94b22 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/GroovydocManager.java
@@ -29,7 +29,6 @@ import org.codehaus.groovy.ast.AnnotatedNode;
 import org.codehaus.groovy.ast.AnnotationNode;
 import org.codehaus.groovy.ast.ClassHelper;
 import org.codehaus.groovy.ast.expr.ConstantExpression;
-import org.codehaus.groovy.control.CompilerConfiguration;
 
 import java.util.List;
 import java.util.regex.Pattern;
@@ -52,11 +51,6 @@ public class GroovydocManager {
     private static final Pattern SPACES_PATTERN = Pattern.compile("\\s+");
     private final boolean groovydocEnabled, runtimeGroovydocEnabled;
 
-    @Deprecated
-    public GroovydocManager(final CompilerConfiguration compilerConfiguration) {
-        this(compilerConfiguration.isGroovydocEnabled(), compilerConfiguration.isRuntimeGroovydocEnabled());
-    }
-
     public GroovydocManager(final boolean groovydocEnabled, final boolean runtimeGroovydocEnabled) {
         this.groovydocEnabled = groovydocEnabled;
         this.runtimeGroovydocEnabled = runtimeGroovydocEnabled;
diff --git a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy
index c2d363f..923b471 100644
--- a/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy
+++ b/subprojects/parser-antlr4/src/test/groovy/org/apache/groovy/parser/antlr4/TestUtils.groovy
@@ -249,17 +249,14 @@ final class TestUtils {
     }
 
     static GroovyShell createAntlr4Shell(CompilerConfiguration compilerConfiguration = new CompilerConfiguration(CompilerConfiguration.DEFAULT)) {
-        compilerConfiguration.pluginFactory = new Antlr4PluginFactory(compilerConfiguration)
-
-        return new GroovyShell(compilerConfiguration);
+        compilerConfiguration.pluginFactory = new Antlr4PluginFactory()
+        return new GroovyShell(compilerConfiguration)
     }
 
-    static GroovyShell createAntlr2Shell() {
-        CompilerConfiguration configuration = new CompilerConfiguration(CompilerConfiguration.DEFAULT)
-        configuration.pluginFactory = new AntlrParserPluginFactory()
-
-        return new GroovyShell(configuration);
+    static GroovyShell createAntlr2Shell(CompilerConfiguration compilerConfiguration = new CompilerConfiguration(CompilerConfiguration.DEFAULT)) {
+        compilerConfiguration.pluginFactory = new AntlrParserPluginFactory()
+        return new GroovyShell(compilerConfiguration)
     }
 
-    public static final List COMMON_IGNORE_CLASS_LIST = Collections.unmodifiableList([AssertStatement, BreakStatement, ConstructorNode, ContinueStatement, ExpressionStatement, FieldNode, ForStatement, GenericsType, IfStatement, MethodNode, PackageNode, Parameter, PropertyNode, ReturnStatement, ThrowStatement, Token, WhileStatement] as List);
+    public static final List COMMON_IGNORE_CLASS_LIST = Collections.unmodifiableList([AssertStatement, BreakStatement, ConstructorNode, ContinueStatement, ExpressionStatement, FieldNode, ForStatement, GenericsType, IfStatement, MethodNode, PackageNode, Parameter, PropertyNode, ReturnStatement, ThrowStatement, Token, WhileStatement])
 }