mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Bug 286741.

Browse source
This commit is contained in:
Sergey Prigogin 2009-08-17 04:11:35 +00:00
parent 44d46d0b79
commit 7bbba2e9ec
2 changed files with 26 additions and 3 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/AST2TemplateTests.java
View file

@ -4114,4 +4114,18 @@ public class AST2TemplateTests extends AST2BaseTest {
final String code= getAboveComment();
parseAndCheckBindings(code, ParserLanguage.CPP);
}
// template <typename T>
// struct A {
// typedef A<T> Self;
// friend Self f(Self p) { return Self(); }
// };
//
// void test(A<int> x) {
// f(x);
// }
public void testInlineFriendFunction_286741() throws Exception {
final String code = getAboveComment();
parseAndCheckBindings(code, ParserLanguage.CPP);
}
}

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

@ -806,10 +806,19 @@ public class CPPVisitor extends ASTQueries {
while (parent.getParent() instanceof IASTDeclarator)
parent = parent.getParent();
ASTNodeProperty prop = parent.getPropertyInParent();
if (prop == IASTSimpleDeclaration.DECLARATOR)
if (prop == IASTSimpleDeclaration.DECLARATOR) {
return dtor.getFunctionScope();
else if (prop == IASTFunctionDefinition.DECLARATOR)
return ((IASTCompoundStatement) ((IASTFunctionDefinition) parent.getParent()).getBody()).getScope();
} else if (prop == IASTFunctionDefinition.DECLARATOR) {
IASTFunctionDefinition funcDef = (IASTFunctionDefinition) parent.getParent();
ICPPASTDeclSpecifier declSpec = (ICPPASTDeclSpecifier) funcDef.getDeclSpecifier();
if (declSpec.isFriend()) {
parent = funcDef.getParent();
if (parent instanceof IASTCompositeTypeSpecifier) {
return ((IASTCompositeTypeSpecifier) parent).getScope();
}
}
return ((IASTCompoundStatement) funcDef.getBody()).getScope();
}
}
} else if (parent instanceof ICPPASTTemplateDeclaration) {
return CPPTemplates.getContainingScope(node);