mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

Bug 259460.

Browse source
This commit is contained in:
Sergey Prigogin 2008-12-22 04:40:18 +00:00
parent 692c985d53
commit fdf3bd4146
3 changed files with 21 additions and 4 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/ast2/AST2CPPTests.java
View file

@ -6279,12 +6279,22 @@ public class AST2CPPTests extends AST2BaseTest {
} }
// struct A { // struct A {
// void method() { // B method(B p, int& a = y) { // B is not defined
// B b; // B b;
// int x = y + 1;
// return b;
// } // }
// struct B {}; // struct B {};
// int& x = y; // y is not defined
// int y;
// }; // };
public void _testScopeOfClassMember_259460() throws Exception { public void testScopeOfClassMember_259460() throws Exception {
parseAndCheckBindings(getAboveComment(), ParserLanguage.CPP); BindingAssertionHelper ba= new BindingAssertionHelper(getAboveComment(), true);
ba.assertNonProblem("B b", 1, ICPPClassType.class);
ba.assertProblem("B p", 1);
ba.assertProblem("B method", 1);
ba.assertNonProblem("y + 1;", 1, ICPPField.class);
ba.assertNonProblem("y) {", 1, ICPPField.class);
ba.assertProblem("y; // y is not defined", 1);
} }
} }

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

@ -1739,7 +1739,7 @@ public class CPPSemantics {
if (temp instanceof IProblemBinding) if (temp instanceof IProblemBinding)
continue; continue;
if (!(temp instanceof ICPPMember) && !declaredBefore) if (!(temp instanceof ICPPMember) && !(temp instanceof IType) && !declaredBefore)
continue; continue;
if (temp instanceof ICPPUsingDeclaration) { if (temp instanceof ICPPUsingDeclaration) {
IBinding[] bindings = ((ICPPUsingDeclaration) temp).getDelegates(); IBinding[] bindings = ((ICPPUsingDeclaration) temp).getDelegates();

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

@ -10,6 +10,7 @@
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* Bryan Wilkinson (QNX) * Bryan Wilkinson (QNX)
* Andrew Ferguson (Symbian) * Andrew Ferguson (Symbian)
* Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics; package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
@ -31,6 +32,7 @@ import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNamedTypeSpecifier; import org.eclipse.cdt.core.dom.ast.IASTNamedTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTTypeId; import org.eclipse.cdt.core.dom.ast.IASTTypeId;
import org.eclipse.cdt.core.dom.ast.IPointerType; import org.eclipse.cdt.core.dom.ast.IPointerType;
@ -292,6 +294,11 @@ class LookupData {
IASTNode parent = astName.getParent(); IASTNode parent = astName.getParent();
while (parent != null && !(parent instanceof IASTFunctionDefinition)) { while (parent != null && !(parent instanceof IASTFunctionDefinition)) {
ASTNodeProperty prop = parent.getPropertyInParent();
if (prop == IASTParameterDeclaration.DECL_SPECIFIER ||
prop == IASTFunctionDefinition.DECL_SPECIFIER) {
return false;
}
parent = parent.getParent(); parent = parent.getParent();
} }
if (parent instanceof IASTFunctionDefinition) { if (parent instanceof IASTFunctionDefinition) {