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

Bug 326269 - Checker for instantiation of an abstract class. Patch by Anton Gorenkov.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-10 19:44:49 +00:00
parent af28c6569c
commit 2ba3a82120
2 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AbstractClassInstantiationCheckerTest.java
View file

@ -228,4 +228,20 @@ public class AbstractClassInstantiationCheckerTest extends CheckerTestCase {
loadCodeAndRun(getAboveComment()); loadCodeAndRun(getAboveComment());
checkErrorLines(4); checkErrorLines(4);
} }
// class A {
// public:
// virtual ~A() = 0;
// };
//
// class B : public A {
// public:
// virtual ~B() {}
// };
//
// B b;
public void testPureVirtualDestructorOverride() {
loadCodeAndRun(getAboveComment());
checkNoErrors();
}
} }

17
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
View file

@ -822,6 +822,15 @@ public class ClassTypeHelper {
return resultArray; return resultArray;
} }
private static String getMethodNameForOverrideKey(ICPPMethod method) {
if (method.isDestructor()) {
// Destructor's names may differ but they will override each other.
return "~"; //$NON-NLS-1$
} else {
return method.getName();
}
}
/** /**
* Returns pure virtual methods of the given class grouped by their names. * Returns pure virtual methods of the given class grouped by their names.
* *
@ -849,7 +858,7 @@ public class ClassTypeHelper {
} }
// Remove overridden methods (even if they are pure virtual) // Remove overridden methods (even if they are pure virtual)
for (ICPPMethod declaredMethod : classTarget.getDeclaredMethods()) { for (ICPPMethod declaredMethod : classTarget.getDeclaredMethods()) {
Set<ICPPMethod> methodsSet = pureVirtualMethods.get(declaredMethod.getName()); Set<ICPPMethod> methodsSet = pureVirtualMethods.get(getMethodNameForOverrideKey(declaredMethod));
if (methodsSet != null) { if (methodsSet != null) {
for (Iterator<ICPPMethod> methodIt = methodsSet.iterator(); methodIt.hasNext();) { for (Iterator<ICPPMethod> methodIt = methodsSet.iterator(); methodIt.hasNext();) {
ICPPMethod method = methodIt.next(); ICPPMethod method = methodIt.next();
@ -858,17 +867,17 @@ public class ClassTypeHelper {
} }
} }
if (methodsSet.isEmpty()) { if (methodsSet.isEmpty()) {
pureVirtualMethods.remove(declaredMethod.getName()); pureVirtualMethods.remove(getMethodNameForOverrideKey(declaredMethod));
} }
} }
} }
// Add pure virtual methods of current class // Add pure virtual methods of current class
for (ICPPMethod method : classTarget.getDeclaredMethods()) { for (ICPPMethod method : classTarget.getDeclaredMethods()) {
if (method.isPureVirtual()) { if (method.isPureVirtual()) {
Set<ICPPMethod> methodsSet = pureVirtualMethods.get(method.getName()); Set<ICPPMethod> methodsSet = pureVirtualMethods.get(getMethodNameForOverrideKey(method));
if (methodsSet == null) { if (methodsSet == null) {
methodsSet = new HashSet<ICPPMethod>(); methodsSet = new HashSet<ICPPMethod>();
pureVirtualMethods.put(method.getName(), methodsSet); pureVirtualMethods.put(getMethodNameForOverrideKey(method), methodsSet);
} }
methodsSet.add(method); methodsSet.add(method);
} }