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

Bug 425033 - Restrict name lookup to types when

Browse source 
elaborated-type-specifier is present

Change-Id: Ib4e681056edfab92d19072ccc74a54ffd7cec418
Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
Reviewed-on: https://git.eclipse.org/r/22835
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
IP-Clean: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
This commit is contained in:
Nathan Ridge 2014-03-04 03:38:34 -05:00 • committed by Sergey Prigogin
parent 68b2dd67dc
commit 9f9ed938d2
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10553,4 +10553,18 @@ public class AST2CPPTests extends AST2TestBase {
assertEquals(',', argumentTokens[1].getTokenCharImage()[0]);
assertEquals('2', argumentTokens[2].getTokenCharImage()[0]);
}
// struct MyStruct {
// struct Inner {
// int waldo;
// } Inner;
// };
//
// void foo() {
// struct MyStruct::Inner in;
// in.waldo;
// }
public void testFieldAndNestedTypeWithSameName_425033() throws Exception {
parseAndCheckBindings();
}
}

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/LookupData.java
View file

@ -149,11 +149,7 @@ public class LookupData extends ScopeLookupData {
IASTNode parent = tn.getParent();
IASTNode nameParent= parent;
if (parent instanceof ICPPASTBaseSpecifier
|| parent instanceof ICPPASTElaboratedTypeSpecifier
|| parent instanceof ICPPASTCompositeTypeSpecifier) {
typesOnly= true;
} else if (parent instanceof ICPPASTQualifiedName) {
if (parent instanceof ICPPASTQualifiedName) {
final ICPPASTQualifiedName qn = (ICPPASTQualifiedName) parent;
if (qn.getLastName() != tn) {
// For resolving template id ambiguities we need to consider non-types.
@ -173,7 +169,11 @@ public class LookupData extends ScopeLookupData {
}
}
if (nameParent instanceof ICPPASTUsingDeclaration) {
if (nameParent instanceof ICPPASTBaseSpecifier
|| nameParent instanceof ICPPASTElaboratedTypeSpecifier
|| nameParent instanceof ICPPASTCompositeTypeSpecifier) {
typesOnly= true;
} else if (nameParent instanceof ICPPASTUsingDeclaration) {
forUsingDeclaration= true;
} else if (nameParent instanceof IASTDeclarator) {
fDeclarator= (IASTDeclarator) nameParent;