hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Java grammar fix: TypeParameter name wasn't set

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x@6629 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Xavier Le Vourch 2008-10-17 17:24:37 +00:00
parent fc173e08c8
commit 06bb1a6f27
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pmd/etc/grammar/Java.jjt
View File

@ -1223,9 +1223,9 @@ void TypeParameters():
}
void TypeParameter():
{}
{Token t;}
{
<IDENTIFIER> [ TypeBound() ]
t=<IDENTIFIER> {jjtThis.setImage(t.image);} [ TypeBound() ]
}
void TypeBound():

19
pmd/src/net/sourceforge/pmd/ast/JavaParser.java
View File

@ -868,11 +868,12 @@ jjtn000.setModifiers(modifiers);
final public void TypeParameter() throws ParseException {
/*@bgen(jjtree) TypeParameter */
ASTTypeParameter jjtn000 = new ASTTypeParameter(this, JJTTYPEPARAMETER);
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
ASTTypeParameter jjtn000 = new ASTTypeParameter(this, JJTTYPEPARAMETER);
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);Token t;
try {
jj_consume_token(IDENTIFIER);
t = jj_consume_token(IDENTIFIER);
jjtn000.setImage(t.image);
switch (jj_nt.kind) {
case EXTENDS:
TypeBound();
@ -7135,6 +7136,11 @@ jjtn000.setModifiers(modifiers);
return false;
}
private boolean jj_3R_202() {
if (jj_3R_212()) return true;
return false;
}
private boolean jj_3R_157() {
if (jj_3R_198()) return true;
return false;
@ -7370,11 +7376,6 @@ jjtn000.setModifiers(modifiers);
return false;
}
private boolean jj_3R_202() {
if (jj_3R_212()) return true;
return false;
}
private boolean jj_3_48() {
if (jj_scan_token(AT)) return true;
if (jj_3R_95()) return true;