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

fix bug 84186

Browse source
This commit is contained in:
Andrew Niefer 2005-02-03 23:15:55 +00:00
parent 993bdc690d
commit ec8969b5e6
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
View file

@ -651,20 +651,23 @@ public class AST2Tests extends AST2BaseTest {
// test tu.getDeclarations(IBinding) // test tu.getDeclarations(IBinding)
IASTName[] decls = tu.getDeclarations(name_A1.resolveBinding()); IASTName[] decls = tu.getDeclarations(name_A1.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], name_A1); assertEquals(decls[0], name_A1);
assertEquals(decls[1], name_Adef);
decls = tu.getDeclarations(name_A2.resolveBinding()); decls = tu.getDeclarations(name_A2.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], name_A1); assertEquals(decls[0], name_A1);
assertEquals(decls[1], name_Adef);
decls = tu.getDeclarations(name_a.resolveBinding()); decls = tu.getDeclarations(name_a.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_a); assertEquals(decls[0], name_a);
decls = tu.getDeclarations(name_Adef.resolveBinding()); decls = tu.getDeclarations(name_Adef.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], name_A1); assertEquals(decls[0], name_A1);
assertEquals(decls[1], name_Adef);
decls = tu.getDeclarations(name_i.resolveBinding()); decls = tu.getDeclarations(name_i.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);

25
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
View file

@ -55,7 +55,6 @@ import org.eclipse.cdt.core.dom.ast.IASTPointerOperator;
import org.eclipse.cdt.core.dom.ast.IASTProblem; import org.eclipse.cdt.core.dom.ast.IASTProblem;
import org.eclipse.cdt.core.dom.ast.IASTProblemHolder; import org.eclipse.cdt.core.dom.ast.IASTProblemHolder;
import org.eclipse.cdt.core.dom.ast.IASTReturnStatement; import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTStandardFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.IASTStandardFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTStatement;
@ -340,28 +339,34 @@ public class CVisitor {
* @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDeclSpecifier(org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier) * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDeclSpecifier(org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier)
*/ */
public int processDeclSpecifier(IASTDeclSpecifier declSpec) { public int processDeclSpecifier(IASTDeclSpecifier declSpec) {
if ( declSpec instanceof IASTSimpleDeclSpecifier || declSpec instanceof ICASTTypedefNameSpecifier ) if ( compositeTypeDeclared && declSpec instanceof ICASTTypedefNameSpecifier )
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
//if the binding isn't declared in a decl spec, skip it //if the binding isn't declared in a decl spec, skip it
if( !(binding instanceof ICompositeType) && !(binding instanceof IEnumeration) ) if( !(binding instanceof ICompositeType) && !(binding instanceof IEnumeration) )
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
if ( !compositeTypeDeclared && declSpec != null && declSpec instanceof IASTCompositeTypeSpecifier ) { if ( binding instanceof ICompositeType && declSpec instanceof IASTCompositeTypeSpecifier ) {
if (((IASTCompositeTypeSpecifier)declSpec).getName().resolveBinding() == binding) { if( ((IASTCompositeTypeSpecifier)declSpec).getName().resolveBinding() == binding) {
compositeTypeDeclared = true; compositeTypeDeclared = true;
addName(((IASTCompositeTypeSpecifier)declSpec).getName()); addName(((IASTCompositeTypeSpecifier)declSpec).getName());
} }
} else if (!compositeTypeDeclared && declSpec instanceof IASTElaboratedTypeSpecifier ) { } else if ( binding instanceof IEnumeration && declSpec instanceof IASTEnumerationSpecifier ) {
if( ((IASTEnumerationSpecifier)declSpec).getName().resolveBinding() == binding ) {
compositeTypeDeclared = true;
addName(((IASTEnumerationSpecifier)declSpec).getName());
}
} else if( declSpec instanceof IASTElaboratedTypeSpecifier ) {
if( compositeTypeDeclared ){
IASTNode parent = declSpec.getParent();
if( !(parent instanceof IASTSimpleDeclaration) || ((IASTSimpleDeclaration)parent).getDeclarators().length > 0 ){
return PROCESS_CONTINUE;
}
}
if (((IASTElaboratedTypeSpecifier)declSpec).getName().resolveBinding() == binding) { if (((IASTElaboratedTypeSpecifier)declSpec).getName().resolveBinding() == binding) {
compositeTypeDeclared = true; compositeTypeDeclared = true;
addName(((IASTElaboratedTypeSpecifier)declSpec).getName()); addName(((IASTElaboratedTypeSpecifier)declSpec).getName());
} }
} else if (!compositeTypeDeclared && declSpec instanceof IASTEnumerationSpecifier ) {
if (((IASTEnumerationSpecifier)declSpec).getName().resolveBinding() == binding) {
compositeTypeDeclared = true;
addName(((IASTEnumerationSpecifier)declSpec).getName());
}
} }
return PROCESS_CONTINUE; return PROCESS_CONTINUE;