You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2015/06/23 00:40:30 UTC
incubator-groovy git commit: small bit of cleanup in the grammar file
- left most of the "OBS"olete comments
Repository: incubator-groovy
Updated Branches:
refs/heads/master cabc132da -> d1eac63a2
small bit of cleanup in the grammar file - left most of the "OBS"olete comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/d1eac63a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/d1eac63a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/d1eac63a
Branch: refs/heads/master
Commit: d1eac63a23fd2a430251beec4a11ee9c949e68d1
Parents: cabc132
Author: Paul King <pa...@asert.com.au>
Authored: Tue Jun 23 07:50:18 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Tue Jun 23 08:40:01 2015 +1000
----------------------------------------------------------------------
src/main/org/codehaus/groovy/antlr/groovy.g | 47 +-----------------------
1 file changed, 2 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/d1eac63a/src/main/org/codehaus/groovy/antlr/groovy.g
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/antlr/groovy.g b/src/main/org/codehaus/groovy/antlr/groovy.g
index 9b5786d..e1a1dfa 100644
--- a/src/main/org/codehaus/groovy/antlr/groovy.g
+++ b/src/main/org/codehaus/groovy/antlr/groovy.g
@@ -1040,7 +1040,6 @@ annotationMemberArrayInitializer
)?
RCURLY!
;
-*OBS*/
// The two things that can initialize an annotation array element are a conditional expression
// and an annotation (nested annotation array initialisers are not valid)
@@ -1048,6 +1047,7 @@ annotationMemberArrayValueInitializer
: conditionalExpression[0]
| annotation nls!
;
+*OBS*/
superClassClause!
{Token first = LT(1);}
@@ -1644,21 +1644,6 @@ initializer
;
*OBS*/
-/*OBS???
-// This is the header of a method. It includes the name and parameters
-// for the method.
-// This also watches for a list of exception classes in a "throws" clause.
-ctorHead
- : IDENT // the name of the method
-
- // parse the formal parameter declarations.
- LPAREN! parameterDeclarationList RPAREN!
-
- // get the list of exceptions that this method is declared to throw
- (throwsClause)?
- ;
-*OBS*/
-
// This is a list of exception classes that the method is declared to throw
throwsClause
: nls! "throws"^ nls! identifier ( COMMA! nls! identifier )*
@@ -1738,7 +1723,7 @@ multicatch
variableLengthParameterDeclaration! {Token first = LT(1);}
: pm:parameterModifier t:typeSpec[false] TRIPLE_DOT! id:IDENT
- /*OBS* pd:declaratorBrackets[#t]* /
+ pd:declaratorBrackets[#t]
{#variableLengthParameterDeclaration = #(create(VARIABLE_PARAMETER_DEF,"VARIABLE_PARAMETER_DEF",first,LT(1)),
pm, #(create(TYPE,"TYPE",first,LT(1)),t), id);}
;
@@ -2511,24 +2496,6 @@ pathElement[AST prefix] {Token operator = LT(1);}
// since the bracket operator is transformed into a method call.
ipa:indexPropertyArgs[prefix]!
{ #pathElement = #ipa; }
-/* |
- (DOT nls "this") => DOT! nls! thisPart:"this"!
- { #pathElement = #(create(operator.getType(),operator.getText(),prefix,LT(1)),prefix,thisPart); }
-/*NYI*
- | DOT^ nls! "this"
-
- | DOT^ nls! "super"
- ( // (new Outer()).super() (create enclosing instance)
- lp3:LPAREN^ argList RPAREN!
- {#lp3.setType(SUPER_CTOR_CALL);}
- | DOT^ IDENT
- ( lps:LPAREN^ {#lps.setType(METHOD_CALL);}
- argList
- RPAREN!
- )?
- )
- | DOT^ nls! newExpression
-*NYI*/
;
pathElementStart!
@@ -2911,9 +2878,6 @@ postfixExpression[int lc_stmt]
// the basic element of an expression
primaryExpression {Token first = LT(1);}
: IDENT
- /*OBS* //keywords can follow dot in Groovy; no need for this special case
- ( options {greedy=true;} : DOT^ "class" )?
- *OBS*/
| constant
| newExpression
| "this"
@@ -2923,14 +2887,7 @@ primaryExpression {Token first = LT(1);}
| closableBlockConstructorExpression
| listOrMapConstructorExpression
| stringConstructorExpression // "foo $bar baz"; presented as multiple tokens
-//deprecated | scopeEscapeExpression // $x
| builtInType
- /*OBS* //class names work fine as expressions
- // look for int.class and int[].class
- | bt:builtInType!
- declaratorBrackets[bt]
- DOT^ nls! "class"
- *OBS*/
;
// Note: This is guaranteed to be an EXPR AST.