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 2018/02/17 18:14:30 UTC
groovy git commit: Minor refactoring: remove useless code of the new
parser
Repository: groovy
Updated Branches:
refs/heads/master cfc6c4df2 -> 7f6c92a5b
Minor refactoring: remove useless code of the new parser
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/7f6c92a5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/7f6c92a5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/7f6c92a5
Branch: refs/heads/master
Commit: 7f6c92a5bcae5e45f3c2bb512e04955f5d3f31b2
Parents: cfc6c4d
Author: danielsun1106 <re...@hotmail.com>
Authored: Sun Feb 18 02:14:23 2018 +0800
Committer: danielsun1106 <re...@hotmail.com>
Committed: Sun Feb 18 02:14:23 2018 +0800
----------------------------------------------------------------------
src/antlr/GroovyParser.g4 | 29 ++++++++++----------
.../apache/groovy/parser/antlr4/AstBuilder.java | 4 ---
2 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/7f6c92a5/src/antlr/GroovyParser.g4
----------------------------------------------------------------------
diff --git a/src/antlr/GroovyParser.g4 b/src/antlr/GroovyParser.g4
index df86f3c..19e6860 100644
--- a/src/antlr/GroovyParser.g4
+++ b/src/antlr/GroovyParser.g4
@@ -192,11 +192,11 @@ typeParameter
;
typeBound
- : type[false] (BITAND nls type[false])*
+ : type (BITAND nls type)*
;
typeList
- : type[false] (COMMA nls type[false])*
+ : type (COMMA nls type)*
;
@@ -223,7 +223,7 @@ locals[ int t ]
// Only interface can extend more than one super class
{1 == $t}? scs=typeList
|
- sc=type[false]
+ sc=type
)
nls)?
|
@@ -347,12 +347,13 @@ options { baseContext = type; }
dimsOpt
;
-type[boolean allowVoid]
+type
: annotationsOpt
(
(
primitiveType
|
+ // !!! Error Alternative !!!
VOID
)
|
@@ -386,8 +387,8 @@ typeArguments
;
typeArgument
- : type[false]
- | annotationsOpt QUESTION ((EXTENDS | SUPER) nls type[false])?
+ : type
+ | annotationsOpt QUESTION ((EXTENDS | SUPER) nls type)?
;
annotatedQualifiedClassName
@@ -407,11 +408,11 @@ formalParameterList
;
thisFormalParameter
- : type[false] THIS
+ : type THIS
;
formalParameter
- : variableModifiersOpt type[false]? ELLIPSIS? variableDeclaratorId (nls ASSIGN nls expression)?
+ : variableModifiersOpt type? ELLIPSIS? variableDeclaratorId (nls ASSIGN nls expression)?
;
methodBody
@@ -583,12 +584,12 @@ classifiedModifiers[int t]
variableDeclaration[int t]
@leftfactor { classifiedModifiers }
: classifiedModifiers[$t]
- ( type[false]? variableDeclarators
+ ( type? variableDeclarators
| typeNamePairs nls ASSIGN nls variableInitializer
)
|
classifiedModifiers[$t]?
- type[false] variableDeclarators
+ type variableDeclarators
;
typeNamePairs
@@ -596,7 +597,7 @@ typeNamePairs
;
typeNamePair
- : type[false]? variableDeclaratorId
+ : type? variableDeclaratorId
;
variableNames
@@ -719,7 +720,7 @@ forControl
;
enhancedForControl
- : variableModifiersOpt type[false]? variableDeclaratorId (COLON | IN) expression
+ : variableModifiersOpt type? variableDeclaratorId (COLON | IN) expression
;
classicalForControl
@@ -739,7 +740,7 @@ forUpdate
// EXPRESSIONS
castParExpression
- : LPAREN type[false] rparen
+ : LPAREN type rparen
;
parExpression
@@ -813,7 +814,7 @@ expression
right=expression #shiftExprAlt
// boolean relational expressions (level 7)
- | left=expression nls op=(AS | INSTANCEOF | NOT_INSTANCEOF) nls type[false] #relationalExprAlt
+ | left=expression nls op=(AS | INSTANCEOF | NOT_INSTANCEOF) nls type #relationalExprAlt
| left=expression nls op=(LE | GE | GT | LT | IN | NOT_IN) nls right=expression #relationalExprAlt
// equality/inequality (==/!=) (level 8)
http://git-wip-us.apache.org/repos/asf/groovy/blob/7f6c92a5/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 bd72215..f1f256e 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
@@ -3871,10 +3871,6 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
classNode = this.visitClassOrInterfaceType(ctx.classOrInterfaceType());
} else if (asBoolean(ctx.primitiveType())) {
classNode = this.visitPrimitiveType(ctx.primitiveType());
- } else if (asBoolean(ctx.VOID())) {
- if (ctx.allowVoid) {
- classNode = configureAST(ClassHelper.make(ctx.getText()), ctx.VOID());
- }
}
if (!asBoolean(classNode)) {