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

[java] RecordComponents -> RecordComponentList

Browse Source
This commit is contained in:
Andreas Dangel
2020-02-28 16:56:43 +01:00
parent e2d84d6741
commit 9917e3f422
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1131,15 +1131,15 @@ void RecordDeclaration(int modifiers):
} }
t=<IDENTIFIER> {checkForBadTypeIdentifierUsage(t.image); jjtThis.setImage(t.image);} t=<IDENTIFIER> {checkForBadTypeIdentifierUsage(t.image); jjtThis.setImage(t.image);}
[ TypeParameters() ] [ TypeParameters() ]
"(" RecordComponents() ")" RecordComponentList()
[ ImplementsList() ] [ ImplementsList() ]
RecordBody() RecordBody()
} }
void RecordComponents() : void RecordComponentList() :
{} {}
{ {
RecordComponent() ("," RecordComponent())* "(" RecordComponent() ("," RecordComponent())* ")"
} }
void RecordComponent(): void RecordComponent():

9
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordComponents.java → pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordComponentList.java
View File

@ -12,17 +12,18 @@ import net.sourceforge.pmd.annotation.Experimental;
* *
* <pre class="grammar"> * <pre class="grammar">
* *
* RecordComponents ::= {@linkplain ASTRecordComponent RecordComponent} ( "," {@linkplain ASTRecordComponent RecordComponent} )* * RecordComponentList ::= "(" {@linkplain ASTRecordComponent RecordComponent}
* ( "," {@linkplain ASTRecordComponent RecordComponent} )* ")"
* *
* </pre> * </pre>
*/ */
@Experimental @Experimental
public class ASTRecordComponents extends AbstractJavaNode { public class ASTRecordComponentList extends AbstractJavaNode {
ASTRecordComponents(int id) { ASTRecordComponentList(int id) {
super(id); super(id);
} }
ASTRecordComponents(JavaParser p, int id) { ASTRecordComponentList(JavaParser p, int id) {
super(p, id); super(p, id);
} }

2
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTRecordDeclaration.java
View File

@ -19,7 +19,7 @@ import net.sourceforge.pmd.lang.ast.Node;
* RecordDeclaration ::= "record" * RecordDeclaration ::= "record"
* &lt;IDENTIFIER&gt; * &lt;IDENTIFIER&gt;
* {@linkplain ASTTypeParameters TypeParameters}? * {@linkplain ASTTypeParameters TypeParameters}?
* "(" {@linkplain ASTRecordComponents RecordComponents} ")" * {@linkplain ASTRecordComponentList RecordComponents}
* {@linkplain ASTImplementsList ImplementsList}? * {@linkplain ASTImplementsList ImplementsList}?
* {@linkplain ASTRecordBody RecordBody} * {@linkplain ASTRecordBody RecordBody}
* *

2
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserDecoratedVisitor.java
View File

@ -917,7 +917,7 @@ public class JavaParserDecoratedVisitor implements JavaParserVisitor {
@Override @Override
@Experimental @Experimental
public Object visit(ASTRecordComponents node, Object data) { public Object visit(ASTRecordComponentList node, Object data) {
visitor.visit(node, data); visitor.visit(node, data);
return visit((JavaNode) node, data); return visit((JavaNode) node, data);
} }

2
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorAdapter.java
View File

@ -642,7 +642,7 @@ public class JavaParserVisitorAdapter implements JavaParserVisitor {
@Override @Override
@Experimental @Experimental
public Object visit(ASTRecordComponents node, Object data) { public Object visit(ASTRecordComponentList node, Object data) {
return visit((JavaNode) node, data); return visit((JavaNode) node, data);
} }

2
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/JavaParserVisitorDecorator.java
View File

@ -774,7 +774,7 @@ public class JavaParserVisitorDecorator implements JavaParserControllessVisitor
@Override @Override
@Experimental @Experimental
public Object visit(ASTRecordComponents node, Object data) { public Object visit(ASTRecordComponentList node, Object data) {
return visitor.visit(node, data); return visitor.visit(node, data);
} }

4
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java
View File

@ -99,7 +99,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTRUNSIGNEDSHIFT;
import net.sourceforge.pmd.lang.java.ast.ASTRecordBody; import net.sourceforge.pmd.lang.java.ast.ASTRecordBody;
import net.sourceforge.pmd.lang.java.ast.ASTRecordBodyDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTRecordBodyDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTRecordComponent; import net.sourceforge.pmd.lang.java.ast.ASTRecordComponent;
import net.sourceforge.pmd.lang.java.ast.ASTRecordComponents; import net.sourceforge.pmd.lang.java.ast.ASTRecordComponentList;
import net.sourceforge.pmd.lang.java.ast.ASTRecordConstructorDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTRecordConstructorDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTRecordDeclaration; import net.sourceforge.pmd.lang.java.ast.ASTRecordDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTReferenceType; import net.sourceforge.pmd.lang.java.ast.ASTReferenceType;
@ -857,7 +857,7 @@ public abstract class AbstractJavaRule extends AbstractRule implements JavaParse
@Override @Override
@Experimental @Experimental
public Object visit(ASTRecordComponents node, Object data) { public Object visit(ASTRecordComponentList node, Object data) {
return visit((JavaNode) node, data); return visit((JavaNode) node, data);
} }

2
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/ast/Java14PreviewTest.java
View File

@ -96,7 +96,7 @@ public class Java14PreviewTest {
ASTCompilationUnit compilationUnit = java14p.parseResource("Point.java"); ASTCompilationUnit compilationUnit = java14p.parseResource("Point.java");
ASTRecordDeclaration recordDecl = compilationUnit.getFirstDescendantOfType(ASTRecordDeclaration.class); ASTRecordDeclaration recordDecl = compilationUnit.getFirstDescendantOfType(ASTRecordDeclaration.class);
Assert.assertEquals("Point", recordDecl.getImage()); Assert.assertEquals("Point", recordDecl.getImage());
List<ASTRecordComponent> components = recordDecl.getFirstChildOfType(ASTRecordComponents.class) List<ASTRecordComponent> components = recordDecl.getFirstChildOfType(ASTRecordComponentList.class)
.findChildrenOfType(ASTRecordComponent.class); .findChildrenOfType(ASTRecordComponent.class);
Assert.assertEquals(2, components.size()); Assert.assertEquals(2, components.size());
Assert.assertEquals("x", components.get(0).getImage()); Assert.assertEquals("x", components.get(0).getImage());