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

Let runtime by runtime, by golly

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@3595 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Tom Copeland
2005-06-18 11:30:22 +00:00
parent 732c196421
commit e3c633a793
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pmd/src/net/sourceforge/pmd/dfa/StatementAndBraceFinder.java
View File

@ -82,6 +82,7 @@ public class StatementAndBraceFinder extends JavaParserVisitorAdapter {
}
Structure dataFlow = (Structure) data;
// TODO what about throw stmts?
if (node.jjtGetParent() instanceof ASTIfStatement) {
dataFlow.addNewNode(node); // START IF
dataFlow.pushOnStack(NodeType.IF_EXPR, dataFlow.getLast());
@ -145,7 +146,6 @@ public class StatementAndBraceFinder extends JavaParserVisitorAdapter {
super.visit(node, data);
if (node.jjtGetParent() instanceof ASTIfStatement) {
ASTIfStatement st = (ASTIfStatement) node.jjtGetParent();
if (!st.hasElse()) {
dataFlow.pushOnStack(NodeType.IF_LAST_STATEMENT_WITHOUT_ELSE, dataFlow.getLast());
@ -222,41 +222,35 @@ public class StatementAndBraceFinder extends JavaParserVisitorAdapter {
* expression node even if the loop looks like for(;;).
* */
private void addForExpressionNode(SimpleNode node, Structure dataFlow) {
ASTForStatement parent = (ASTForStatement) node.jjtGetParent();
boolean hasExpressionChild = false;
boolean hasForInitNode = false;
boolean hasForUpdateNode = false;
try {
ASTForStatement parent = (ASTForStatement) node.jjtGetParent();
boolean hasExpressionChild = false;
boolean hasForInitNode = false;
boolean hasForUpdateNode = false;
for (int i = 0; i < parent.jjtGetNumChildren(); i++) {
if (parent.jjtGetChild(i) instanceof ASTExpression)
hasExpressionChild = true;
else if (parent.jjtGetChild(i) instanceof ASTForUpdate)
hasForUpdateNode = true;
else if (parent.jjtGetChild(i) instanceof ASTForInit)
hasForInitNode = true;
for (int i = 0; i < parent.jjtGetNumChildren(); i++) {
if (parent.jjtGetChild(i) instanceof ASTExpression)
hasExpressionChild = true;
else if (parent.jjtGetChild(i) instanceof ASTForUpdate)
hasForUpdateNode = true;
else if (parent.jjtGetChild(i) instanceof ASTForInit)
hasForInitNode = true;
}
if (!hasExpressionChild) {
if (node instanceof ASTForInit) {
}
if (!hasExpressionChild) {
if (node instanceof ASTForInit) {
dataFlow.addNewNode(node); // FOR EXPRESSION
dataFlow.pushOnStack(NodeType.FOR_EXPR, dataFlow.getLast());
} else if (node instanceof ASTForUpdate) {
if (!hasForInitNode) {
dataFlow.addNewNode(node); // FOR EXPRESSION
dataFlow.pushOnStack(NodeType.FOR_EXPR, dataFlow.getLast());
}
} else if (node instanceof ASTStatement) {
if (!hasForInitNode && !hasForUpdateNode) {
dataFlow.addNewNode(node); // FOR EXPRESSION
dataFlow.pushOnStack(NodeType.FOR_EXPR, dataFlow.getLast());
} else if (node instanceof ASTForUpdate) {
if (!hasForInitNode) {
dataFlow.addNewNode(node); // FOR EXPRESSION
dataFlow.pushOnStack(NodeType.FOR_EXPR, dataFlow.getLast());
}
} else if (node instanceof ASTStatement) {
if (!hasForInitNode && !hasForUpdateNode) {
dataFlow.addNewNode(node); // FOR EXPRESSION
dataFlow.pushOnStack(NodeType.FOR_EXPR, dataFlow.getLast());
}
}
}
} catch (ClassCastException e) {
System.err.println("Wrong use of method addForExpressionNode(..).");
return;
}
}
}