mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for bug 201174.

Browse source
This commit is contained in:
Sergey Prigogin 2008-01-05 18:48:01 +00:00
parent a64cedd926
commit 52dda7b84f
2 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCPPTemplateResolutionTest.java
View file

@ -17,6 +17,7 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.dom.ast.IBasicType; 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.IFunctionType;
import org.eclipse.cdt.core.dom.ast.IParameter; import org.eclipse.cdt.core.dom.ast.IParameter;
import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.ITypedef;
@ -91,7 +92,7 @@ public class IndexCPPTemplateResolutionTest extends IndexBindingResolutionTestBa
// c1.m1("aaa"); // OK // c1.m1("aaa"); // OK
// c1.m2("aaa"); // problem // c1.m2("aaa"); // problem
// } // }
public void _testUnindexedConstructorInstanceImplicitReferenceToDeferred() throws Exception { public void testUnindexedConstructorInstanceImplicitReferenceToDeferred() throws Exception {
IBinding b0= getBindingFromASTName("C1<char> c1", 8); IBinding b0= getBindingFromASTName("C1<char> c1", 8);
IBinding b1= getBindingFromASTName("m1(\"aaa\")", 2); IBinding b1= getBindingFromASTName("m1(\"aaa\")", 2);
IBinding b2= getBindingFromASTName("m2(\"aaa\")", 2); IBinding b2= getBindingFromASTName("m2(\"aaa\")", 2);
@ -115,6 +116,25 @@ public class IndexCPPTemplateResolutionTest extends IndexBindingResolutionTestBa
assertInstance(b0, ICPPMethod.class); assertInstance(b0, ICPPMethod.class);
} }
// template<typename T>
// class StrT {
// public: void assign(const T* s) {}
// };
// void main() {
// StrT<char> x;
// x.assign("aaa");
// }
public void testUnindexedMethodInstance2() throws Exception {
IBinding b0= getBindingFromASTName("assign(\"aaa\")", 6);
assertInstance(b0, ICPPMethod.class);
assertEquals(1, getIndex().findNames(b0, IIndex.FIND_REFERENCES).length);
IParameter[] parameters = ((ICPPMethod) b0).getParameters();
System.out.println(String.valueOf(parameters));
IFunctionType type = ((ICPPMethod) b0).getType();
System.out.println(String.valueOf(type));
}
// template<typename T> // template<typename T>
// class X {}; // class X {};
@ -188,7 +208,7 @@ public class IndexCPPTemplateResolutionTest extends IndexBindingResolutionTestBa
// m1("aaa"); // OK // m1("aaa"); // OK
// m2("aaa"); // problem // m2("aaa"); // problem
// } // }
public void _testUnindexedConstructorInstanceImplicitReference() throws Exception { public void testUnindexedConstructorInstanceImplicitReference() throws Exception {
IBinding b0= getBindingFromASTName("m1(\"aaa\")", 2); IBinding b0= getBindingFromASTName("m1(\"aaa\")", 2);
IBinding b1= getBindingFromASTName("m2(\"aaa\")", 2); IBinding b1= getBindingFromASTName("m2(\"aaa\")", 2);

20
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java
View file

@ -9,6 +9,7 @@
* QNX - Initial API and implementation * QNX - Initial API and implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Andrew Ferguson (Symbian) * Andrew Ferguson (Symbian)
* Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.pdom.dom.cpp; package org.eclipse.cdt.internal.core.pdom.dom.cpp;
@ -224,20 +225,33 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
if (shouldUpdate(pdomBinding, fromName)) { if (shouldUpdate(pdomBinding, fromName)) {
pdomBinding.update(this, fromName.getBinding()); pdomBinding.update(this, fromName.getBinding());
} }
} } else {
else {
try { try {
PDOMNode parent = getAdaptedParent(binding, true, true); PDOMNode parent = getAdaptedParent(binding, true, true);
if (parent == null) if (parent == null)
return null; return null;
pdomBinding = addBinding(parent, binding); pdomBinding = addBinding(parent, binding);
} catch(DOMException e) { if (pdomBinding instanceof PDOMCPPClassInstance && binding instanceof ICPPClassType) {
// Add instantiated constructors to the index (bug 201174).
addConstructors(pdomBinding, (ICPPClassType) binding);
}
} catch (DOMException e) {
throw new CoreException(Util.createStatus(e)); throw new CoreException(Util.createStatus(e));
} }
} }
return pdomBinding; return pdomBinding;
} }
private void addConstructors(PDOMBinding pdomBinding, ICPPClassType binding)
throws DOMException, CoreException {
ICPPConstructor[] constructors = binding.getConstructors();
for (int i = 0; i < constructors.length; i++) {
if (adaptBinding(constructors[i]) == null) {
addBinding(pdomBinding, constructors[i]);
}
}
}
private boolean shouldUpdate(PDOMBinding pdomBinding, IASTName fromName) throws CoreException { private boolean shouldUpdate(PDOMBinding pdomBinding, IASTName fromName) throws CoreException {
if (fromName != null) { if (fromName != null) {
if (fromName.isReference()) { if (fromName.isReference()) {