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/25 12:55:00 UTC
[2/2] incubator-groovy git commit: GROOVY-7377: Interpolated variable
followed by asterisk in slashy-string causes compiler error (tweak)
GROOVY-7377: Interpolated variable followed by asterisk in slashy-string causes compiler error (tweak)
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/fe7fb466
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/fe7fb466
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/fe7fb466
Branch: refs/heads/master
Commit: fe7fb466aa73ed368d0c853486315577df710a9c
Parents: 72abd75
Author: paulk <pa...@asert.com.au>
Authored: Thu Jun 25 20:39:24 2015 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Jun 25 20:39:24 2015 +1000
----------------------------------------------------------------------
src/main/org/codehaus/groovy/antlr/groovy.g | 51 +++++++++++++-----------
1 file changed, 28 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/fe7fb466/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 0dc106c..3512399 100644
--- a/src/main/org/codehaus/groovy/antlr/groovy.g
+++ b/src/main/org/codehaus/groovy/antlr/groovy.g
@@ -3490,6 +3490,10 @@ options {
return LA(1) == '$' && LA(2) == '$';
}
+ protected boolean atMultiCommentStart() throws CharStreamException {
+ return LA(1) == '/' && LA(2) == '*';
+ }
+
protected boolean atDollarSlashEscape() throws CharStreamException {
return LA(1) == '$' && LA(2) == '/';
}
@@ -3756,7 +3760,7 @@ ML_COMMENT
options {
paraphrase="a multi-line comment";
}
- : "/*"
+ : { atMultiCommentStart() }? "/*"
( /* '\r' '\n' can be matched in one alternative or by matching
'\r' in one iteration and '\n' in another. I am trying to
handle any flavor of newline that comes in, but the language
@@ -3853,29 +3857,30 @@ options {
paraphrase="a multiline regular expression literal";
}
{int tt=0;}
- : ( '/' ~('*'|'=') ) =>
- {allowRegexpLiteral()}?
- '/'!
- {++suppressNewline;}
- //Do this, but require it to be non-trivial: REGEXP_CTOR_END[true]
- // There must be at least one symbol or $ escape, lest the regexp collapse to '//'.
- // (This should be simpler, but I don't know how to do it w/o ANTLR warnings vs. '//' comments.)
- (
- REGEXP_SYMBOL
- tt=REGEXP_CTOR_END[true]
- | {!atValidDollarEscape()}? '$'
- tt=REGEXP_CTOR_END[true]
- | '$'!
- {
- // Yes, it's a regexp constructor, and we've got a value part.
- tt = STRING_CTOR_START;
- stringCtorState = SCS_VAL + SCS_RE_TYPE;
- }
- )
- {$setType(tt);}
+ : { !atMultiCommentStart() }?
+ ( {allowRegexpLiteral()}?
+ '/'!
+ {++suppressNewline;}
+ //Do this, but require it to be non-trivial: REGEXP_CTOR_END[true]
+ // There must be at least one symbol or $ escape, lest the regexp collapse to '//'.
+ // (This should be simpler, but I don't know how to do it w/o ANTLR warnings vs. '//' comments.)
+ (
+ REGEXP_SYMBOL
+ tt=REGEXP_CTOR_END[true]
+ | {!atValidDollarEscape()}? '$'
+ tt=REGEXP_CTOR_END[true]
+ | '$'!
+ {
+ // Yes, it's a regexp constructor, and we've got a value part.
+ tt = STRING_CTOR_START;
+ stringCtorState = SCS_VAL + SCS_RE_TYPE;
+ }
+ )
+ {$setType(tt);}
- | ( '/' ~('*'|'=') ) => DIV {$setType(DIV);}
- | DIV_ASSIGN {$setType(DIV_ASSIGN);}
+ | ( '/' ~'=' ) => DIV {$setType(DIV);}
+ | DIV_ASSIGN {$setType(DIV_ASSIGN);}
+ )
;
DOLLAR_REGEXP_LITERAL