diff options
Diffstat (limited to 'core/org.eclipse.cdt.core')
2 files changed, 14 insertions, 23 deletions
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java index c7320e211da..33d8156f281 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java @@ -1470,9 +1470,8 @@ public class CPPSemantics { IASTDeclarator[] declarators = simpleDeclaration.getDeclarators(); IScope dtorScope= scope; if (declSpec.isFriend()) { - // Friends are added to an enclosing scope. They have to be added such that they are - // picked up when this scope is re-populated during ambiguity resolution, while the - // enclosing scope is left as it is. + // Friends are added to an enclosing scope. Here we have to do that, because when this scope is re-populated + // during ambiguity resolution, the enclosing scope is otherwise left as it is (without the friend). try { while (dtorScope != null && dtorScope.getKind() == EScopeKind.eClassType) dtorScope= dtorScope.getParent(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index e65ac2a2501..b1729a40d35 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -580,10 +580,15 @@ public class CPPVisitor extends ASTQueries { boolean isFriendDecl= false; ICPPScope scope = (ICPPScope) getContainingNonTemplateScope(name); try { - if (parent instanceof IASTSimpleDeclaration && scope instanceof ICPPClassScope) { - ICPPASTDeclSpecifier declSpec = (ICPPASTDeclSpecifier) ((IASTSimpleDeclaration) parent).getDeclSpecifier(); - if (declSpec.isFriend()) { - isFriendDecl= true; + if (scope instanceof ICPPClassScope) { + if (parent instanceof IASTSimpleDeclaration) { + ICPPASTDeclSpecifier declSpec = (ICPPASTDeclSpecifier) ((IASTSimpleDeclaration) parent).getDeclSpecifier(); + isFriendDecl= declSpec.isFriend(); + } else if (parent instanceof IASTFunctionDefinition) { + ICPPASTDeclSpecifier declSpec = (ICPPASTDeclSpecifier) ((IASTFunctionDefinition) parent).getDeclSpecifier(); + isFriendDecl= declSpec.isFriend(); + } + if (isFriendDecl) { try { while (scope.getKind() == EScopeKind.eClassType) { scope = (ICPPScope) getParentScope(scope, name.getTranslationUnit()); @@ -773,10 +778,6 @@ public class CPPVisitor extends ASTQueries { } else if (parent instanceof IASTForStatement) { return ((IASTForStatement) parent).getScope(); } else if (parent instanceof IASTCompositeTypeSpecifier) { - if (node instanceof IASTFunctionDefinition && - ((ICPPASTDeclSpecifier) ((IASTFunctionDefinition) node).getDeclSpecifier()).isFriend()) { - return getContainingScope(parent); - } return ((IASTCompositeTypeSpecifier) parent).getScope(); } else if (parent instanceof ICPPASTNamespaceDefinition) { return ((ICPPASTNamespaceDefinition) parent).getScope(); @@ -810,19 +811,10 @@ 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) { - 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 (prop == IASTFunctionDefinition.DECLARATOR) + return ((IASTCompoundStatement) ((IASTFunctionDefinition) parent.getParent()).getBody()).getScope(); } } else if (parent instanceof ICPPASTTemplateDeclaration) { return CPPTemplates.getContainingScope(node); |