Skip to content

Commit

Permalink
Trivial refactoring: extract constant
Browse files Browse the repository at this point in the history
  • Loading branch information
daniellansun committed Jan 18, 2025
1 parent 4359f1c commit 5f23e6d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@
* Builds the AST from the parse tree generated by Antlr4.
*/
public class AstBuilder extends GroovyParserBaseVisitor<Object> {

public AstBuilder(final SourceUnit sourceUnit, final boolean groovydocEnabled, final boolean runtimeGroovydocEnabled) {
this.sourceUnit = sourceUnit;
this.moduleNode = new ModuleNode(sourceUnit);
Expand Down Expand Up @@ -3492,7 +3491,7 @@ public Expression visitCreator(final CreatorContext ctx) {
}

var initializer = ctx.arrayInitializer();
initializer.putNodeMetaData("elementType", elementType);
initializer.putNodeMetaData(ELEMENT_TYPE, elementType);
List<Expression> initExpressions = this.visitArrayInitializer(initializer);

ArrayExpression arrayExpression = new ArrayExpression(elementType, initExpressions);
Expand Down Expand Up @@ -3592,7 +3591,7 @@ public List<Expression> 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<Expression>();
Expand All @@ -3602,7 +3601,7 @@ public List<Expression> 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);
Expand Down Expand Up @@ -5055,5 +5054,6 @@ public List<DeclarationExpression> 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";
}

0 comments on commit 5f23e6d

Please sign in to comment.