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

Fix node positions of ASTSwitchLabeled* nodes

Browse Source 
Note: this is a temporary fix. A more general fix is in
branch java-grammar
This commit is contained in:
Andreas Dangel
2019-05-01 18:13:03 +02:00
parent 9a93a6c5e9
commit a0657dd015
4 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,6 +231,8 @@ public abstract class AbstractNode implements Node {
public void jjtSetFirstToken(final GenericToken token) {
this.firstToken = token;
this.beginLine = token.getBeginLine();
this.beginColumn = token.getBeginColumn();
}
public GenericToken jjtGetLastToken() {

11
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabeledBlock.java
View File

@ -4,6 +4,8 @@
package net.sourceforge.pmd.lang.java.ast;
import net.sourceforge.pmd.lang.ast.AbstractNode;
public class ASTSwitchLabeledBlock extends AbstractJavaNode implements ASTSwitchLabeledRule {
ASTSwitchLabeledBlock(int id) {
@ -18,4 +20,13 @@ public class ASTSwitchLabeledBlock extends AbstractJavaNode implements ASTSwitch
public Object jjtAccept(JavaParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
@Override
public void jjtClose() {
super.jjtClose();
if (jjtGetNumChildren() > 0) {
AbstractNode firstChild = (AbstractNode) jjtGetChild(0);
jjtSetFirstToken(firstChild.jjtGetFirstToken());
}
}
}

11
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabeledExpression.java
View File

@ -4,6 +4,8 @@
package net.sourceforge.pmd.lang.java.ast;
import net.sourceforge.pmd.lang.ast.AbstractNode;
public class ASTSwitchLabeledExpression extends AbstractJavaNode implements ASTSwitchLabeledRule {
ASTSwitchLabeledExpression(int id) {
@ -18,4 +20,13 @@ public class ASTSwitchLabeledExpression extends AbstractJavaNode implements ASTS
public Object jjtAccept(JavaParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
@Override
public void jjtClose() {
super.jjtClose();
if (jjtGetNumChildren() > 0) {
AbstractNode firstChild = (AbstractNode) jjtGetChild(0);
jjtSetFirstToken(firstChild.jjtGetFirstToken());
}
}
}

11
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTSwitchLabeledThrowStatement.java
View File

@ -4,6 +4,8 @@
package net.sourceforge.pmd.lang.java.ast;
import net.sourceforge.pmd.lang.ast.AbstractNode;
public class ASTSwitchLabeledThrowStatement extends AbstractJavaNode implements ASTSwitchLabeledRule {
ASTSwitchLabeledThrowStatement(int id) {
@ -18,4 +20,13 @@ public class ASTSwitchLabeledThrowStatement extends AbstractJavaNode implements
public Object jjtAccept(JavaParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
@Override
public void jjtClose() {
super.jjtClose();
if (jjtGetNumChildren() > 0) {
AbstractNode firstChild = (AbstractNode) jjtGetChild(0);
jjtSetFirstToken(firstChild.jjtGetFirstToken());
}
}
}