mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

fix bug 86621

Browse source
This commit is contained in:
Andrew Niefer 2005-03-01 16:50:06 +00:00
parent 17879a2974
commit ac9494b61c
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2575,5 +2575,45 @@ public class AST2CPPTests extends AST2BaseTest {
IFunction printf = (IFunction) col.getName(6).resolveBinding();
assertInstances( col, printf, 3 );
}
public void testBug86554() throws Exception {
StringBuffer buffer = new StringBuffer();
buffer.append("int max( int a, int b, int c ) { \n"); //$NON-NLS-1$
buffer.append(" int m = ( a > b ) ? a : b; \n"); //$NON-NLS-1$
buffer.append(" return ( m > c ) ? m : c; \n"); //$NON-NLS-1$
buffer.append("} \n"); //$NON-NLS-1$
IASTTranslationUnit tu = parse(buffer.toString(), ParserLanguage.CPP);
CPPNameCollector col = new CPPNameCollector();
tu.getVisitor().visitTranslationUnit(col);
IVariable m = (IVariable) col.getName(11).resolveBinding();
IParameter a = (IParameter) col.getName(1).resolveBinding();
IParameter b = (IParameter) col.getName(2).resolveBinding();
IParameter c = (IParameter) col.getName(3).resolveBinding();
assertInstances( col, m, 3 );
assertInstances( col, a, 3 );
assertInstances( col, b, 3 );
assertInstances( col, c, 3 );
}
public void testBug86621() throws Exception {
StringBuffer buffer = new StringBuffer();
buffer.append("int g(); \n"); //$NON-NLS-1$
buffer.append("struct X { static int g(); }; \n"); //$NON-NLS-1$
buffer.append("struct Y : X { static int i ; }; \n"); //$NON-NLS-1$
buffer.append("int Y::i = g(); \n"); //$NON-NLS-1$
IASTTranslationUnit tu = parse(buffer.toString(), ParserLanguage.CPP);
CPPNameCollector col = new CPPNameCollector();
tu.getVisitor().visitTranslationUnit(col);
IFunction g1 = (IFunction) col.getName(0).resolveBinding();
ICPPMethod g2 = (ICPPMethod) col.getName(9).resolveBinding();
assertInstances( col, g1, 1 );
assertInstances( col, g2, 2 );
}
}

7
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVisitor.java
View file

@ -547,6 +547,13 @@ public class CPPVisitor implements ICPPASTVisitor {
return dtor.getFunctionScope();
else if( prop == IASTFunctionDefinition.DECLARATOR )
return ((IASTCompoundStatement)((IASTFunctionDefinition)dtor.getParent()).getBody()).getScope();
} else if( node instanceof IASTInitializerExpression ){
IASTDeclarator dtor = (IASTDeclarator) node.getParent();
IASTName name = dtor.getName();
if( name instanceof ICPPASTQualifiedName ){
IASTName [] ns = ((ICPPASTQualifiedName)name).getNames();
return getContainingScope( ns[ ns.length - 1 ] );
}
} else if( node instanceof IASTExpression ){
IASTNode parent = node.getParent();
if( parent instanceof IASTForStatement ){