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

Use semantic lookahead for the module productions

Browse Source 
The new keyword are only "restricted keywords" and can still be used
as identifiers.
This commit is contained in:
Andreas Dangel
2017-09-22 23:43:43 +02:00
parent 07eede38db
commit f30eb4b5ff
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,6 +379,14 @@ public class JavaParser {
return res; return res;
} }
/**
* Semantic lookahead to check if the next identifier is a
* specific restricted keyword.
*/
private boolean isKeyword(String keyword) {
return getToken(1).kind == IDENTIFIER && getToken(1).image.equals(keyword);
}
public Map<Integer, String> getSuppressMap() { public Map<Integer, String> getSuppressMap() {
return token_source.getSuppressMap(); return token_source.getSuppressMap();
} }
@ -497,7 +505,17 @@ TOKEN :
| < VOLATILE: "volatile" > | < VOLATILE: "volatile" >
| < WHILE: "while" > | < WHILE: "while" >
| < STRICTFP: "strictfp" > | < STRICTFP: "strictfp" >
| < OPEN: "open" > }
/* Restricted Keywords */
// Note: These are commented out, since these keywords
// can still be used as identifiers.
// see isKeyword() semantic lookup
/*
TOKEN :
{
< OPEN: "open" >
| < MODULE: "module" > | < MODULE: "module" >
| < REQUIRES: "requires" > | < REQUIRES: "requires" >
| < TRANSITIVE: "transitive" > | < TRANSITIVE: "transitive" >
@ -508,6 +526,7 @@ TOKEN :
| < PROVIDES: "provides" > | < PROVIDES: "provides" >
| < WITH: "with" > | < WITH: "with" >
} }
*/
/* LITERALS */ /* LITERALS */
@ -1311,7 +1330,7 @@ ASTCompilationUnit CompilationUnit() :
[ LOOKAHEAD( ( Annotation() )* "package" ) PackageDeclaration() ( EmptyStatement() )* ] [ LOOKAHEAD( ( Annotation() )* "package" ) PackageDeclaration() ( EmptyStatement() )* ]
( ImportDeclaration() ( EmptyStatement() )* )* ( ImportDeclaration() ( EmptyStatement() )* )*
( LOOKAHEAD(2) TypeDeclaration() ( EmptyStatement() )* )* ( LOOKAHEAD(2) TypeDeclaration() ( EmptyStatement() )* )*
[ ModuleDeclaration() ( EmptyStatement() )* ] [ LOOKAHEAD({isKeyword("open") || isKeyword("module") || getToken(1).kind == AT}) ModuleDeclaration() ( EmptyStatement() )* ]
( < "\u001a" > )? ( < "\u001a" > )?
( < "~[]" > )? ( < "~[]" > )?
<EOF> <EOF>
@ -1378,7 +1397,7 @@ void TypeDeclaration():
( (
ClassOrInterfaceDeclaration(modifiers) ClassOrInterfaceDeclaration(modifiers)
| |
EnumDeclaration(modifiers) LOOKAHEAD({isKeyword("enum")}) EnumDeclaration(modifiers)
| |
AnnotationTypeDeclaration(modifiers) AnnotationTypeDeclaration(modifiers)
) )
@ -1486,7 +1505,7 @@ void ClassOrInterfaceBodyDeclaration():
{ LOOKAHEAD(["static"] "{" ) Initializer() { LOOKAHEAD(["static"] "{" ) Initializer()
| modifiers = Modifiers() | modifiers = Modifiers()
( LOOKAHEAD(3) ClassOrInterfaceDeclaration(modifiers) ( LOOKAHEAD(3) ClassOrInterfaceDeclaration(modifiers)
| LOOKAHEAD(3) EnumDeclaration(modifiers) | LOOKAHEAD({isKeyword("enum")}) EnumDeclaration(modifiers)
| LOOKAHEAD( [ TypeParameters() ] <IDENTIFIER> "(" ) ConstructorDeclaration(modifiers) | LOOKAHEAD( [ TypeParameters() ] <IDENTIFIER> "(" ) ConstructorDeclaration(modifiers)
| LOOKAHEAD( Type() <IDENTIFIER> ( "[" "]" )* ( "," | "=" | ";" ) ) FieldDeclaration(modifiers) | LOOKAHEAD( Type() <IDENTIFIER> ( "[" "]" )* ( "," | "=" | ";" ) ) FieldDeclaration(modifiers)
| LOOKAHEAD(2) MethodDeclaration(modifiers) | LOOKAHEAD(2) MethodDeclaration(modifiers)
@ -2405,7 +2424,7 @@ void ModuleDeclaration():
checkForBadModuleUsage(); checkForBadModuleUsage();
} }
{ {
( Annotation() )* ["open" {jjtThis.setOpen(true);}] "module" ( Annotation() )* [LOOKAHEAD({isKeyword("open")}) <IDENTIFIER> {jjtThis.setOpen(true);}] LOOKAHEAD({isKeyword("module")}) <IDENTIFIER>
t=<IDENTIFIER> { s.append(t.image); } t=<IDENTIFIER> { s.append(t.image); }
( "." t=<IDENTIFIER> { s.append('.').append(t.image); } )* { jjtThis.setImage(s.toString()); } ( "." t=<IDENTIFIER> { s.append('.').append(t.image); } )* { jjtThis.setImage(s.toString()); }
"{" (ModuleDirective())* "}" "{" (ModuleDirective())* "}"
@ -2414,14 +2433,14 @@ void ModuleDeclaration():
void ModuleDirective(): void ModuleDirective():
{} {}
{ {
( "requires" { jjtThis.setType(ASTModuleDirective.DirectiveType.REQUIRES); } ( LOOKAHEAD({isKeyword("requires")}) <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.REQUIRES); }
("transitive" { jjtThis.setRequiresModifier(ASTModuleDirective.RequiresModifier.TRANSITIVE); } | (LOOKAHEAD({isKeyword("transitive")}) <IDENTIFIER> { jjtThis.setRequiresModifier(ASTModuleDirective.RequiresModifier.TRANSITIVE); } |
"static" { jjtThis.setRequiresModifier(ASTModuleDirective.RequiresModifier.STATIC); } )? "static" { jjtThis.setRequiresModifier(ASTModuleDirective.RequiresModifier.STATIC); } )?
ModuleName() ";" ) ModuleName() ";" )
| ( "exports" { jjtThis.setType(ASTModuleDirective.DirectiveType.EXPORTS); } Name() [ "to" ModuleName() ("," ModuleName())*] ";" ) | ( LOOKAHEAD({isKeyword("exports")}) <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.EXPORTS); } Name() [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())*] ";" )
| ( "opens" { jjtThis.setType(ASTModuleDirective.DirectiveType.OPENS); } Name() [ "to" ModuleName() ("," ModuleName())*] ";" ) | ( LOOKAHEAD({isKeyword("opens")}) <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.OPENS); } Name() [ LOOKAHEAD({isKeyword("to")}) <IDENTIFIER> ModuleName() ("," ModuleName())*] ";" )
| ( "uses" { jjtThis.setType(ASTModuleDirective.DirectiveType.USES); } Name() ";" ) | ( LOOKAHEAD({isKeyword("uses")}) <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.USES); } Name() ";" )
| ( "provides" { jjtThis.setType(ASTModuleDirective.DirectiveType.PROVIDES); } Name() "with" Name() ("," Name() )* ";" ) | ( LOOKAHEAD({isKeyword("provides")}) <IDENTIFIER> { jjtThis.setType(ASTModuleDirective.DirectiveType.PROVIDES); } Name() LOOKAHEAD({isKeyword("with")}) <IDENTIFIER> Name() ("," Name() )* ";" )
} }
// Similar to Name() // Similar to Name()