phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'simplify-variable-declarator-id-parsing' of https://github.com/Monits/pmd into pr-118

Browse Source 
# Conflicts:
#	pmd-java/etc/grammar/Java.jjt
This commit is contained in:
Andreas Dangel
2016-10-30 18:51:44 +01:00
parent 2f498d1130 567be45b8c
commit 2158a792ff
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pmd-java/etc/grammar/Java.jjt
View File

@ -1,4 +1,9 @@
/** /**
* Simplify VariableDeclaratorId, forbidding illegal sequences such as
* this[] and MyClass.this[]
*
* Juan Martin Sotuyo Dodero 10/2016
*====================================================================
* Improve lambda detection in PrimaryPrefix to improve parsing performance. * Improve lambda detection in PrimaryPrefix to improve parsing performance.
* *
* Juan Martin Sotuyo Dodero 10/2016 * Juan Martin Sotuyo Dodero 10/2016
@ -1429,9 +1434,8 @@ void VariableDeclaratorId() :
{ {
(LOOKAHEAD(2) t=<IDENTIFIER> "." <THIS> { checkforBadExplicitReceiverParameter(); jjtThis.setExplicitReceiverParameter(); image=t.image + ".this"; } (LOOKAHEAD(2) t=<IDENTIFIER> "." <THIS> { checkforBadExplicitReceiverParameter(); jjtThis.setExplicitReceiverParameter(); image=t.image + ".this"; }
| t=<THIS> { checkforBadExplicitReceiverParameter(); jjtThis.setExplicitReceiverParameter(); image = t.image;} | t=<THIS> { checkforBadExplicitReceiverParameter(); jjtThis.setExplicitReceiverParameter(); image = t.image;}
| t=<IDENTIFIER> { image = t.image; } | t=<IDENTIFIER> { image = t.image; } ( "[" "]" { jjtThis.bumpArrayDepth(); })*
) )
( "[" "]" { jjtThis.bumpArrayDepth(); })*
{ {
checkForBadAssertUsage(image, "a variable name"); checkForBadAssertUsage(image, "a variable name");
checkForBadEnumUsage(image, "a variable name"); checkForBadEnumUsage(image, "a variable name");