mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-17 05:55:22 +02:00
Code Issues Wiki Activity

bug 84610 : Unnamed namespaces

Browse source
This commit is contained in:
Andrew Niefer 2005-02-11 18:56:56 +00:00
parent b0f858c25b
commit 34ee61a5f8
2 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java
View file

@ -1363,8 +1363,42 @@ public class AST2CPPTests extends AST2BaseTest {
assertSame( f2, fref ); assertSame( f2, fref );
assertNotNull( f1 ); assertNotNull( f1 );
assertNotNull( f2 ); assertNotNull( f2 );
}
public void testBug84610() throws Exception {
StringBuffer buffer = new StringBuffer();
buffer.append("namespace { int i; } //1\n" ); //$NON-NLS-1$
buffer.append("void f(){ i; } \n" ); //$NON-NLS-1$
buffer.append("namespace A { \n" ); //$NON-NLS-1$
buffer.append(" namespace { \n" ); //$NON-NLS-1$
buffer.append(" int i; //2 \n" ); //$NON-NLS-1$
buffer.append(" int j; \n" ); //$NON-NLS-1$
buffer.append(" } \n" ); //$NON-NLS-1$
buffer.append(" void g(){ i; } \n" ); //$NON-NLS-1$
buffer.append("} \n" ); //$NON-NLS-1$
buffer.append("using namespace A; \n" ); //$NON-NLS-1$
buffer.append("void h() { \n" ); //$NON-NLS-1$
buffer.append(" i; //ambiguous \n" ); //$NON-NLS-1$
buffer.append(" A::i; //i2 \n" ); //$NON-NLS-1$
buffer.append(" j; \n" ); //$NON-NLS-1$
buffer.append("} \n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.CPP );
CPPNameCollector col = new CPPNameCollector();
CPPVisitor.visitTranslationUnit(tu, col);
assertEquals( 17, col.size() );
IVariable i1 = (IVariable) col.getName(1).resolveBinding();
IVariable i2 = (IVariable) col.getName(6).resolveBinding();
IVariable j = (IVariable) col.getName(7).resolveBinding();
assertInstances( col, i1, 2 );
assertInstances( col, i2, 4 );
assertInstances( col, j, 2 );
IProblemBinding problem = (IProblemBinding) col.getName(12).resolveBinding();
assertEquals( IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP, problem.getID() );
} }
} }

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

@ -704,8 +704,13 @@ public class CPPSemantics {
int size = directives.size(); int size = directives.size();
for( int i = 0; i < size; i++ ){ for( int i = 0; i < size; i++ ){
IASTName qualName = ((ICPPASTUsingDirective)directives.get(i)).getQualifiedName(); Object d = directives.get(i);
IBinding binding = qualName.resolveBinding(); IBinding binding = null;
if( d instanceof ICPPASTUsingDirective ){
binding = ((ICPPASTUsingDirective)d).getQualifiedName().resolveBinding();
} else if( d instanceof ICPPASTNamespaceDefinition ){
binding = ((ICPPASTNamespaceDefinition)d).getName().resolveBinding();
}
if( binding instanceof ICPPNamespace ){ if( binding instanceof ICPPNamespace ){
temp = ((ICPPNamespace)binding).getNamespaceScope(); temp = ((ICPPNamespace)binding).getNamespaceScope();
} else } else
@ -803,7 +808,11 @@ public class CPPSemantics {
break; break;
if( item != blockItem || data.includeBlockItem( item ) ){ if( item != blockItem || data.includeBlockItem( item ) ){
if( item instanceof ICPPASTUsingDirective && !data.ignoreUsingDirectives ) { if( !data.ignoreUsingDirectives &&
( item instanceof ICPPASTUsingDirective ||
(item instanceof ICPPASTNamespaceDefinition &&
((ICPPASTNamespaceDefinition)item).getName().toCharArray().length == 0) ) )
{
if( usingDirectives != null ) if( usingDirectives != null )
usingDirectives.add( item ); usingDirectives.add( item );
} else { } else {