diff --git a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java index 28379ce9d1d..333c68745e5 100644 --- a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java +++ b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java @@ -377,7 +377,6 @@ * Builds the AST from the parse tree generated by Antlr4. */ public class AstBuilder extends GroovyParserBaseVisitor { - public AstBuilder(final SourceUnit sourceUnit, final boolean groovydocEnabled, final boolean runtimeGroovydocEnabled) { this.sourceUnit = sourceUnit; this.moduleNode = new ModuleNode(sourceUnit); @@ -3492,7 +3491,7 @@ public Expression visitCreator(final CreatorContext ctx) { } var initializer = ctx.arrayInitializer(); - initializer.putNodeMetaData("elementType", elementType); + initializer.putNodeMetaData(ELEMENT_TYPE, elementType); List initExpressions = this.visitArrayInitializer(initializer); ArrayExpression arrayExpression = new ArrayExpression(elementType, initExpressions); @@ -3592,7 +3591,7 @@ public List visitArrayInitializer(final ArrayInitializerContext ctx) return Collections.emptyList(); } - ClassNode elementType = ctx.getNodeMetaData("elementType"); + ClassNode elementType = ctx.getNodeMetaData(ELEMENT_TYPE); try { visitingArrayInitializerCount += 1; var initExpressions = new ArrayList(); @@ -3602,7 +3601,7 @@ public List visitArrayInitializer(final ArrayInitializerContext ctx) var arrayInitializer = (ArrayInitializerContext) c; ClassNode subType = elementType.getComponentType(); //if (subType == null) produce closure or throw exception - arrayInitializer.putNodeMetaData("elementType", subType); + arrayInitializer.putNodeMetaData(ELEMENT_TYPE, subType); var arrayExpression = configureAST(new ArrayExpression(subType, this.visitArrayInitializer(arrayInitializer)), arrayInitializer); arrayExpression.setType(elementType); @@ -5055,5 +5054,6 @@ public List getDeclarationExpressions() { private static final String PARAMETER_CONTEXT = "_PARAMETER_CONTEXT"; private static final String IS_RECORD_GENERATED = "_IS_RECORD_GENERATED"; private static final String RECORD_HEADER = "_RECORD_HEADER"; + private static final String ELEMENT_TYPE = "elementType"; private static final String RECORD_TYPE_NAME = "groovy.transform.RecordType"; }