mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 01:05:38 +02:00
Code Issues Wiki Activity

Patch for Devin Steffler.

Browse source 
Further updates to DOM AST View.
This commit is contained in:
John Camelon 2005-01-31 16:48:06 +00:00
parent 6ac6636352
commit 508ff688b8
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -832,8 +832,9 @@ public class AST2Tests extends AST2BaseTest {
// test tu.getDeclarations(IBinding) // test tu.getDeclarations(IBinding)
IASTName[] decls = tu.getDeclarations(f_name1.resolveBinding()); IASTName[] decls = tu.getDeclarations(f_name1.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], f_name1); assertEquals(decls[0], f_name1);
assertEquals(decls[1], f_name2);
decls = tu.getDeclarations(name_param1.resolveBinding()); decls = tu.getDeclarations(name_param1.resolveBinding());
assertEquals(decls.length, 2); assertEquals(decls.length, 2);
@ -841,8 +842,9 @@ public class AST2Tests extends AST2BaseTest {
assertEquals(decls[1], name_param2); assertEquals(decls[1], name_param2);
decls = tu.getDeclarations(f_name2.resolveBinding()); decls = tu.getDeclarations(f_name2.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], f_name1); assertEquals(decls[0], f_name1);
assertEquals(decls[1], f_name2);
decls = tu.getDeclarations(name_param2.resolveBinding()); decls = tu.getDeclarations(name_param2.resolveBinding());
assertEquals(decls.length, 2); assertEquals(decls.length, 2);
@ -944,8 +946,9 @@ public class AST2Tests extends AST2BaseTest {
// test tu.getDeclarations(IBinding) // test tu.getDeclarations(IBinding)
IASTName[] decls = tu.getDeclarations(name_f.resolveBinding()); IASTName[] decls = tu.getDeclarations(name_f.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], name_f); assertEquals(decls[0], name_f);
assertEquals(decls[1], name_fdef);
decls = tu.getDeclarations(gdef.getDeclarator().getName() decls = tu.getDeclarations(gdef.getDeclarator().getName()
.resolveBinding()); .resolveBinding());
@ -953,12 +956,14 @@ public class AST2Tests extends AST2BaseTest {
assertEquals(decls[0], gdef.getDeclarator().getName()); assertEquals(decls[0], gdef.getDeclarator().getName());
decls = tu.getDeclarations(name_fcall.resolveBinding()); decls = tu.getDeclarations(name_fcall.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], name_f); assertEquals(decls[0], name_f);
assertEquals(decls[1], name_fdef);
decls = tu.getDeclarations(name_fdef.resolveBinding()); decls = tu.getDeclarations(name_fdef.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 2);
assertEquals(decls[0], name_f); assertEquals(decls[0], name_f);
assertEquals(decls[1], name_fdef);
} }
public void testForLoop() throws Exception { public void testForLoop() throws Exception {

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

@ -250,7 +250,6 @@ public class CVisitor {
private IASTName[] declsFound = null; private IASTName[] declsFound = null;
int numFound = 0; int numFound = 0;
IBinding binding = null; IBinding binding = null;
boolean functionDeclared = false;
boolean compositeTypeDeclared = false; boolean compositeTypeDeclared = false;
private void addName(IASTName name) { private void addName(IASTName name) {
@ -304,9 +303,8 @@ public class CVisitor {
parent = parent.getParent(); parent = parent.getParent();
if ( parent instanceof IASTDeclaration ) { if ( parent instanceof IASTDeclaration ) {
if ( !functionDeclared && parent != null && parent instanceof IASTFunctionDefinition ) { if ( parent != null && parent instanceof IASTFunctionDefinition ) {
if ( declarator.getName() != null && declarator.getName().resolveBinding() == binding ) { if ( declarator.getName() != null && declarator.getName().resolveBinding() == binding ) {
functionDeclared = true;
addName(declarator.getName()); addName(declarator.getName());
} }
} else if ( parent instanceof IASTSimpleDeclaration ) { } else if ( parent instanceof IASTSimpleDeclaration ) {
@ -315,11 +313,6 @@ public class CVisitor {
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
if ( (declarator.getName() != null && declarator.getName().resolveBinding() == binding) ) { if ( (declarator.getName() != null && declarator.getName().resolveBinding() == binding) ) {
if ( declarator instanceof IASTStandardFunctionDeclarator ||
declarator instanceof ICASTKnRFunctionDeclarator ) {
functionDeclared = true;
}
addName(declarator.getName()); addName(declarator.getName());
} }
} }