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 bug 95208 : open declaration on function template instance

Browse source
This commit is contained in:
Andrew Niefer 2005-07-06 17:12:38 +00:00
parent e8f0d1c55e
commit 910c275de7
2 changed files with 55 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TemplateTests.java
View file

@ -1657,7 +1657,7 @@ public class AST2TemplateTests extends AST2BaseTest {
IType type = t.getType();
assertTrue( type instanceof ICPPSpecialization );
assertSame( ((ICPPSpecialization)type).getSpecializedBinding(), _T );
assertSame( ((IPointerType)((ITypedef)type).getType()).getType(), B );
assertSame( i, col.getName(14).resolveBinding() );
}
@ -1752,8 +1752,6 @@ public class AST2TemplateTests extends AST2BaseTest {
}
public void testBug98666() throws Exception {
StringBuffer buffer = new StringBuffer();
IASTTranslationUnit tu = parse( "A::template B<T> b;", ParserLanguage.CPP );
CPPNameCollector col = new CPPNameCollector();
tu.accept( col );
@ -1796,4 +1794,34 @@ public class AST2TemplateTests extends AST2BaseTest {
assertTrue( BI instanceof ICPPTemplateInstance );
assertSame( ((ICPPTemplateInstance)BI).getSpecializedBinding(), spec );
}
public void testBug95208() throws Exception {
StringBuffer buffer = new StringBuffer();
buffer.append( "template <class T> int f(T); // #1\n"); //$NON-NLS-1$
buffer.append( "int f(int); // #2\n"); //$NON-NLS-1$
buffer.append( "int k = f(1); // uses #2\n"); //$NON-NLS-1$
buffer.append( "int l = f<>(1); // uses #1\n"); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.CPP );
CPPNameCollector col = new CPPNameCollector();
tu.accept(col);
ICPPFunctionTemplate f1 = (ICPPFunctionTemplate) col.getName(1).resolveBinding();
ICPPFunction f2 = (ICPPFunction) col.getName(4).resolveBinding();
assertSame( f2, col.getName(7).resolveBinding() );
IBinding b = col.getName(9).resolveBinding(); // resolve the binding of the ICPPASTTemplateId first
assertTrue( b instanceof ICPPTemplateInstance );
assertSame( ((ICPPTemplateInstance)b).getSpecializedBinding(), f1 );
assertSame( f1, col.getName(10).resolveBinding() );
tu = parse( buffer.toString(),ParserLanguage.CPP );
col = new CPPNameCollector();
tu.accept(col);
f1 = (ICPPFunctionTemplate) col.getName(1).resolveBinding();
assertSame( f1, col.getName(10).resolveBinding() );
}
}

32
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSemantics.java
View file

@ -106,6 +106,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPScope;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateInstance;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateNonTypeParameter;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateScope;
@ -460,6 +461,11 @@ public class CPPSemantics {
}
return false;
}
public boolean preferTemplateFunctions() {
if( astName == null )
return false;
return (astName instanceof ICPPASTTemplateId || astName.getPropertyInParent() == ICPPASTTemplateId.TEMPLATE_NAME );
}
}
static protected class Cost
@ -703,8 +709,17 @@ public class CPPSemantics {
}
IASTName name = data.astName;
if( name.getParent() instanceof ICPPASTTemplateId )
name = (IASTName) name.getParent();
if( name.getParent() instanceof ICPPASTTemplateId ){
if( binding instanceof ICPPTemplateInstance ){
IBinding b = binding;
binding = ((ICPPTemplateInstance)binding).getSpecializedBinding();
name.setBinding( binding );
name = (IASTName) name.getParent();
name.setBinding( b );
} else {
name = (IASTName) name.getParent();
}
}
if( name.getParent() instanceof ICPPASTQualifiedName ){
IASTName [] ns = ((ICPPASTQualifiedName)name.getParent()).getNames();
if( name == ns [ ns.length - 1] )
@ -2281,15 +2296,16 @@ public class CPPSemantics {
}
//we prefer normal functions over template functions, unless we specified template arguments
else if( bestIsTemplate && !currIsTemplate ){
if( data.templateArguments == null )
hasBetter = true;
else
if( data.preferTemplateFunctions() )
ambiguous = false;
else
hasBetter = true;
} else if( !bestIsTemplate && currIsTemplate ){
if( data.templateArguments == null )
ambiguous = false;
else
if( data.preferTemplateFunctions() )
hasBetter = true;
else
ambiguous = false;
}
if( hasBetter ){
//the new best function.