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 2017/09/09 05:44:53 UTC
[2/3] groovy git commit: Minor refactoring
http://git-wip-us.apache.org/repos/asf/groovy/blob/c7f5931a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
----------------------------------------------------------------------
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 26868ed..8b6639f 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
@@ -139,6 +139,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.apache.groovy.parser.antlr4.GroovyLangParser.*;
+import static org.apache.groovy.parser.antlr4.util.PositionConfigureUtils.configureAST;
import static org.codehaus.groovy.runtime.DefaultGroovyMethods.asBoolean;
import static org.codehaus.groovy.runtime.DefaultGroovyMethods.last;
@@ -164,7 +165,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
this.parser.setErrorHandler(new DescriptiveErrorStrategy(charStream));
this.tryWithResourcesASTTransformation = new TryWithResourcesASTTransformation(this);
- this.groovydocManager = new GroovydocManager(this);
+ this.groovydocManager = GroovydocManager.getInstance();
}
private CharStream createCharStream(SourceUnit sourceUnit) {
@@ -272,7 +273,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
this.configureScriptClassNode();
if (null != this.numberFormatError) {
- throw createParsingFailedException(this.numberFormatError.value.getMessage(), this.numberFormatError.key);
+ throw createParsingFailedException(this.numberFormatError.getValue().getMessage(), this.numberFormatError.getKey());
}
return moduleNode;
@@ -287,7 +288,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
packageNode.addAnnotations(this.visitAnnotationsOpt(ctx.annotationsOpt()));
- return this.configureAST(packageNode, ctx);
+ return configureAST(packageNode, ctx);
}
@Override
@@ -304,7 +305,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (hasStar) { // e.g. import static java.lang.Math.*
String qualifiedName = this.visitQualifiedName(ctx.qualifiedName());
ClassNode type = ClassHelper.make(qualifiedName);
- this.configureAST(type, ctx);
+ configureAST(type, ctx);
moduleNode.addStaticStarImport(type.getText(), type, annotationNodeList);
@@ -322,7 +323,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
String alias = hasAlias
? ctx.alias.getText()
: name;
- this.configureAST(classNode, ctx);
+ configureAST(classNode, ctx);
moduleNode.addStaticImport(classNode, name, alias, annotationNodeList);
@@ -342,7 +343,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
String alias = hasAlias
? ctx.alias.getText()
: name;
- this.configureAST(classNode, ctx);
+ configureAST(classNode, ctx);
moduleNode.addImport(alias, classNode, annotationNodeList);
@@ -350,7 +351,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
}
- return this.configureAST(importNode, ctx);
+ return configureAST(importNode, ctx);
}
// statement { --------------------------------------------------------------------
@@ -367,29 +368,29 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
BooleanExpression booleanExpression =
- this.configureAST(
+ configureAST(
new BooleanExpression(conditionExpression), conditionExpression);
if (!asBoolean(ctx.me)) {
- return this.configureAST(
+ return configureAST(
new AssertStatement(booleanExpression), ctx);
}
- return this.configureAST(new AssertStatement(booleanExpression,
+ return configureAST(new AssertStatement(booleanExpression,
(Expression) this.visit(ctx.me)),
ctx);
}
@Override
public AssertStatement visitAssertStmtAlt(AssertStmtAltContext ctx) {
- return this.configureAST(this.visitAssertStatement(ctx.assertStatement()), ctx);
+ return configureAST(this.visitAssertStatement(ctx.assertStatement()), ctx);
}
@Override
public IfStatement visitIfElseStmtAlt(IfElseStmtAltContext ctx) {
Expression conditionExpression = this.visitExpressionInPar(ctx.expressionInPar());
BooleanExpression booleanExpression =
- this.configureAST(
+ configureAST(
new BooleanExpression(conditionExpression), conditionExpression);
Statement ifBlock =
@@ -401,12 +402,12 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
? (Statement) this.visit(ctx.fb)
: EmptyStatement.INSTANCE);
- return this.configureAST(new IfStatement(booleanExpression, ifBlock, elseBlock), ctx);
+ return configureAST(new IfStatement(booleanExpression, ifBlock, elseBlock), ctx);
}
@Override
public Statement visitLoopStmtAlt(LoopStmtAltContext ctx) {
- return this.configureAST((Statement) this.visit(ctx.loopStatement()), ctx);
+ return configureAST((Statement) this.visit(ctx.loopStatement()), ctx);
}
@Override
@@ -415,7 +416,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
Statement loopBlock = this.unpackStatement((Statement) this.visit(ctx.statement()));
- return this.configureAST(
+ return configureAST(
new ForStatement(controlPair.getKey(), controlPair.getValue(), asBoolean(loopBlock) ? loopBlock : EmptyStatement.INSTANCE),
ctx);
}
@@ -444,9 +445,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
List<? extends Expression> declarationExpressionList = declarationListStatement.getDeclarationExpressions();
if (declarationExpressionList.size() == 1) {
- return this.configureAST((Expression) declarationExpressionList.get(0), ctx);
+ return configureAST((Expression) declarationExpressionList.get(0), ctx);
} else {
- return this.configureAST(new ClosureListExpression((List<Expression>) declarationExpressionList), ctx);
+ return configureAST(new ClosureListExpression((List<Expression>) declarationExpressionList), ctx);
}
}
@@ -470,15 +471,15 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
List<Expression> expressionList = this.visitExpressionList(ctx);
if (expressionList.size() == 1) {
- return this.configureAST(expressionList.get(0), ctx);
+ return configureAST(expressionList.get(0), ctx);
} else {
- return this.configureAST(new ClosureListExpression(expressionList), ctx);
+ return configureAST(new ClosureListExpression(expressionList), ctx);
}
}
@Override
public Pair<Parameter, Expression> visitEnhancedForControl(EnhancedForControlContext ctx) {
- Parameter parameter = this.configureAST(
+ Parameter parameter = configureAST(
new Parameter(this.visitType(ctx.type()), this.visitVariableDeclaratorId(ctx.variableDeclaratorId()).getName()),
ctx.variableDeclaratorId());
@@ -503,12 +504,12 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
public WhileStatement visitWhileStmtAlt(WhileStmtAltContext ctx) {
Expression conditionExpression = this.visitExpressionInPar(ctx.expressionInPar());
BooleanExpression booleanExpression =
- this.configureAST(
+ configureAST(
new BooleanExpression(conditionExpression), conditionExpression);
Statement loopBlock = this.unpackStatement((Statement) this.visit(ctx.statement()));
- return this.configureAST(
+ return configureAST(
new WhileStatement(booleanExpression, asBoolean(loopBlock) ? loopBlock : EmptyStatement.INSTANCE),
ctx);
}
@@ -518,21 +519,21 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
Expression conditionExpression = this.visitExpressionInPar(ctx.expressionInPar());
BooleanExpression booleanExpression =
- this.configureAST(
+ configureAST(
new BooleanExpression(conditionExpression),
conditionExpression
);
Statement loopBlock = this.unpackStatement((Statement) this.visit(ctx.statement()));
- return this.configureAST(
+ return configureAST(
new DoWhileStatement(booleanExpression, asBoolean(loopBlock) ? loopBlock : EmptyStatement.INSTANCE),
ctx);
}
@Override
public Statement visitTryCatchStmtAlt(TryCatchStmtAltContext ctx) {
- return this.configureAST(this.visitTryCatchStatement(ctx.tryCatchStatement()), ctx);
+ return configureAST(this.visitTryCatchStatement(ctx.tryCatchStatement()), ctx);
}
@Override
@@ -552,9 +553,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
})
.forEach(tryCatchStatement::addCatch);
- return this.configureAST(
+ return configureAST(
tryWithResourcesASTTransformation.transform(
- this.configureAST(tryCatchStatement, ctx)),
+ configureAST(tryCatchStatement, ctx)),
ctx);
}
@@ -590,11 +591,11 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
BinaryExpression assignmentExpression = (BinaryExpression) expression;
- return this.configureAST(
+ return configureAST(
new ExpressionStatement(
- this.configureAST(
+ configureAST(
new DeclarationExpression(
- this.configureAST(
+ configureAST(
new VariableExpression(assignmentExpression.getLeftExpression().getText()),
assignmentExpression.getLeftExpression()
),
@@ -619,7 +620,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
// In order to make the new parser behave same with the old one, we do not process variableModifier*
return this.visitCatchType(ctx.catchType()).stream()
- .map(e -> this.configureAST(
+ .map(e -> configureAST(
new CatchStatement(
// FIXME The old parser does not set location info for the parameter of the catch clause.
// we could make it better
@@ -649,14 +650,14 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return EmptyStatement.INSTANCE;
}
- return this.configureAST(
+ return configureAST(
this.createBlockStatement((Statement) this.visit(ctx.block())),
ctx);
}
@Override
public SwitchStatement visitSwitchStmtAlt(SwitchStmtAltContext ctx) {
- return this.configureAST(this.visitSwitchStatement(ctx.switchStatement()), ctx);
+ return configureAST(this.visitSwitchStatement(ctx.switchStatement()), ctx);
}
public SwitchStatement visitSwitchStatement(SwitchStatementContext ctx) {
@@ -688,7 +689,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw createParsingFailedException("default case should appear at last", defaultStatementList.get(0));
}
- return this.configureAST(
+ return configureAST(
new SwitchStatement(
this.visitExpressionInPar(ctx.expressionInPar()),
caseStatementList,
@@ -720,7 +721,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
statementList.add(
- this.configureAST(
+ configureAST(
new CaseStatement(
pair.getValue(),
@@ -764,7 +765,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public SynchronizedStatement visitSynchronizedStmtAlt(SynchronizedStmtAltContext ctx) {
- return this.configureAST(
+ return configureAST(
new SynchronizedStatement(this.visitExpressionInPar(ctx.expressionInPar()), this.visitBlock(ctx.block())),
ctx);
}
@@ -776,7 +777,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ReturnStatement visitReturnStmtAlt(ReturnStmtAltContext ctx) {
- return this.configureAST(new ReturnStatement(asBoolean(ctx.expression())
+ return configureAST(new ReturnStatement(asBoolean(ctx.expression())
? (Expression) this.visit(ctx.expression())
: ConstantExpression.EMPTY_EXPRESSION),
ctx);
@@ -784,7 +785,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ThrowStatement visitThrowStmtAlt(ThrowStmtAltContext ctx) {
- return this.configureAST(
+ return configureAST(
new ThrowStatement((Expression) this.visit(ctx.expression())),
ctx);
}
@@ -804,12 +805,12 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
? this.visitIdentifier(ctx.identifier())
: null;
- return this.configureAST(new BreakStatement(label), ctx);
+ return configureAST(new BreakStatement(label), ctx);
}
@Override
public BreakStatement visitBreakStmtAlt(BreakStmtAltContext ctx) {
- return this.configureAST(this.visitBreakStatement(ctx.breakStatement()), ctx);
+ return configureAST(this.visitBreakStatement(ctx.breakStatement()), ctx);
}
@Override
@@ -818,34 +819,34 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
? this.visitIdentifier(ctx.identifier())
: null;
- return this.configureAST(new ContinueStatement(label), ctx);
+ return configureAST(new ContinueStatement(label), ctx);
}
@Override
public ContinueStatement visitContinueStmtAlt(ContinueStmtAltContext ctx) {
- return this.configureAST(this.visitContinueStatement(ctx.continueStatement()), ctx);
+ return configureAST(this.visitContinueStatement(ctx.continueStatement()), ctx);
}
@Override
public ImportNode visitImportStmtAlt(ImportStmtAltContext ctx) {
- return this.configureAST(this.visitImportDeclaration(ctx.importDeclaration()), ctx);
+ return configureAST(this.visitImportDeclaration(ctx.importDeclaration()), ctx);
}
@Override
public ClassNode visitTypeDeclarationStmtAlt(TypeDeclarationStmtAltContext ctx) {
- return this.configureAST(this.visitTypeDeclaration(ctx.typeDeclaration()), ctx);
+ return configureAST(this.visitTypeDeclaration(ctx.typeDeclaration()), ctx);
}
@Override
public Statement visitLocalVariableDeclarationStmtAlt(LocalVariableDeclarationStmtAltContext ctx) {
- return this.configureAST(this.visitLocalVariableDeclaration(ctx.localVariableDeclaration()), ctx);
+ return configureAST(this.visitLocalVariableDeclaration(ctx.localVariableDeclaration()), ctx);
}
@Override
public MethodNode visitMethodDeclarationStmtAlt(MethodDeclarationStmtAltContext ctx) {
- return this.configureAST(this.visitMethodDeclaration(ctx.methodDeclaration()), ctx);
+ return configureAST(this.visitMethodDeclaration(ctx.methodDeclaration()), ctx);
}
// } statement --------------------------------------------------------------------
@@ -854,7 +855,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
public ClassNode visitTypeDeclaration(TypeDeclarationContext ctx) {
if (asBoolean(ctx.classDeclaration())) { // e.g. class A {}
ctx.classDeclaration().putNodeMetaData(TYPE_DECLARATION_MODIFIERS, this.visitClassOrInterfaceModifiersOpt(ctx.classOrInterfaceModifiersOpt()));
- return this.configureAST(this.visitClassDeclaration(ctx.classDeclaration()), ctx);
+ return configureAST(this.visitClassDeclaration(ctx.classDeclaration()), ctx);
}
throw createParsingFailedException("Unsupported type declaration: " + ctx.getText(), ctx);
@@ -918,7 +919,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
}
- this.configureAST(classNode, ctx);
+ configureAST(classNode, ctx);
classNode.putNodeMetaData(CLASS_NAME, className);
classNode.setSyntheticPublic(syntheticPublic);
@@ -1064,7 +1065,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
groovydocManager.handle(enumConstant, ctx);
- return this.configureAST(enumConstant, ctx);
+ return configureAST(enumConstant, ctx);
}
private Expression createEnumConstantInitExpression(ArgumentsContext ctx, InnerClassNode anonymousInnerClassNode) {
@@ -1088,7 +1089,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (asBoolean(anonymousInnerClassNode)) {
listExpression.addExpression(
- this.configureAST(
+ configureAST(
new ClassExpression(anonymousInnerClassNode),
anonymousInnerClassNode));
}
@@ -1097,7 +1098,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
listExpression.setWrapped(true);
}
- return this.configureAST(listExpression, ctx);
+ return configureAST(listExpression, ctx);
}
if (!asBoolean(anonymousInnerClassNode)) {
@@ -1105,7 +1106,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ListExpression listExpression = new ListExpression();
listExpression.addExpression(expression);
- return this.configureAST(listExpression, ctx);
+ return configureAST(listExpression, ctx);
}
return expression;
@@ -1120,17 +1121,17 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
listExpression.addExpression(
- this.configureAST(
+ configureAST(
new ClassExpression(anonymousInnerClassNode),
anonymousInnerClassNode));
- return this.configureAST(listExpression, ctx);
+ return configureAST(listExpression, ctx);
}
ListExpression listExpression = new ListExpression(expressions);
if (asBoolean(anonymousInnerClassNode)) {
listExpression.addExpression(
- this.configureAST(
+ configureAST(
new ClassExpression(anonymousInnerClassNode),
anonymousInnerClassNode));
}
@@ -1140,8 +1141,8 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
return asBoolean(ctx)
- ? this.configureAST(listExpression, ctx)
- : this.configureAST(listExpression, anonymousInnerClassNode);
+ ? configureAST(listExpression, ctx)
+ : configureAST(listExpression, anonymousInnerClassNode);
}
@@ -1160,7 +1161,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
classNode.addStaticInitializerStatements(Collections.singletonList(statement), false);
} else { // e.g. { }
classNode.addObjectInitializerStatements(
- this.configureAST(
+ configureAST(
this.createBlockStatement(statement),
statement));
}
@@ -1202,9 +1203,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public GenericsType visitTypeParameter(TypeParameterContext ctx) {
- return this.configureAST(
+ return configureAST(
new GenericsType(
- this.configureAST(ClassHelper.make(this.visitClassName(ctx.className())), ctx),
+ configureAST(ClassHelper.make(this.visitClassName(ctx.className())), ctx),
this.visitTypeBound(ctx.typeBound()),
null
),
@@ -1318,7 +1319,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
methodNode.getVariableScope().setInStaticContext(true);
}
- this.configureAST(methodNode, ctx);
+ configureAST(methodNode, ctx);
validateMethodDeclaration(ctx, methodNode, modifierManager, classNode);
@@ -1396,7 +1397,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
private MethodNode createMethodNodeForClass(MethodDeclarationContext ctx, ModifierManager modifierManager, String methodName, ClassNode returnType, Parameter[] parameters, ClassNode[] exceptions, Statement code, ClassNode classNode, int modifiers) {
MethodNode methodNode;
if (asBoolean(ctx.elementValue())) { // the code of annotation method
- code = this.configureAST(
+ code = configureAST(
new ExpressionStatement(
this.visitElementValue(ctx.elementValue())),
ctx.elementValue());
@@ -1472,12 +1473,12 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return null;
}
- return this.configureAST(this.visitBlock(ctx.block()), ctx);
+ return configureAST(this.visitBlock(ctx.block()), ctx);
}
@Override
public DeclarationListStatement visitLocalVariableDeclaration(LocalVariableDeclarationContext ctx) {
- return this.configureAST(this.visitVariableDeclaration(ctx.variableDeclaration()), ctx);
+ return configureAST(this.visitVariableDeclaration(ctx.variableDeclaration()), ctx);
}
private ModifierManager createModifierManager(VariableDeclarationContext ctx) {
@@ -1501,9 +1502,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw createParsingFailedException("keyword def is required to declare tuple, e.g. def (int a, int b) = [1, 2]", ctx);
}
- return this.configureAST(
+ return configureAST(
new DeclarationListStatement(
- this.configureAST(
+ configureAST(
modifierManager.attachAnnotations(
new DeclarationExpression(
new ArgumentListExpression(
@@ -1553,7 +1554,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
DeclarationExpression declarationExpression = declarationExpressionList.get(0);
if (1 == size) {
- this.configureAST(declarationExpression, ctx);
+ configureAST(declarationExpression, ctx);
} else {
// Tweak start of first declaration
declarationExpression.setLineNumber(ctx.getStart().getLine());
@@ -1561,7 +1562,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
}
- return this.configureAST(new DeclarationListStatement(declarationExpressionList), ctx);
+ return configureAST(new DeclarationListStatement(declarationExpressionList), ctx);
}
private DeclarationListStatement createFieldDeclarationListStatement(VariableDeclarationContext ctx, ModifierManager modifierManager, ClassNode variableType, List<DeclarationExpression> declarationExpressionList, ClassNode classNode) {
@@ -1628,11 +1629,11 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
groovydocManager.handle(propertyNode, ctx);
if (0 == i) {
- this.configureAST(fieldNode, ctx, initialValue);
- this.configureAST(propertyNode, ctx, initialValue);
+ configureAST(fieldNode, ctx, initialValue);
+ configureAST(propertyNode, ctx, initialValue);
} else {
- this.configureAST(fieldNode, variableExpression, initialValue);
- this.configureAST(propertyNode, variableExpression, initialValue);
+ configureAST(fieldNode, variableExpression, initialValue);
+ configureAST(propertyNode, variableExpression, initialValue);
}
}
@@ -1663,9 +1664,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
groovydocManager.handle(fieldNode, ctx);
if (0 == i) {
- this.configureAST(fieldNode, ctx, initialValue);
+ configureAST(fieldNode, ctx, initialValue);
} else {
- this.configureAST(fieldNode, variableExpression, initialValue);
+ configureAST(fieldNode, variableExpression, initialValue);
}
}
@@ -1680,7 +1681,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public VariableExpression visitTypeNamePair(TypeNamePairContext ctx) {
- return this.configureAST(
+ return configureAST(
new VariableExpression(
this.visitVariableDeclaratorId(ctx.variableDeclaratorId()).getName(),
this.visitType(ctx.type())),
@@ -1713,9 +1714,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
token = new org.codehaus.groovy.syntax.Token(Types.ASSIGN, ASSIGN_STR, ctx.start.getLine(), 1);
}
- return this.configureAST(
+ return configureAST(
new DeclarationExpression(
- this.configureAST(
+ configureAST(
new VariableExpression(
this.visitVariableDeclaratorId(ctx.variableDeclaratorId()).getName(),
variableType
@@ -1732,7 +1733,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return EmptyExpression.INSTANCE;
}
- return this.configureAST(
+ return configureAST(
this.visitEnhancedStatementExpression(ctx.enhancedStatementExpression()),
ctx);
}
@@ -1763,7 +1764,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return this.createBlockStatement();
}
- return this.configureAST(
+ return configureAST(
this.visitBlockStatementsOpt(ctx.blockStatementsOpt()),
ctx);
}
@@ -1771,12 +1772,12 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ExpressionStatement visitNormalExprAlt(NormalExprAltContext ctx) {
- return this.configureAST(new ExpressionStatement((Expression) this.visit(ctx.expression())), ctx);
+ return configureAST(new ExpressionStatement((Expression) this.visit(ctx.expression())), ctx);
}
@Override
public ExpressionStatement visitCommandExprAlt(CommandExprAltContext ctx) {
- return this.configureAST(new ExpressionStatement(this.visitCommandExpression(ctx.commandExpression())), ctx);
+ return configureAST(new ExpressionStatement(this.visitCommandExpression(ctx.commandExpression())), ctx);
}
@Override
@@ -1787,7 +1788,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
MethodCallExpression methodCallExpression;
if (baseExpr instanceof PropertyExpression) { // e.g. obj.a 1, 2
methodCallExpression =
- this.configureAST(
+ configureAST(
this.createMethodCallExpression(
(PropertyExpression) baseExpr, arguments),
arguments);
@@ -1806,18 +1807,18 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
|| (baseExpr instanceof ConstantExpression && isTrue(baseExpr, IS_STRING)) /* e.g. "m" 1, 2 */)
) {
methodCallExpression =
- this.configureAST(
+ configureAST(
this.createMethodCallExpression(baseExpr, arguments),
arguments);
} else { // e.g. a[x] b, new A() b, etc.
- methodCallExpression = this.configureAST(this.createCallMethodCallExpression(baseExpr, arguments), arguments);
+ methodCallExpression = configureAST(this.createCallMethodCallExpression(baseExpr, arguments), arguments);
}
if (!asBoolean(ctx.commandArgument())) {
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
}
- return this.configureAST(
+ return configureAST(
(Expression) ctx.commandArgument().stream()
.map(e -> (Object) e)
.reduce(methodCallExpression,
@@ -1852,22 +1853,22 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
);
methodCallExpression.setImplicitThis(false);
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
} else if (asBoolean(ctx.pathElement())) { // e.g. x y a.b
Expression pathExpression =
this.createPathExpression(
- this.configureAST(
+ configureAST(
new PropertyExpression(baseExpr, this.createConstantExpression(primaryExpr)),
primaryExpr
),
ctx.pathElement()
);
- return this.configureAST(pathExpression, ctx);
+ return configureAST(pathExpression, ctx);
}
// e.g. x y a
- return this.configureAST(
+ return configureAST(
new PropertyExpression(
baseExpr,
primaryExpr instanceof VariableExpression
@@ -1898,7 +1899,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
expression.putNodeMetaData(INSIDE_PARENTHESES_LEVEL, insideParenLevel);
- return this.configureAST(expression, ctx);
+ return configureAST(expression, ctx);
}
@Override
@@ -1918,7 +1919,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw createParsingFailedException("Unsupported enhanced statement expression: " + ctx.getText(), ctx);
}
- return this.configureAST(expression, ctx);
+ return configureAST(expression, ctx);
}
@@ -1941,40 +1942,40 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (asBoolean(ctx.DOT())) {
if (asBoolean(ctx.AT())) { // e.g. obj.@a
- return this.configureAST(new AttributeExpression(baseExpr, namePartExpr), ctx);
+ return configureAST(new AttributeExpression(baseExpr, namePartExpr), ctx);
} else { // e.g. obj.p
PropertyExpression propertyExpression = new PropertyExpression(baseExpr, namePartExpr);
propertyExpression.putNodeMetaData(PATH_EXPRESSION_BASE_EXPR_GENERICS_TYPES, genericsTypes);
- return this.configureAST(propertyExpression, ctx);
+ return configureAST(propertyExpression, ctx);
}
} else if (asBoolean(ctx.SAFE_DOT())) {
if (asBoolean(ctx.AT())) { // e.g. obj?.@a
- return this.configureAST(new AttributeExpression(baseExpr, namePartExpr, true), ctx);
+ return configureAST(new AttributeExpression(baseExpr, namePartExpr, true), ctx);
} else { // e.g. obj?.p
PropertyExpression propertyExpression = new PropertyExpression(baseExpr, namePartExpr, true);
propertyExpression.putNodeMetaData(PATH_EXPRESSION_BASE_EXPR_GENERICS_TYPES, genericsTypes);
- return this.configureAST(propertyExpression, ctx);
+ return configureAST(propertyExpression, ctx);
}
} else if (asBoolean(ctx.METHOD_POINTER())) { // e.g. obj.&m
- return this.configureAST(new MethodPointerExpression(baseExpr, namePartExpr), ctx);
+ return configureAST(new MethodPointerExpression(baseExpr, namePartExpr), ctx);
} else if (asBoolean(ctx.METHOD_REFERENCE())) { // e.g. obj::m
- return this.configureAST(new MethodReferenceExpression(baseExpr, namePartExpr), ctx);
+ return configureAST(new MethodReferenceExpression(baseExpr, namePartExpr), ctx);
} else if (asBoolean(ctx.SPREAD_DOT())) {
if (asBoolean(ctx.AT())) { // e.g. obj*.@a
AttributeExpression attributeExpression = new AttributeExpression(baseExpr, namePartExpr, true);
attributeExpression.setSpreadSafe(true);
- return this.configureAST(attributeExpression, ctx);
+ return configureAST(attributeExpression, ctx);
} else { // e.g. obj*.p
PropertyExpression propertyExpression = new PropertyExpression(baseExpr, namePartExpr, true);
propertyExpression.putNodeMetaData(PATH_EXPRESSION_BASE_EXPR_GENERICS_TYPES, genericsTypes);
propertyExpression.setSpreadSafe(true);
- return this.configureAST(propertyExpression, ctx);
+ return configureAST(propertyExpression, ctx);
}
}
}
@@ -1982,7 +1983,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (asBoolean(ctx.indexPropertyArgs())) { // e.g. list[1, 3, 5]
Pair<Token, Expression> pair = this.visitIndexPropertyArgs(ctx.indexPropertyArgs());
- return this.configureAST(
+ return configureAST(
new BinaryExpression(baseExpr, createGroovyToken(pair.getKey()), pair.getValue(), asBoolean(ctx.indexPropertyArgs().QUESTION())),
ctx);
}
@@ -2002,7 +2003,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
}
} else {
ListExpression listExpression =
- this.configureAST(
+ configureAST(
new ListExpression(
mapEntryExpressionList.stream()
.map(
@@ -2021,37 +2022,37 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
right = listExpression;
}
- return this.configureAST(
+ return configureAST(
new BinaryExpression(baseExpr, createGroovyToken(ctx.namedPropertyArgs().LBRACK().getSymbol()), right),
ctx);
}
if (asBoolean(ctx.arguments())) {
Expression argumentsExpr = this.visitArguments(ctx.arguments());
- this.configureAST(argumentsExpr, ctx);
+ configureAST(argumentsExpr, ctx);
if (isInsideParentheses(baseExpr)) { // e.g. (obj.x)(), (obj.@x)()
- return this.configureAST(createCallMethodCallExpression(baseExpr, argumentsExpr), ctx);
+ return configureAST(createCallMethodCallExpression(baseExpr, argumentsExpr), ctx);
}
if (baseExpr instanceof AttributeExpression) { // e.g. obj.@a(1, 2)
AttributeExpression attributeExpression = (AttributeExpression) baseExpr;
attributeExpression.setSpreadSafe(false); // whether attributeExpression is spread safe or not, we must reset it as false
- return this.configureAST(createCallMethodCallExpression(attributeExpression, argumentsExpr, true), ctx);
+ return configureAST(createCallMethodCallExpression(attributeExpression, argumentsExpr, true), ctx);
}
if (baseExpr instanceof PropertyExpression) { // e.g. obj.a(1, 2)
MethodCallExpression methodCallExpression =
this.createMethodCallExpression((PropertyExpression) baseExpr, argumentsExpr);
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
}
if (baseExpr instanceof VariableExpression) { // void and primitive type AST node must be an instance of VariableExpression
String baseExprText = baseExpr.getText();
if (VOID_STR.equals(baseExprText)) { // e.g. void()
- return this.configureAST(createCallMethodCallExpression(this.createConstantExpression(baseExpr), argumentsExpr), ctx);
+ return configureAST(createCallMethodCallExpression(this.createConstantExpression(baseExpr), argumentsExpr), ctx);
} else if (PRIMITIVE_TYPE_SET.contains(baseExprText)) { // e.g. int(), long(), float(), etc.
throw createParsingFailedException("Primitive type literal: " + baseExprText + " cannot be used as a method name", ctx);
}
@@ -2068,7 +2069,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
// e.g. src/test/org/codehaus/groovy/transform/MapConstructorTransformTest.groovy:
// @MapConstructor(pre={ super(args?.first, args?.last); args = args ?: [:] }, post = { first = first?.toUpperCase() })
if (ctx.isInsideClosure) {
- return this.configureAST(
+ return configureAST(
new MethodCallExpression(
baseExpr,
baseExprText,
@@ -2077,7 +2078,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ctx);
}
- return this.configureAST(
+ return configureAST(
new ConstructorCallExpression(
SUPER_STR.equals(baseExprText)
? ClassNode.SUPER
@@ -2090,11 +2091,11 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
MethodCallExpression methodCallExpression =
this.createMethodCallExpression(baseExpr, argumentsExpr);
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
}
// e.g. 1(), 1.1(), ((int) 1 / 2)(1, 2), {a, b -> a + b }(1, 2), m()()
- return this.configureAST(createCallMethodCallExpression(baseExpr, argumentsExpr), ctx);
+ return configureAST(createCallMethodCallExpression(baseExpr, argumentsExpr), ctx);
}
if (asBoolean(ctx.closure())) {
@@ -2108,7 +2109,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ArgumentListExpression argumentListExpression = (ArgumentListExpression) argumentsExpression;
argumentListExpression.getExpressions().add(closureExpression);
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
}
if (argumentsExpression instanceof TupleExpression) { // named arguments, e.g. x: 1, y: 2
@@ -2117,10 +2118,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (asBoolean(tupleExpression.getExpressions())) {
methodCallExpression.setArguments(
- this.configureAST(
+ configureAST(
new ArgumentListExpression(
Stream.of(
- this.configureAST(
+ configureAST(
new MapExpression(namedArgumentListExpression.getMapEntryExpressions()),
namedArgumentListExpression
),
@@ -2133,22 +2134,22 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
} else {
// the branch should never reach, because named arguments must not be empty
methodCallExpression.setArguments(
- this.configureAST(
+ configureAST(
new ArgumentListExpression(closureExpression),
tupleExpression));
}
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
}
}
// e.g. 1 {}, 1.1 {}
if (baseExpr instanceof ConstantExpression && isTrue(baseExpr, IS_NUMERIC)) {
- return this.configureAST(this.createCallMethodCallExpression(
+ return configureAST(this.createCallMethodCallExpression(
baseExpr,
- this.configureAST(
+ configureAST(
new ArgumentListExpression(closureExpression),
closureExpression)
), ctx);
@@ -2161,13 +2162,13 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
MethodCallExpression methodCallExpression =
this.createMethodCallExpression(
propertyExpression,
- this.configureAST(
+ configureAST(
new ArgumentListExpression(closureExpression),
closureExpression
)
);
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
}
// e.g. m { return 1; }
@@ -2179,13 +2180,13 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
? this.createConstantExpression(baseExpr)
: baseExpr,
- this.configureAST(
+ configureAST(
new ArgumentListExpression(closureExpression),
closureExpression)
);
- return this.configureAST(methodCallExpression, ctx);
+ return configureAST(methodCallExpression, ctx);
}
throw createParsingFailedException("Unsupported path element: " + ctx.getText(), ctx);
@@ -2232,7 +2233,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return new ArgumentListExpression();
}
- return this.configureAST(this.visitEnhancedArgumentList(ctx.enhancedArgumentList()), ctx);
+ return configureAST(this.visitEnhancedArgumentList(ctx.enhancedArgumentList()), ctx);
}
@Override
@@ -2259,15 +2260,15 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
});
if (!asBoolean(mapEntryExpressionList)) { // e.g. arguments like 1, 2 OR someArg, e -> e
- return this.configureAST(
+ return configureAST(
new ArgumentListExpression(expressionList),
ctx);
}
if (!asBoolean(expressionList)) { // e.g. arguments like x: 1, y: 2
- return this.configureAST(
+ return configureAST(
new TupleExpression(
- this.configureAST(
+ configureAST(
new NamedArgumentListExpression(mapEntryExpressionList),
ctx)),
ctx);
@@ -2277,7 +2278,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ArgumentListExpression argumentListExpression = new ArgumentListExpression(expressionList);
argumentListExpression.getExpressions().add(0, new MapExpression(mapEntryExpressionList)); // TODO: confirm BUG OR NOT? All map entries will be put at first, which is not friendly to Groovy developers
- return this.configureAST(argumentListExpression, ctx);
+ return configureAST(argumentListExpression, ctx);
}
throw createParsingFailedException("Unsupported argument list: " + ctx.getText(), ctx);
@@ -2310,15 +2311,15 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Expression visitEnhancedArgumentListElement(EnhancedArgumentListElementContext ctx) {
if (asBoolean(ctx.expressionListElement())) {
- return this.configureAST(this.visitExpressionListElement(ctx.expressionListElement()), ctx);
+ return configureAST(this.visitExpressionListElement(ctx.expressionListElement()), ctx);
}
if (asBoolean(ctx.standardLambdaExpression())) {
- return this.configureAST(this.visitStandardLambdaExpression(ctx.standardLambdaExpression()), ctx);
+ return configureAST(this.visitStandardLambdaExpression(ctx.standardLambdaExpression()), ctx);
}
if (asBoolean(ctx.mapEntry())) {
- return this.configureAST(this.visitMapEntry(ctx.mapEntry()), ctx);
+ return configureAST(this.visitMapEntry(ctx.mapEntry()), ctx);
}
throw createParsingFailedException("Unsupported enhanced argument list element: " + ctx.getText(), ctx);
@@ -2353,7 +2354,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ConstantExpression constantExpression = new ConstantExpression(text, true);
constantExpression.putNodeMetaData(IS_STRING, true);
- return this.configureAST(constantExpression, ctx);
+ return configureAST(constantExpression, ctx);
}
private int getSlashyType(String text) {
@@ -2386,7 +2387,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ListExpression listExpression = new ListExpression(expressionList);
listExpression.setWrapped(true);
- return new Pair<>(ctx.LBRACK().getSymbol(), this.configureAST(listExpression, ctx));
+ return new Pair<>(ctx.LBRACK().getSymbol(), configureAST(listExpression, ctx));
}
@Override
@@ -2397,13 +2398,13 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Expression visitNamePart(NamePartContext ctx) {
if (asBoolean(ctx.identifier())) {
- return this.configureAST(new ConstantExpression(this.visitIdentifier(ctx.identifier())), ctx);
+ return configureAST(new ConstantExpression(this.visitIdentifier(ctx.identifier())), ctx);
} else if (asBoolean(ctx.stringLiteral())) {
- return this.configureAST(this.visitStringLiteral(ctx.stringLiteral()), ctx);
+ return configureAST(this.visitStringLiteral(ctx.stringLiteral()), ctx);
} else if (asBoolean(ctx.dynamicMemberName())) {
- return this.configureAST(this.visitDynamicMemberName(ctx.dynamicMemberName()), ctx);
+ return configureAST(this.visitDynamicMemberName(ctx.dynamicMemberName()), ctx);
} else if (asBoolean(ctx.keywords())) {
- return this.configureAST(new ConstantExpression(ctx.keywords().getText()), ctx);
+ return configureAST(new ConstantExpression(ctx.keywords().getText()), ctx);
}
throw createParsingFailedException("Unsupported name part: " + ctx.getText(), ctx);
@@ -2412,9 +2413,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Expression visitDynamicMemberName(DynamicMemberNameContext ctx) {
if (asBoolean(ctx.parExpression())) {
- return this.configureAST(this.visitParExpression(ctx.parExpression()), ctx);
+ return configureAST(this.visitParExpression(ctx.parExpression()), ctx);
} else if (asBoolean(ctx.gstring())) {
- return this.configureAST(this.visitGstring(ctx.gstring()), ctx);
+ return configureAST(this.visitGstring(ctx.gstring()), ctx);
}
throw createParsingFailedException("Unsupported dynamic member name: " + ctx.getText(), ctx);
@@ -2429,13 +2430,13 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (ctx.isInsideAssert) {
// powerassert requires different column for values, so we have to copy the location of op
- return this.configureAST(postfixExpression, ctx.op);
+ return configureAST(postfixExpression, ctx.op);
} else {
- return this.configureAST(postfixExpression, ctx);
+ return configureAST(postfixExpression, ctx);
}
}
- return this.configureAST(pathExpr, ctx);
+ return configureAST(pathExpr, ctx);
}
@Override
@@ -2446,13 +2447,13 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Expression visitUnaryNotExprAlt(UnaryNotExprAltContext ctx) {
if (asBoolean(ctx.NOT())) {
- return this.configureAST(
+ return configureAST(
new NotExpression((Expression) this.visit(ctx.expression())),
ctx);
}
if (asBoolean(ctx.BITNOT())) {
- return this.configureAST(
+ return configureAST(
new BitwiseNegationExpression((Expression) this.visit(ctx.expression())),
ctx);
}
@@ -2462,7 +2463,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public CastExpression visitCastExprAlt(CastExprAltContext ctx) {
- return this.configureAST(
+ return configureAST(
new CastExpression(
this.visitCastParExpression(ctx.castParExpression()),
(Expression) this.visit(ctx.expression())
@@ -2486,10 +2487,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
switch (ctx.op.getType()) {
case ADD: {
if (expression instanceof ConstantExpression && !insidePar) {
- return this.configureAST(expression, ctx);
+ return configureAST(expression, ctx);
}
- return this.configureAST(new UnaryPlusExpression(expression), ctx);
+ return configureAST(new UnaryPlusExpression(expression), ctx);
}
case SUB: {
if (expression instanceof ConstantExpression && !insidePar) {
@@ -2503,7 +2504,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
this.numberFormatError = null; // reset the numberFormatError
- return this.configureAST(result, ctx);
+ return configureAST(result, ctx);
}
String floatingPointLiteralText = constantExpression.getNodeMetaData(FLOATING_POINT_LITERAL_TEXT);
@@ -2512,7 +2513,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
this.numberFormatError = null; // reset the numberFormatError
- return this.configureAST(result, ctx);
+ return configureAST(result, ctx);
}
} catch (Exception e) {
throw createParsingFailedException(e.getMessage(), ctx);
@@ -2521,12 +2522,12 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw new GroovyBugError("Failed to find the original number literal text: " + constantExpression.getText());
}
- return this.configureAST(new UnaryMinusExpression(expression), ctx);
+ return configureAST(new UnaryMinusExpression(expression), ctx);
}
case INC:
case DEC:
- return this.configureAST(new PrefixExpression(this.createGroovyToken(ctx.op), expression), ctx);
+ return configureAST(new PrefixExpression(this.createGroovyToken(ctx.op), expression), ctx);
default:
throw createParsingFailedException("Unsupported unary operation: " + ctx.getText(), ctx);
@@ -2549,7 +2550,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
Expression right = (Expression) this.visit(ctx.right);
if (asBoolean(ctx.rangeOp)) {
- return this.configureAST(new RangeExpression(left, right, !ctx.rangeOp.getText().endsWith("<")), ctx);
+ return configureAST(new RangeExpression(left, right, !ctx.rangeOp.getText().endsWith("<")), ctx);
}
org.codehaus.groovy.syntax.Token op;
@@ -2570,27 +2571,27 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
BinaryExpression binaryExpression = new BinaryExpression(left, op, right);
if (isTrue(ctx, IS_INSIDE_CONDITIONAL_EXPRESSION)) {
- return this.configureAST(binaryExpression, antlrToken);
+ return configureAST(binaryExpression, antlrToken);
}
- return this.configureAST(binaryExpression, ctx);
+ return configureAST(binaryExpression, ctx);
}
@Override
public Expression visitRelationalExprAlt(RelationalExprAltContext ctx) {
switch (ctx.op.getType()) {
case AS:
- return this.configureAST(
+ return configureAST(
CastExpression.asExpression(this.visitType(ctx.type()), (Expression) this.visit(ctx.left)),
ctx);
case INSTANCEOF:
case NOT_INSTANCEOF:
ctx.type().putNodeMetaData(IS_INSIDE_INSTANCEOF_EXPR, true);
- return this.configureAST(
+ return configureAST(
new BinaryExpression((Expression) this.visit(ctx.left),
this.createGroovyToken(ctx.op),
- this.configureAST(new ClassExpression(this.visitType(ctx.type())), ctx.type())),
+ configureAST(new ClassExpression(this.visitType(ctx.type())), ctx.type())),
ctx);
case LE:
@@ -2603,7 +2604,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return this.createBinaryExpression(ctx.left, ctx.op, ctx.right, ctx);
}
- return this.configureAST(
+ return configureAST(
this.createBinaryExpression(ctx.left, ctx.op, ctx.right),
ctx);
}
@@ -2615,14 +2616,14 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public BinaryExpression visitEqualityExprAlt(EqualityExprAltContext ctx) {
- return this.configureAST(
+ return configureAST(
this.createBinaryExpression(ctx.left, ctx.op, ctx.right),
ctx);
}
@Override
public BinaryExpression visitRegexExprAlt(RegexExprAltContext ctx) {
- return this.configureAST(
+ return configureAST(
this.createBinaryExpression(ctx.left, ctx.op, ctx.right),
ctx);
}
@@ -2644,14 +2645,14 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public BinaryExpression visitLogicalAndExprAlt(LogicalAndExprAltContext ctx) {
- return this.configureAST(
+ return configureAST(
this.createBinaryExpression(ctx.left, ctx.op, ctx.right),
ctx);
}
@Override
public BinaryExpression visitLogicalOrExprAlt(LogicalOrExprAltContext ctx) {
- return this.configureAST(
+ return configureAST(
this.createBinaryExpression(ctx.left, ctx.op, ctx.right),
ctx);
}
@@ -2661,16 +2662,16 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ctx.fb.putNodeMetaData(IS_INSIDE_CONDITIONAL_EXPRESSION, true);
if (asBoolean(ctx.ELVIS())) { // e.g. a == 6 ?: 0
- return this.configureAST(
+ return configureAST(
new ElvisOperatorExpression((Expression) this.visit(ctx.con), (Expression) this.visit(ctx.fb)),
ctx);
}
ctx.tb.putNodeMetaData(IS_INSIDE_CONDITIONAL_EXPRESSION, true);
- return this.configureAST(
+ return configureAST(
new TernaryExpression(
- this.configureAST(new BooleanExpression((Expression) this.visit(ctx.con)),
+ configureAST(new BooleanExpression((Expression) this.visit(ctx.con)),
ctx.con),
(Expression) this.visit(ctx.tb),
(Expression) this.visit(ctx.fb)),
@@ -2679,7 +2680,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public BinaryExpression visitMultipleAssignmentExprAlt(MultipleAssignmentExprAltContext ctx) {
- return this.configureAST(
+ return configureAST(
new BinaryExpression(
this.visitVariableNames(ctx.left),
this.createGroovyToken(ctx.op),
@@ -2698,9 +2699,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw createParsingFailedException("Nested parenthesis is not allowed in multiple assignment, e.g. ((a)) = b", ctx);
}
- return this.configureAST(
+ return configureAST(
new BinaryExpression(
- this.configureAST(new TupleExpression(leftExpr), ctx.left),
+ configureAST(new TupleExpression(leftExpr), ctx.left),
this.createGroovyToken(ctx.op),
this.visitEnhancedStatementExpression(ctx.enhancedStatementExpression())),
ctx);
@@ -2725,7 +2726,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw createParsingFailedException("The LHS of an assignment should be a variable or a field accessing expression", ctx);
}
- return this.configureAST(
+ return configureAST(
new BinaryExpression(
leftExpr,
this.createGroovyToken(ctx.op),
@@ -2739,65 +2740,65 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
// primary { --------------------------------------------------------------------
@Override
public VariableExpression visitIdentifierPrmrAlt(IdentifierPrmrAltContext ctx) {
- return this.configureAST(new VariableExpression(this.visitIdentifier(ctx.identifier())), ctx);
+ return configureAST(new VariableExpression(this.visitIdentifier(ctx.identifier())), ctx);
}
@Override
public ConstantExpression visitLiteralPrmrAlt(LiteralPrmrAltContext ctx) {
- return this.configureAST((ConstantExpression) this.visit(ctx.literal()), ctx);
+ return configureAST((ConstantExpression) this.visit(ctx.literal()), ctx);
}
@Override
public GStringExpression visitGstringPrmrAlt(GstringPrmrAltContext ctx) {
- return this.configureAST((GStringExpression) this.visit(ctx.gstring()), ctx);
+ return configureAST((GStringExpression) this.visit(ctx.gstring()), ctx);
}
@Override
public Expression visitNewPrmrAlt(NewPrmrAltContext ctx) {
- return this.configureAST(this.visitCreator(ctx.creator()), ctx);
+ return configureAST(this.visitCreator(ctx.creator()), ctx);
}
@Override
public VariableExpression visitThisPrmrAlt(ThisPrmrAltContext ctx) {
- return this.configureAST(new VariableExpression(ctx.THIS().getText()), ctx);
+ return configureAST(new VariableExpression(ctx.THIS().getText()), ctx);
}
@Override
public VariableExpression visitSuperPrmrAlt(SuperPrmrAltContext ctx) {
- return this.configureAST(new VariableExpression(ctx.SUPER().getText()), ctx);
+ return configureAST(new VariableExpression(ctx.SUPER().getText()), ctx);
}
@Override
public Expression visitParenPrmrAlt(ParenPrmrAltContext ctx) {
- return this.configureAST(this.visitParExpression(ctx.parExpression()), ctx);
+ return configureAST(this.visitParExpression(ctx.parExpression()), ctx);
}
@Override
public ClosureExpression visitClosurePrmrAlt(ClosurePrmrAltContext ctx) {
- return this.configureAST(this.visitClosure(ctx.closure()), ctx);
+ return configureAST(this.visitClosure(ctx.closure()), ctx);
}
@Override
public ClosureExpression visitLambdaPrmrAlt(LambdaPrmrAltContext ctx) {
- return this.configureAST(this.visitStandardLambdaExpression(ctx.standardLambdaExpression()), ctx);
+ return configureAST(this.visitStandardLambdaExpression(ctx.standardLambdaExpression()), ctx);
}
@Override
public ListExpression visitListPrmrAlt(ListPrmrAltContext ctx) {
- return this.configureAST(
+ return configureAST(
this.visitList(ctx.list()),
ctx);
}
@Override
public MapExpression visitMapPrmrAlt(MapPrmrAltContext ctx) {
- return this.configureAST(this.visitMap(ctx.map()), ctx);
+ return configureAST(this.visitMap(ctx.map()), ctx);
}
@Override
public VariableExpression visitTypePrmrAlt(TypePrmrAltContext ctx) {
- return this.configureAST(
+ return configureAST(
this.visitBuiltInType(ctx.builtInType()),
ctx);
}
@@ -2823,10 +2824,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
ConstructorCallExpression constructorCallExpression = new ConstructorCallExpression(anonymousInnerClassNode, arguments);
constructorCallExpression.setUsingAnonymousInnerClass(true);
- return this.configureAST(constructorCallExpression, ctx);
+ return configureAST(constructorCallExpression, ctx);
}
- return this.configureAST(
+ return configureAST(
new ConstructorCallExpression(classNode, arguments),
ctx);
}
@@ -2879,7 +2880,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
arrayExpression.setType(createArrayType(classNode, allDimList));
- return this.configureAST(arrayExpression, ctx);
+ return configureAST(arrayExpression, ctx);
}
throw createParsingFailedException("Unsupported creator: " + ctx.getText(), ctx);
@@ -2922,7 +2923,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
anonymousInnerClass.setUsingGenerics(false);
anonymousInnerClass.setAnonymous(true);
anonymousInnerClass.putNodeMetaData(CLASS_NAME, fullName);
- this.configureAST(anonymousInnerClass, ctx);
+ configureAST(anonymousInnerClass, ctx);
classNodeStack.push(anonymousInnerClass);
ctx.classBody().putNodeMetaData(CLASS_DECLARATION_CLASS_NODE, anonymousInnerClass);
@@ -2947,9 +2948,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
this.visitTypeArgumentsOrDiamond(ctx.typeArgumentsOrDiamond()));
}
- classNode = this.configureAST(classNode, ctx);
+ classNode = configureAST(classNode, ctx);
} else if (asBoolean(ctx.primitiveType())) {
- classNode = this.configureAST(
+ classNode = configureAST(
this.visitPrimitiveType(ctx.primitiveType()),
ctx);
}
@@ -2966,7 +2967,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public MapExpression visitMap(MapContext ctx) {
- return this.configureAST(
+ return configureAST(
new MapExpression(this.visitMapEntryList(ctx.mapEntryList())),
ctx);
}
@@ -2996,14 +2997,14 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
Expression valueExpr = (Expression) this.visit(ctx.expression());
if (asBoolean(ctx.MUL())) {
- keyExpr = this.configureAST(new SpreadMapExpression(valueExpr), ctx);
+ keyExpr = configureAST(new SpreadMapExpression(valueExpr), ctx);
} else if (asBoolean(ctx.mapEntryLabel())) {
keyExpr = this.visitMapEntryLabel(ctx.mapEntryLabel());
} else {
throw createParsingFailedException("Unsupported map entry: " + ctx.getText(), ctx);
}
- return this.configureAST(
+ return configureAST(
new MapEntryExpression(keyExpr, valueExpr),
ctx);
}
@@ -3011,19 +3012,19 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Expression visitMapEntryLabel(MapEntryLabelContext ctx) {
if (asBoolean(ctx.keywords())) {
- return this.configureAST(this.visitKeywords(ctx.keywords()), ctx);
+ return configureAST(this.visitKeywords(ctx.keywords()), ctx);
} else if (asBoolean(ctx.primary())) {
Expression expression = (Expression) this.visit(ctx.primary());
// if the key is variable and not inside parentheses, convert it to a constant, e.g. [a:1, b:2]
if (expression instanceof VariableExpression && !isInsideParentheses(expression)) {
expression =
- this.configureAST(
+ configureAST(
new ConstantExpression(((VariableExpression) expression).getName()),
expression);
}
- return this.configureAST(expression, ctx);
+ return configureAST(expression, ctx);
}
throw createParsingFailedException("Unsupported map entry label: " + ctx.getText(), ctx);
@@ -3031,7 +3032,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ConstantExpression visitKeywords(KeywordsContext ctx) {
- return this.configureAST(new ConstantExpression(ctx.getText()), ctx);
+ return configureAST(new ConstantExpression(ctx.getText()), ctx);
}
/*
@@ -3052,13 +3053,13 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
throw createParsingFailedException("Unsupported built-in type: " + ctx, ctx);
}
- return this.configureAST(new VariableExpression(text), ctx);
+ return configureAST(new VariableExpression(text), ctx);
}
@Override
public ListExpression visitList(ListContext ctx) {
- return this.configureAST(
+ return configureAST(
new ListExpression(
this.visitExpressionList(ctx.expressionList())),
ctx);
@@ -3088,10 +3089,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
Expression expression = (Expression) this.visit(ctx.expression());
if (asBoolean(ctx.MUL())) {
- return this.configureAST(new SpreadExpression(expression), ctx);
+ return configureAST(new SpreadExpression(expression), ctx);
}
- return this.configureAST(expression, ctx);
+ return configureAST(expression, ctx);
}
@@ -3111,7 +3112,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
constantExpression.putNodeMetaData(IS_NUMERIC, true);
constantExpression.putNodeMetaData(INTEGER_LITERAL_TEXT, text);
- return this.configureAST(constantExpression, ctx);
+ return configureAST(constantExpression, ctx);
}
@Override
@@ -3129,24 +3130,24 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
constantExpression.putNodeMetaData(IS_NUMERIC, true);
constantExpression.putNodeMetaData(FLOATING_POINT_LITERAL_TEXT, text);
- return this.configureAST(constantExpression, ctx);
+ return configureAST(constantExpression, ctx);
}
@Override
public ConstantExpression visitStringLiteralAlt(StringLiteralAltContext ctx) {
- return this.configureAST(
+ return configureAST(
this.visitStringLiteral(ctx.stringLiteral()),
ctx);
}
@Override
public ConstantExpression visitBooleanLiteralAlt(BooleanLiteralAltContext ctx) {
- return this.configureAST(new ConstantExpression("true".equals(ctx.BooleanLiteral().getText()), true), ctx);
+ return configureAST(new ConstantExpression("true".equals(ctx.BooleanLiteral().getText()), true), ctx);
}
@Override
public ConstantExpression visitNullLiteralAlt(NullLiteralAltContext ctx) {
- return this.configureAST(new ConstantExpression(null), ctx);
+ return configureAST(new ConstantExpression(null), ctx);
}
@@ -3178,7 +3179,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
? ""
: StringGroovyMethods.getAt(it, new IntRange(true, 1, -2));
- strings.add(this.configureAST(new ConstantExpression(it), ctx.GStringBegin()));
+ strings.add(configureAST(new ConstantExpression(it), ctx.GStringBegin()));
}
List<ConstantExpression> partStrings =
@@ -3190,7 +3191,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
it = StringUtils.replaceEscapes(it, slashyType);
it = it.length() == 1 ? "" : StringGroovyMethods.getAt(it, new IntRange(true, 0, -2));
- return this.configureAST(new ConstantExpression(it), e);
+ return configureAST(new ConstantExpression(it), e);
}).collect(Collectors.toList());
strings.addAll(partStrings);
@@ -3211,7 +3212,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
? ""
: StringGroovyMethods.getAt(it, new IntRange(true, 0, -2));
- strings.add(this.configureAST(new ConstantExpression(it), ctx.GStringEnd()));
+ strings.add(configureAST(new ConstantExpression(it), ctx.GStringEnd()));
}
List<Expression> values = ctx.gstringValue().stream()
@@ -3222,10 +3223,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
List<Statement> statementList = ((BlockStatement) ((ClosureExpression) expression).getCode()).getStatements();
if (statementList.stream().noneMatch(x -> asBoolean(x))) {
- return this.configureAST(new ConstantExpression(null), e);
+ return configureAST(new ConstantExpression(null), e);
}
- return this.configureAST(this.createCallMethodCallExpression(expression, new ArgumentListExpression(), true), e);
+ return configureAST(this.createCallMethodCallExpression(expression, new ArgumentListExpression(), true), e);
}
return expression;
@@ -3249,25 +3250,25 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
verbatimText.append(value.getText());
}
- return this.configureAST(new GStringExpression(verbatimText.toString(), strings, values), ctx);
+ return configureAST(new GStringExpression(verbatimText.toString(), strings, values), ctx);
}
@Override
public Expression visitGstringValue(GstringValueContext ctx) {
if (asBoolean(ctx.gstringPath())) {
- return this.configureAST(this.visitGstringPath(ctx.gstringPath()), ctx);
+ return configureAST(this.visitGstringPath(ctx.gstringPath()), ctx);
}
if (asBoolean(ctx.LBRACE())) {
if (asBoolean(ctx.statementExpression())) {
- return this.configureAST(((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression(), ctx.statementExpression());
+ return configureAST(((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression(), ctx.statementExpression());
} else { // e.g. "${}"
- return this.configureAST(new ConstantExpression(null), ctx);
+ return configureAST(new ConstantExpression(null), ctx);
}
}
if (asBoolean(ctx.closure())) {
- return this.configureAST(this.visitClosure(ctx.closure()), ctx);
+ return configureAST(this.visitClosure(ctx.closure()), ctx);
}
throw createParsingFailedException("Unsupported gstring value: " + ctx.getText(), ctx);
@@ -3279,19 +3280,19 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (asBoolean(ctx.GStringPathPart())) {
Expression propertyExpression = ctx.GStringPathPart().stream()
- .map(e -> this.configureAST((Expression) new ConstantExpression(e.getText().substring(1)), e))
- .reduce(this.configureAST(variableExpression, ctx.identifier()), (r, e) -> this.configureAST(new PropertyExpression(r, e), e));
+ .map(e -> configureAST((Expression) new ConstantExpression(e.getText().substring(1)), e))
+ .reduce(configureAST(variableExpression, ctx.identifier()), (r, e) -> configureAST(new PropertyExpression(r, e), e));
- return this.configureAST(propertyExpression, ctx);
+ return configureAST(propertyExpression, ctx);
}
- return this.configureAST(variableExpression, ctx);
+ return configureAST(variableExpression, ctx);
}
// } gstring --------------------------------------------------------------------
@Override
public LambdaExpression visitStandardLambdaExpression(StandardLambdaExpressionContext ctx) {
- return this.configureAST(this.createLambda(ctx.standardLambdaParameters(), ctx.lambdaBody()), ctx);
+ return configureAST(this.createLambda(ctx.standardLambdaParameters(), ctx.lambdaBody()), ctx);
}
private LambdaExpression createLambda(StandardLambdaParametersContext standardLambdaParametersContext, LambdaBodyContext lambdaBodyContext) {
@@ -3304,7 +3305,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
public Parameter[] visitStandardLambdaParameters(StandardLambdaParametersContext ctx) {
if (asBoolean(ctx.variableDeclaratorId())) {
return new Parameter[]{
- this.configureAST(
+ configureAST(
new Parameter(
ClassHelper.OBJECT_TYPE,
this.visitVariableDeclaratorId(ctx.variableDeclaratorId()).getName()
@@ -3326,11 +3327,11 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Statement visitLambdaBody(LambdaBodyContext ctx) {
if (asBoolean(ctx.statementExpression())) {
- return this.configureAST((ExpressionStatement) this.visit(ctx.statementExpression()), ctx);
+ return configureAST((ExpressionStatement) this.visit(ctx.statementExpression()), ctx);
}
if (asBoolean(ctx.block())) {
- return this.configureAST(this.visitBlock(ctx.block()), ctx);
+ return configureAST(this.visitBlock(ctx.block()), ctx);
}
throw createParsingFailedException("Unsupported lambda body: " + ctx.getText(), ctx);
@@ -3348,7 +3349,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
Statement code = this.visitBlockStatementsOpt(ctx.blockStatementsOpt());
- return this.configureAST(new ClosureExpression(parameters, code), ctx);
+ return configureAST(new ClosureExpression(parameters, code), ctx);
}
@Override
@@ -3419,7 +3420,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Parameter visitThisFormalParameter(ThisFormalParameterContext ctx) {
- return this.configureAST(new Parameter(this.visitType(ctx.type()), THIS_STR), ctx);
+ return configureAST(new Parameter(this.visitType(ctx.type()), THIS_STR), ctx);
}
@Override
@@ -3442,11 +3443,11 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ModifierNode visitClassOrInterfaceModifier(ClassOrInterfaceModifierContext ctx) {
if (asBoolean(ctx.annotation())) {
- return this.configureAST(new ModifierNode(this.visitAnnotation(ctx.annotation()), ctx.getText()), ctx);
+ return configureAST(new ModifierNode(this.visitAnnotation(ctx.annotation()), ctx.getText()), ctx);
}
if (asBoolean(ctx.m)) {
- return this.configureAST(new ModifierNode(ctx.m.getType(), ctx.getText()), ctx);
+ return configureAST(new ModifierNode(ctx.m.getType(), ctx.getText()), ctx);
}
throw createParsingFailedException("Unsupported class or interface modifier: " + ctx.getText(), ctx);
@@ -3455,11 +3456,11 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ModifierNode visitModifier(ModifierContext ctx) {
if (asBoolean(ctx.classOrInterfaceModifier())) {
- return this.configureAST(this.visitClassOrInterfaceModifier(ctx.classOrInterfaceModifier()), ctx);
+ return configureAST(this.visitClassOrInterfaceModifier(ctx.classOrInterfaceModifier()), ctx);
}
if (asBoolean(ctx.m)) {
- return this.configureAST(new ModifierNode(ctx.m.getType(), ctx.getText()), ctx);
+ return configureAST(new ModifierNode(ctx.m.getType(), ctx.getText()), ctx);
}
throw createParsingFailedException("Unsupported modifier: " + ctx.getText(), ctx);
@@ -3485,11 +3486,11 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ModifierNode visitVariableModifier(VariableModifierContext ctx) {
if (asBoolean(ctx.annotation())) {
- return this.configureAST(new ModifierNode(this.visitAnnotation(ctx.annotation()), ctx.getText()), ctx);
+ return configureAST(new ModifierNode(this.visitAnnotation(ctx.annotation()), ctx.getText()), ctx);
}
if (asBoolean(ctx.m)) {
- return this.configureAST(new ModifierNode(ctx.m.getType(), ctx.getText()), ctx);
+ return configureAST(new ModifierNode(ctx.m.getType(), ctx.getText()), ctx);
}
throw createParsingFailedException("Unsupported variable modifier", ctx);
@@ -3563,7 +3564,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
classNode = this.createArrayType(classNode, dimList);
}
- return this.configureAST(classNode, ctx);
+ return configureAST(classNode, ctx);
}
@Override
@@ -3582,7 +3583,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
this.visitTypeArguments(ctx.typeArguments()));
}
- return this.configureAST(classNode, ctx);
+ return configureAST(classNode, ctx);
}
@Override
@@ -3607,7 +3608,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public GenericsType visitTypeArgument(TypeArgumentContext ctx) {
if (asBoolean(ctx.QUESTION())) {
- ClassNode baseType = this.configureAST(ClassHelper.makeWithoutCaching(QUESTION_STR), ctx.QUESTION());
+ ClassNode baseType = configureAST(ClassHelper.makeWithoutCaching(QUESTION_STR), ctx.QUESTION());
baseType.addAnnotations(this.visitAnnotationsOpt(ctx.annotationsOpt()));
@@ -3616,7 +3617,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
genericsType.setWildcard(true);
genericsType.setName(QUESTION_STR);
- return this.configureAST(genericsType, ctx);
+ return configureAST(genericsType, ctx);
}
ClassNode[] upperBounds = null;
@@ -3633,9 +3634,9 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
genericsType.setWildcard(true);
genericsType.setName(QUESTION_STR);
- return this.configureAST(genericsType, ctx);
+ return configureAST(genericsType, ctx);
} else if (asBoolean(ctx.type())) {
- return this.configureAST(
+ return configureAST(
this.createGenericsType(
this.visitType(ctx.type())),
ctx);
@@ -3646,18 +3647,18 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ClassNode visitPrimitiveType(PrimitiveTypeContext ctx) {
- return this.configureAST(ClassHelper.make(ctx.getText()), ctx);
+ return configureAST(ClassHelper.make(ctx.getText()), ctx);
}
// } type --------------------------------------------------------------------
@Override
public VariableExpression visitVariableDeclaratorId(VariableDeclaratorIdContext ctx) {
- return this.configureAST(new VariableExpression(this.visitIdentifier(ctx.identifier())), ctx);
+ return configureAST(new VariableExpression(this.visitIdentifier(ctx.identifier())), ctx);
}
@Override
public TupleExpression visitVariableNames(VariableNamesContext ctx) {
- return this.configureAST(
+ return configureAST(
new TupleExpression(
ctx.variableDeclaratorId().stream()
.map(this::visitVariableDeclaratorId)
@@ -3669,15 +3670,15 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public BlockStatement visitBlockStatementsOpt(BlockStatementsOptContext ctx) {
if (asBoolean(ctx.blockStatements())) {
- return this.configureAST(this.visitBlockStatements(ctx.blockStatements()), ctx);
+ return configureAST(this.visitBlockStatements(ctx.blockStatements()), ctx);
}
- return this.configureAST(this.createBlockStatement(), ctx);
+ return configureAST(this.createBlockStatement(), ctx);
}
@Override
public BlockStatement visitBlockStatements(BlockStatementsContext ctx) {
- return this.configureAST(
+ return configureAST(
this.createBlockStatement(
ctx.blockStatement().stream()
.map(this::visitBlockStatement)
@@ -3689,7 +3690,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Statement visitBlockStatement(BlockStatementContext ctx) {
if (asBoolean(ctx.localVariableDeclaration())) {
- return this.configureAST(this.visitLocalVariableDeclaration(ctx.localVariableDeclaration()), ctx);
+ return configureAST(this.visitLocalVariableDeclaration(ctx.localVariableDeclaration()), ctx);
}
if (asBoolean(ctx.statement())) {
@@ -3724,7 +3725,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
annotationElementValues.forEach(e -> annotationNode.addMember(e.getKey(), e.getValue()));
- return this.configureAST(annotationNode, ctx);
+ return configureAST(annotationNode, ctx);
}
@Override
@@ -3774,15 +3775,15 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public Expression visitElementValue(ElementValueContext ctx) {
if (asBoolean(ctx.expression())) {
- return this.configureAST((Expression) this.visit(ctx.expression()), ctx);
+ return configureAST((Expression) this.visit(ctx.expression()), ctx);
}
if (asBoolean(ctx.annotation())) {
- return this.configureAST(new AnnotationConstantExpression(this.visitAnnotation(ctx.annotation())), ctx);
+ return configureAST(new AnnotationConstantExpression(this.visitAnnotation(ctx.annotation())), ctx);
}
if (asBoolean(ctx.elementValueArrayInitializer())) {
- return this.conf
<TRUNCATED>