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

Bug 446225 - Captured variables not recognized as usages

Browse source
This commit is contained in:
Sergey Prigogin 2014-10-07 14:35:35 -07:00
parent 32b06b4c26
commit 9c35d9bc4a
2 changed files with 14 additions and 3 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/AST2CPPTests.java
View file

@ -8329,6 +8329,15 @@ public class AST2CPPTests extends AST2TestBase {
parseAndCheckBindings(); parseAndCheckBindings();
} }
// int foo = 0;
// auto bar = [foo] { return foo; };
public void testLambdaWithCapture_446225() throws Exception {
BindingAssertionHelper bh = getAssertionHelper();
ICPPVariable foo1= bh.assertNonProblemOnFirstIdentifier("foo =", ICPPVariable.class);
ICPPVariable foo2= bh.assertNonProblemOnFirstIdentifier("foo]", ICPPVariable.class);
assertTrue(foo1 == foo2);
}
// typedef int TInt; // typedef int TInt;
// void test() { // void test() {
// int a1= {}, a2{}; // Initializer for declarator // int a1= {}, a2{}; // Initializer for declarator

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
View file

@ -99,6 +99,7 @@ import org.eclipse.cdt.core.dom.ast.ITypedef;
import org.eclipse.cdt.core.dom.ast.IValue; import org.eclipse.cdt.core.dom.ast.IValue;
import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.IVariable;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTAliasDeclaration; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTAliasDeclaration;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCapture;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCatchHandler; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCatchHandler;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCompositeTypeSpecifier.ICPPASTBaseSpecifier;
@ -256,7 +257,7 @@ public class CPPVisitor extends ASTQueries {
new ThreadLocal<Set<IASTDeclSpecifier>>() { new ThreadLocal<Set<IASTDeclSpecifier>>() {
@Override @Override
protected Set<IASTDeclSpecifier> initialValue() { protected Set<IASTDeclSpecifier> initialValue() {
return new HashSet<IASTDeclSpecifier>(); return new HashSet<>();
} }
}; };
@ -266,6 +267,7 @@ public class CPPVisitor extends ASTQueries {
if (parent instanceof IASTNamedTypeSpecifier || if (parent instanceof IASTNamedTypeSpecifier ||
parent instanceof ICPPASTBaseSpecifier || parent instanceof ICPPASTBaseSpecifier ||
parent instanceof ICPPASTConstructorChainInitializer || parent instanceof ICPPASTConstructorChainInitializer ||
parent instanceof ICPPASTCapture ||
name.getPropertyInParent() == ICPPASTNamespaceAlias.MAPPING_NAME) { name.getPropertyInParent() == ICPPASTNamespaceAlias.MAPPING_NAME) {
if (name.getLookupKey().length == 0) if (name.getLookupKey().length == 0)
return null; return null;
@ -284,7 +286,7 @@ public class CPPVisitor extends ASTQueries {
binding = CPPSemantics.resolveBinding(name); binding = CPPSemantics.resolveBinding(name);
if (parent instanceof IASTCompositeTypeSpecifier) { if (parent instanceof IASTCompositeTypeSpecifier) {
if (binding instanceof IIndexBinding) { if (binding instanceof IIndexBinding) {
// Need to create an AST binding // Need to create an AST binding.
} else { } else {
ASTInternal.addDefinition(binding, parent); ASTInternal.addDefinition(binding, parent);
return binding; return binding;
@ -298,7 +300,7 @@ public class CPPVisitor extends ASTQueries {
if (CPPTemplates.isClassTemplate(id)) if (CPPTemplates.isClassTemplate(id))
return CPPSemantics.resolveBinding(name); return CPPSemantics.resolveBinding(name);
// function templates/instances/specializations must be resolved via the id // Function templates/instances/specializations must be resolved via the id.
id.resolveBinding(); id.resolveBinding();
return name.getBinding(); return name.getBinding();
} }