mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 09:15:38 +02:00
Code Issues Wiki Activity

Bug 323602: fixed f.p. in constructors/destructors for return checker

Browse source
This commit is contained in:
Alena Laskavaia 2010-08-27 00:47:28 +00:00
parent 54aeb3242f
commit da074afa86
3 changed files with 68 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/internal/checkers/ReturnChecker.java
View file

@ -34,6 +34,9 @@ import org.eclipse.cdt.core.dom.ast.IBasicType;
import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IBinding;
import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod;
/** /**
* The checker suppose to find issue related to mismatched return value/function * The checker suppose to find issue related to mismatched return value/function
@ -44,10 +47,10 @@ import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier;
* flow graph) * flow graph)
*/ */
public class ReturnChecker extends AbstractAstFunctionChecker { public class ReturnChecker extends AbstractAstFunctionChecker {
private static final String PARAM_IMPLICIT = "implicit"; //$NON-NLS-1$ public static final String PARAM_IMPLICIT = "implicit"; //$NON-NLS-1$
public final String RET_NO_VALUE_ID = "org.eclipse.cdt.codan.checkers.noreturn"; //$NON-NLS-1$ public static final String RET_NO_VALUE_ID = "org.eclipse.cdt.codan.checkers.noreturn"; //$NON-NLS-1$
public final String RET_ERR_VALUE_ID = "org.eclipse.cdt.codan.checkers.errreturnvalue"; //$NON-NLS-1$ public static final String RET_ERR_VALUE_ID = "org.eclipse.cdt.codan.checkers.errreturnvalue"; //$NON-NLS-1$
public final String RET_NORET_ID = "org.eclipse.cdt.codan.checkers.errnoreturn"; //$NON-NLS-1$ public static final String RET_NORET_ID = "org.eclipse.cdt.codan.checkers.errnoreturn"; //$NON-NLS-1$
class ReturnStmpVisitor extends ASTVisitor { class ReturnStmpVisitor extends ASTVisitor {
private IASTFunctionDefinition func; private IASTFunctionDefinition func;
@ -68,9 +71,10 @@ public class ReturnChecker extends AbstractAstFunctionChecker {
if (stmt instanceof IASTReturnStatement) { if (stmt instanceof IASTReturnStatement) {
hasret = true; hasret = true;
IASTReturnStatement ret = (IASTReturnStatement) stmt; IASTReturnStatement ret = (IASTReturnStatement) stmt;
if (!isVoid(func)) { if (!isVoid(func) && !isConstructorDestructor()) {
if (checkImplicitReturn(RET_NO_VALUE_ID) if (checkImplicitReturn(RET_NO_VALUE_ID)
|| isExplicitReturn(func)) { || isExplicitReturn(func)) {
if (ret.getReturnValue() == null) if (ret.getReturnValue() == null)
reportProblem(RET_NO_VALUE_ID, ret); reportProblem(RET_NO_VALUE_ID, ret);
} }
@ -87,6 +91,19 @@ public class ReturnChecker extends AbstractAstFunctionChecker {
} }
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
} }
/**
* @return
*
*/
public boolean isConstructorDestructor() {
if (func instanceof ICPPASTFunctionDefinition) {
IBinding method = func.getDeclarator().getName().resolveBinding();
if (method instanceof ICPPConstructor || method instanceof ICPPMethod && ((ICPPMethod)method).isDestructor()) {
return true;
}
}
return false;
}
} }

33
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
View file

@ -11,7 +11,9 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers; package org.eclipse.cdt.codan.core.internal.checkers;
import org.eclipse.cdt.codan.core.param.IProblemPreference;
import org.eclipse.cdt.codan.core.test.CheckerTestCase; import org.eclipse.cdt.codan.core.test.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.ReturnChecker;
/** /**
* Test for {@see ReturnCheckerTest} class * Test for {@see ReturnCheckerTest} class
@ -105,4 +107,35 @@ public class ReturnCheckerTest extends CheckerTestCase {
loadCodeAndRunCpp(getAboveComment()); loadCodeAndRunCpp(getAboveComment());
checkErrorLine(5); checkErrorLine(5);
} }
// class c {
// c() {
// return 0;
// }
//
// ~c() {
// return;
// }
// };
public void testContructorRetValue() {
loadCodeAndRunCpp(getAboveComment());
checkErrorLine(3, ReturnChecker.RET_ERR_VALUE_ID);
}
// class c {
// c() {
// return;
// }
//
// ~c() {
// return;
// }
// };
public void testContructor_Bug323602() {
IProblemPreference macro = getPreference(ReturnChecker.RET_NO_VALUE_ID,
ReturnChecker.PARAM_IMPLICIT);
macro.setValue(Boolean.TRUE);
loadCodeAndRunCpp(getAboveComment());
checkNoErrors();
}
} }

15
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
View file

@ -20,6 +20,7 @@ import org.eclipse.cdt.codan.core.model.IProblemReporter;
import org.eclipse.cdt.codan.core.param.IProblemPreference; import org.eclipse.cdt.codan.core.param.IProblemPreference;
import org.eclipse.cdt.codan.core.param.MapProblemPreference; import org.eclipse.cdt.codan.core.param.MapProblemPreference;
import org.eclipse.cdt.codan.internal.core.model.CodanProblem; import org.eclipse.cdt.codan.internal.core.model.CodanProblem;
import org.eclipse.cdt.codan.internal.core.model.CodanProblemMarker;
import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
@ -35,12 +36,20 @@ public class CheckerTestCase extends CodanTestCase {
return checkErrorLine(currentFile, i); return checkErrorLine(currentFile, i);
} }
public IMarker checkErrorLine(int i, String problemId) {
return checkErrorLine(currentFile, i, problemId);
}
public IMarker checkErrorLine(File file, int expectedLine) {
return checkErrorLine(file, expectedLine, null);
}
/** /**
* @param expectedLine * @param expectedLine
* - line * - line
* @return * @return
*/ */
public IMarker checkErrorLine(File file, int expectedLine) { public IMarker checkErrorLine(File file, int expectedLine, String problemId) {
assertTrue(markers != null); assertTrue(markers != null);
assertTrue("No problems found but should", markers.length > 0); //$NON-NLS-1$ assertTrue("No problems found but should", markers.length > 0); //$NON-NLS-1$
boolean found = false; boolean found = false;
@ -62,7 +71,9 @@ public class CheckerTestCase extends CodanTestCase {
fail(e.getMessage()); fail(e.getMessage());
} }
mfile = m.getResource().getName(); mfile = m.getResource().getName();
if (line.equals(expectedLine)) { if (line.equals(expectedLine)
&& (problemId == null || problemId
.equals(CodanProblemMarker.getProblemId(m)))) {
found = true; found = true;
if (file != null && !file.getName().equals(mfile)) if (file != null && !file.getName().equals(mfile))
found = false; found = false;