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

Resolution of local structs, bug 255973.

Browse source
This commit is contained in:
Markus Schorn 2009-01-21 17:13:47 +00:00
parent 38fb615b8d
commit 9704f355f0
8 changed files with 107 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ASTComparer.java
View file

@ -1,3 +1,13 @@
/*******************************************************************************
* Copyright (c) 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Mike Kucera (IBM) - Initial API and implementation
*******************************************************************************/
package org.eclipse.cdt.core.parser.tests;
import java.beans.BeanInfo;
@ -34,7 +44,11 @@ public class ASTComparer extends Assert {
"getAllPreprocessorStatements",
"getMacroExpansions",
"getPreprocessorProblems",
"getComments"
"getComments",
// avoid name resolution
"isDeclaration",
"isDefinition",
"isReference"
));

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

@ -3011,25 +3011,27 @@ public class AST2Tests extends AST2BaseTest {
// struct s1 { struct s2 *s2p; /* ... */ }; // D1
// struct s2 { struct s1 *s1p; /* ... */ }; // D2
public void testBug84186() throws Exception {
final String code = getAboveComment();
IASTTranslationUnit tu = parse(code, ParserLanguage.C);
CNameCollector col = new CNameCollector();
tu.accept(col);
assertEquals(col.size(), 6);
for (ParserLanguage lang : ParserLanguage.values()) {
final String code = getAboveComment();
IASTTranslationUnit tu = parse(code, lang);
CNameCollector col = new CNameCollector();
tu.accept(col);
assertEquals(col.size(), 6);
ICompositeType s_ref = (ICompositeType) col.getName(1).resolveBinding();
ICompositeType s_decl = (ICompositeType) col.getName(3).resolveBinding();
assertSame(s_ref, s_decl);
ICompositeType s_ref = (ICompositeType) col.getName(1).resolveBinding();
ICompositeType s_decl = (ICompositeType) col.getName(3).resolveBinding();
assertSame(s_ref, s_decl);
tu = parse(code, ParserLanguage.C);
col = new CNameCollector();
tu.accept(col);
assertEquals(col.size(), 6);
tu = parse(code, lang);
col = new CNameCollector();
tu.accept(col);
assertEquals(col.size(), 6);
s_decl = (ICompositeType) col.getName(3).resolveBinding();
s_ref = (ICompositeType) col.getName(1).resolveBinding();
assertSame(s_ref, s_decl);
s_decl = (ICompositeType) col.getName(3).resolveBinding();
s_ref = (ICompositeType) col.getName(1).resolveBinding();
assertSame(s_ref, s_decl);
}
}
// typedef struct { int a; } S;
@ -5928,4 +5930,25 @@ public class AST2Tests extends AST2BaseTest {
ITypedef td= bh.assertNonProblem("TInt; //", 4);
IField f= bh.assertNonProblem("a;", 1);
}
// struct beta {
// int glob;
// };
// void foo() {
// struct beta* pg;
// struct beta;
// struct beta* pl;
//
// struct beta {
// char loc;
// };
// pg->glob= 0;
// pl->loc= 1;
// }
public void testLocalVsGlobalStruct_Bug255973() throws Exception {
final String code= getAboveComment();
for (ParserLanguage lang : ParserLanguage.values()) {
IASTTranslationUnit tu= parseAndCheckBindings(code, lang, true);
}
}
}

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/IASTInternalScope.java
View file

@ -23,7 +23,7 @@ public interface IASTInternalScope extends IScope {
/**
* Return the physical IASTNode that this scope was created for
*/
public IASTNode getPhysicalNode() throws DOMException;
public IASTNode getPhysicalNode();
/**
* This adds an IBinding to the scope. It is primarily used by the parser to add

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java
View file

@ -492,7 +492,7 @@ public class CScope implements ICScope, IASTInternalScope {
return;
collectNames(paramDecl.getDeclarator());
collectNames(paramDecl.getDeclSpecifier());
collectNames(paramDecl.getDeclSpecifier(), false);
}
private void collectNames(IASTDeclarator dtor) {
@ -519,19 +519,21 @@ public class CScope implements ICScope, IASTInternalScope {
for (IASTDeclarator dtor : declarators) {
collectNames(dtor);
}
collectNames(simpleDeclaration.getDeclSpecifier());
collectNames(simpleDeclaration.getDeclSpecifier(), declarators.length == 0);
} else if (declaration instanceof IASTFunctionDefinition) {
IASTFunctionDefinition functionDef = (IASTFunctionDefinition) declaration;
collectNames(functionDef.getDeclarator());
collectNames(functionDef.getDeclSpecifier());
collectNames(functionDef.getDeclSpecifier(), false);
}
}
private void collectNames(IASTDeclSpecifier declSpec) {
private void collectNames(IASTDeclSpecifier declSpec, boolean forceElabSpec) {
IASTName tempName = null;
if (declSpec instanceof ICASTElaboratedTypeSpecifier) {
tempName = ((ICASTElaboratedTypeSpecifier)declSpec).getName();
ASTInternal.addName(this, tempName);
if (forceElabSpec || physicalNode instanceof IASTTranslationUnit) {
tempName = ((ICASTElaboratedTypeSpecifier)declSpec).getName();
ASTInternal.addName(this, tempName);
}
} else if (declSpec instanceof ICASTCompositeTypeSpecifier) {
tempName = ((ICASTCompositeTypeSpecifier)declSpec).getName();
ASTInternal.addName(this, tempName);
@ -542,7 +544,7 @@ public class CScope implements ICScope, IASTInternalScope {
if (element instanceof IASTSimpleDeclaration) {
IASTDeclSpecifier d = ((IASTSimpleDeclaration)element).getDeclSpecifier();
if (d instanceof ICASTCompositeTypeSpecifier || d instanceof IASTEnumerationSpecifier) {
collectNames(d);
collectNames(d, false);
}
}
}

17
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java
View file

@ -35,6 +35,7 @@ import org.eclipse.cdt.core.dom.ast.c.ICCompositeTypeScope;
import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.parser.util.ArrayUtil;
import org.eclipse.cdt.internal.core.dom.Linkage;
import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding;
import org.eclipse.cdt.internal.core.index.IIndexType;
import org.eclipse.core.runtime.PlatformObject;
@ -234,20 +235,16 @@ public class CStructure extends PlatformObject implements ICompositeType, ICInte
return;
decl.setBinding(this);
if (declarations == null) {
if (declarations == null || declarations.length == 0) {
declarations = new IASTName[] { decl };
return;
}
for (int i = 0; i < declarations.length; i++) {
if (declarations[i] == null) {
declarations[i] = decl;
return;
}
IASTName first= declarations[0];
if (((ASTNode) first).getOffset() > ((ASTNode) decl).getOffset()) {
declarations[0]= decl;
decl= first;
}
IASTName tmp[] = new IASTName[declarations.length * 2];
System.arraycopy(declarations, 0, tmp, 0, declarations.length);
tmp[declarations.length] = decl;
declarations = tmp;
declarations= (IASTName[]) ArrayUtil.append(IASTName.class, declarations, decl);
}

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

@ -545,32 +545,50 @@ public class CVisitor extends ASTQueries {
IASTName name = elabTypeSpec.getName();
if (parent instanceof IASTDeclaration) {
IBinding binding= null;
if (parent instanceof IASTSimpleDeclaration && ((IASTSimpleDeclaration)parent).getDeclarators().length == 0) {
IScope insertIntoScope= null;
if (parent instanceof IASTSimpleDeclaration
&& ((IASTSimpleDeclaration)parent).getDeclarators().length == 0) {
IScope scope= getContainingScope(elabTypeSpec);
try {
while (scope instanceof ICCompositeTypeScope)
scope= scope.getParent();
binding= scope.getBinding(name, false);
} catch (DOMException e) {
}
if (binding != null) {
if (binding instanceof CEnumeration) {
((CEnumeration)binding).addDeclaration(name);
} else if (binding instanceof CStructure) {
((CStructure) binding).addDeclaration(name);
}
}
} else {
binding= resolveBinding(elabTypeSpec);
if (binding == null) {
insertIntoScope= elabTypeSpec.getTranslationUnit().getScope();
try {
binding= insertIntoScope.getBinding(name, false);
if (binding != null) {
if (binding instanceof CEnumeration) {
((CEnumeration)binding).addDeclaration(name);
} else if (binding instanceof CStructure) {
((CStructure) binding).addDeclaration(name);
}
}
} catch (DOMException e) {
}
}
}
if (binding != null) {
if (binding instanceof CEnumeration) {
((CEnumeration)binding).addDeclaration(name);
} else if (binding instanceof CStructure) {
((CStructure) binding).addDeclaration(name);
}
} else {
if (binding == null) {
if (elabTypeSpec.getKind() == IASTElaboratedTypeSpecifier.k_enum) {
binding = new CEnumeration(name);
} else {
binding = new CStructure(name);
}
try {
ASTInternal.addName(binding.getScope(), name);
} catch (DOMException e) {
}
if (insertIntoScope != null) {
ASTInternal.addName(insertIntoScope, name);
}
}
return binding;

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

@ -1190,7 +1190,7 @@ public class CPPSemantics {
continue;
}
}
if (item instanceof IASTLabelStatement)
while (item instanceof IASTLabelStatement)
item= ((IASTLabelStatement) item).getNestedStatement();
if (item instanceof IASTDeclarationStatement)
item = ((IASTDeclarationStatement)item).getDeclaration();
@ -1345,7 +1345,8 @@ public class CPPSemantics {
IASTName specName = null;
if (declSpec instanceof IASTElaboratedTypeSpecifier) {
specName = ((IASTElaboratedTypeSpecifier)declSpec).getName();
if (declarators.length == 0 || scope.getPhysicalNode() instanceof IASTTranslationUnit)
specName = ((IASTElaboratedTypeSpecifier)declSpec).getName();
} else if (declSpec instanceof ICPPASTCompositeTypeSpecifier) {
ICPPASTCompositeTypeSpecifier compSpec = (ICPPASTCompositeTypeSpecifier) declSpec;
specName = compSpec.getName();

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2007, 2008 Symbian Software Systems and others.
* Copyright (c) 2007, 2009 Symbian Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -110,9 +110,6 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
} catch(CoreException ce) {
CCorePlugin.log(ce);
throw new CompositingNotImplementedError(ce.getMessage());
} catch(DOMException ce) {
CCorePlugin.log(ce);
throw new CompositingNotImplementedError(ce.getMessage());
}
}