mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 18:26:01 +02:00
Code Issues Wiki Activity

- fixed f.p and added test

Browse source
This commit is contained in:
Alena Laskavaia 2010-03-24 03:31:35 +00:00
parent 704c6442b8
commit 26918193cf
4 changed files with 72 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/SuggestedParenthesisChecker.java
View file

@ -15,6 +15,7 @@ import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
import org.eclipse.cdt.core.dom.ast.IASTExpression;
import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
@ -37,32 +38,29 @@ public class SuggestedParenthesisChecker extends AbstractIndexAstChecker {
}
class ExpressionVisitor extends ASTVisitor {
private SuspiciousExpressionVisitor svis;
ExpressionVisitor() {
shouldVisitExpressions = true;
svis = new SuspiciousExpressionVisitor();
}
public int visit(IASTExpression expression) {
int precedence = getPrecedence(expression);
IASTNode parent = expression.getParent();
if (parent instanceof IASTExpression) {
IASTExpression parentExpr = (IASTExpression) parent;
if (isInParentesis(expression))
return PROCESS_CONTINUE;
if (precedence == 2) { // unary not
if (isUsedAsOperand(expression)) {
reportProblem(ER_ID, expression,
"Suggested parenthesis around expression");
return PROCESS_SKIP;
}
}
if (precedence >= 0) {
synchronized (svis) { // since we use only one instance of this
// visitor sync just in case
svis.init(expression);
expression.accept(svis);
if (svis.suspicious == true) {
reportProblem(ER_ID, svis.other,
} else if (precedence >= 0) {
int pp = getPrecedence(parentExpr);
if (pp == -1 || pp == precedence)
return PROCESS_CONTINUE;
reportProblem(ER_ID, expression,
"Suggested parenthesis around expression");
return PROCESS_SKIP;
}
}
}
return PROCESS_CONTINUE;
@ -71,7 +69,7 @@ public class SuggestedParenthesisChecker extends AbstractIndexAstChecker {
private boolean isUsedAsOperand(IASTExpression expression) {
ASTNodeProperty prop = expression.getPropertyInParent();
if (prop == IASTBinaryExpression.OPERAND_ONE
|| prop == IASTBinaryExpression.OPERAND_TWO
// || prop == IASTBinaryExpression.OPERAND_TWO
|| prop == IASTUnaryExpression.OPERAND)
return true;
return false;
@ -104,38 +102,18 @@ public class SuggestedParenthesisChecker extends AbstractIndexAstChecker {
return -1;
}
class SuspiciousExpressionVisitor extends ASTVisitor {
IASTExpression parent;
IASTExpression other;
boolean suspicious = false;
void init(IASTExpression e) {
parent = e;
suspicious = false;
}
SuspiciousExpressionVisitor() {
shouldVisitExpressions = true;
}
public int visit(IASTExpression expression) {
if (expression == parent)
return PROCESS_CONTINUE;
if (expression instanceof IASTUnaryExpression) {
IASTUnaryExpression uExpr = (IASTUnaryExpression) expression;
int operator = uExpr.getOperator();
if (operator == IASTUnaryExpression.op_bracketedPrimary) {
return PROCESS_SKIP;
/**
* @param parent
* @return
*/
private boolean isInParentesis(IASTExpression node) {
IASTNode parent = node.getParent();
if (parent instanceof IASTUnaryExpression) {
IASTUnaryExpression br = (IASTUnaryExpression) parent;
if (br.getOperator() == IASTUnaryExpression.op_bracketedPrimary) {
return true;
}
}
if (getPrecedence(expression) < 0) // not considered operator
return PROCESS_CONTINUE;
if (getPrecedence(expression) == getPrecedence(parent)) {
return PROCESS_SKIP;
}
suspicious = true;
other = expression;
return PROCESS_ABORT;
}
return false;
}
}

2
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/checkers/sample/StatementHasNoEffectCheckerTest.java → codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java
View file

@ -8,7 +8,7 @@
* Contributors:
* Alena Laskavaia - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.codan.core.checkers.sample;
package org.eclipse.cdt.codan.core.internal.checkers;
import org.eclipse.cdt.codan.core.test.CheckerTestCase;

43
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/checkers/sample/SuggestedParenthesisCheckerTest.java → codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java
View file

@ -8,7 +8,7 @@
* Contributors:
* Alena Laskavaia - initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.codan.core.checkers.sample;
package org.eclipse.cdt.codan.core.internal.checkers;
import org.eclipse.cdt.codan.core.test.CheckerTestCase;
@ -59,4 +59,45 @@ public class SuggestedParenthesisCheckerTest extends CheckerTestCase {
runOnFile();
checkNoErrors();
}
/*-
<code file="test4.c">
main() {
int a=1,b=3;
if (a && !b) b=4; // no error here on line 3
}
</code>
*/
public void test_lastnot() {
load("test4.c");
runOnFile();
checkNoErrors();
}
/*-
<code file="test5.c">
main() {
int a=1,b=3;
if ((!a) && 10) b=4; // no error here on line 3
}
</code>
*/
public void test_fixed() {
load("test5.c");
runOnFile();
checkNoErrors();
}
/*-
<code file="test6.c">
main() {
int a=1,b=3;
if (a && b & a) b=4; // error here on line 3
}
</code>
*/
public void test_mixedbin() {
load("test6.c");
runOnFile();
checkErrorLine(3);
}
}

4
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/AutomatedIntegrationSuite.java
View file

@ -14,8 +14,8 @@ package org.eclipse.cdt.codan.core.test;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.cdt.codan.core.checkers.sample.StatementHasNoEffectCheckerTest;
import org.eclipse.cdt.codan.core.checkers.sample.SuggestedParenthesisCheckerTest;
import org.eclipse.cdt.codan.core.internal.checkers.StatementHasNoEffectCheckerTest;
import org.eclipse.cdt.codan.core.internal.checkers.SuggestedParenthesisCheckerTest;
public class AutomatedIntegrationSuite extends TestSuite {
public AutomatedIntegrationSuite() {