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

Code streamlining.

Browse source
This commit is contained in:
Sergey Prigogin 2014-08-28 10:45:30 -07:00
parent 35044af3ee
commit 11f921e614
7 changed files with 135 additions and 154 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/internal/index/tests/IndexCPPBindingResolutionTest.java
View file

@ -446,11 +446,11 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti
IBinding b1 = getBindingFromASTName("c; ", 1);
assertVariable(b1, "c", ICPPClassType.class, "C");
ICPPClassType b1type = (ICPPClassType)((ICPPVariable)b1).getType();
ICPPClassType b1type = (ICPPClassType) ((ICPPVariable) b1).getType();
assertClassTypeBinding(b1type, "C", ICPPClassType.k_class, 0, 0, 0, 4, 0, 0, 0, 2, 0);
assertTrue(b1type.getScope() == null);
assertTrue(b1type.getCompositeScope() instanceof ICPPClassScope);
assertClassTypeBinding(((ICPPClassScope)b1type.getCompositeScope()).getClassType(), "C", ICPPClassType.k_class, 0, 0, 0, 4, 0, 0, 0, 2, 0);
assertClassTypeBinding(((ICPPClassScope) b1type.getCompositeScope()).getClassType(), "C", ICPPClassType.k_class, 0, 0, 0, 4, 0, 0, 0, 2, 0);
}
{
IBinding b2 = getBindingFromASTName("S s;", 1);
@ -458,7 +458,7 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti
IBinding b3 = getBindingFromASTName("s;", 1);
assertVariable(b3, "s", ICPPClassType.class, "S");
ICPPClassType b3type = (ICPPClassType)((ICPPVariable)b3).getType();
ICPPClassType b3type = (ICPPClassType) ((ICPPVariable) b3).getType();
assertClassTypeBinding(b3type, "S", ICompositeType.k_struct, 0, 0, 0, 4, 0, 0, 0, 2, 0);
}
{
@ -467,7 +467,7 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti
IBinding b5 = getBindingFromASTName("u; ", 1);
assertVariable(b5, "u", ICPPClassType.class, "U");
ICPPClassType b5type = (ICPPClassType)((ICPPVariable)b5).getType();
ICPPClassType b5type = (ICPPClassType) ((ICPPVariable) b5).getType();
assertClassTypeBinding(b5type, "U", ICompositeType.k_union, 0, 0, 0, 4, 0, 0, 0, 2, 0);
}
{
@ -476,7 +476,7 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti
IBinding b7 = getBindingFromASTName("e; ", 1);
assertVariable(b7, "e", IEnumeration.class, "E");
IEnumeration b5type = (IEnumeration)((ICPPVariable)b7).getType();
IEnumeration b5type = (IEnumeration) ((ICPPVariable) b7).getType();
assertEnumeration(b5type, "E", new String[] {"ER1","ER2","ER3"});
assertTrue(b5type.getScope() == null);
}
@ -487,13 +487,13 @@ public abstract class IndexCPPBindingResolutionTest extends IndexBindingResoluti
{
IBinding b9 = getBindingFromASTName("var2 = c;", 4);
assertVariable(b9, "var2", ICPPClassType.class, "C");
ICPPClassType b9type = (ICPPClassType)((ICPPVariable)b9).getType();
ICPPClassType b9type = (ICPPClassType) ((ICPPVariable) b9).getType();
assertClassTypeBinding(b9type, "C", ICPPClassType.k_class, 0, 0, 0, 4, 0, 0, 0, 2, 0);
}
{
IBinding b10 = getBindingFromASTName("var3 = &s;", 4);
assertVariable(b10, "var3", IPointerType.class, null);
IPointerType b10type = (IPointerType) ((ICPPVariable)b10).getType();
IPointerType b10type = (IPointerType) ((ICPPVariable) b10).getType();
assertClassTypeBinding((ICPPClassType) b10type.getType(), "S", ICompositeType.k_struct, 0, 0, 0, 4, 0, 0, 0, 2, 0);
}
{

180
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java
View file

@ -60,7 +60,7 @@ import org.eclipse.core.runtime.Path;
/**
* This is a utility class to help convert AST elements to Strings corresponding to
* the AST element's type.
*
*
* @noextend This class is not intended to be subclassed by clients.
* @noinstantiate This class is not intended to be instantiated by clients.
*/
@ -71,16 +71,16 @@ public class ASTTypeUtil {
private static final int DEAULT_ITYPE_SIZE = 2;
/**
* Returns a string representation for the parameters of the given function type.
* Returns a string representation for the parameters of the given function type.
* The representation contains the comma-separated list of the normalized parameter
* type representations wrapped in parentheses.
* type representations wrapped in parentheses.
*/
public static String getParameterTypeString(IFunctionType type) {
StringBuilder result = new StringBuilder();
appendParameterTypeString(type, result);
return result.toString();
}
private static void appendParameterTypeString(IFunctionType ft, StringBuilder result) {
IType[] types = ft.getParameterTypes();
result.append(Keywords.cpLPAREN);
@ -102,9 +102,8 @@ public class ASTTypeUtil {
}
/**
* @return Whether the function matching the given function binding takes
* parameters or not.
*
* Returns whether the function matching the given function binding takes parameters or not.
*
* @since 5.1
*/
public static boolean functionTakesParameters(IFunction function) {
@ -112,17 +111,16 @@ public class ASTTypeUtil {
if (parameters.length == 0) {
return false;
}
}
if (parameters.length == 1 && SemanticUtil.isVoidType(parameters[0].getType())) {
return false;
}
return true;
}
/**
* Returns a string representation for the type array. The representation is
* a comma-separated list of the normalized string representations of the
* provided types.
* Returns a string representation for the type array. The representation is a comma-separated
* list of the normalized string representations of the provided types.
* @see #getTypeListString(IType[], boolean)
*/
public static String getTypeListString(IType[] types) {
@ -133,7 +131,8 @@ public class ASTTypeUtil {
* Returns a String representation of the type array as a
* comma-separated list.
* @param types
* @return representation of the type array as a comma-separated list
* @param normalize indicates whether normalization shall be performed
* @return representation of the type array as a comma-separated list
* @since 5.1
*/
public static String getTypeListString(IType[] types, boolean normalize) {
@ -147,10 +146,10 @@ public class ASTTypeUtil {
}
return result.toString();
}
/**
* Returns a comma-separated list of the string representations of the arguments, enclosed
* in angle brackets.
* in angle brackets.
* Optionally normalization is performed:
* <br> template parameter names are represented by their parameter position,
* <br> further normalization may be performed in future versions.
@ -164,20 +163,18 @@ public class ASTTypeUtil {
}
private static void appendArgumentList(ICPPTemplateArgument[] args, boolean normalize, StringBuilder result) {
boolean first= true;
result.append('<');
for (ICPPTemplateArgument arg : args) {
if (!first) {
for (int i = 0; i < args.length; i++) {
if (i != 0) {
result.append(',');
}
first= false;
appendArgument(arg, normalize, result);
appendArgument(args[i], normalize, result);
}
result.append('>');
}
/**
* Returns a string representation for an template argument. Optionally
* Returns a string representation for an template argument. Optionally
* normalization is performed:
* <br> template parameter names are represented by their parameter position,
* <br> further normalization may be performed in future versions.
@ -189,7 +186,7 @@ public class ASTTypeUtil {
appendArgument(arg, normalize, buf);
return buf.toString();
}
private static void appendArgument(ICPPTemplateArgument arg, boolean normalize, StringBuilder buf) {
IValue val= arg.getNonTypeValue();
if (val != null) {
@ -209,19 +206,19 @@ public class ASTTypeUtil {
public static String[] getParameterTypeStringArray(IFunctionType type) {
IType[] parms = type.getParameterTypes();
String[] result = new String[parms.length];
for (int i = 0; i < parms.length; i++) {
if (parms[i] != null) {
result[i] = getType(parms[i]);
}
}
return result;
}
private static void appendTypeString(IType type, boolean normalize, StringBuilder result) {
boolean needSpace = false;
if (type instanceof IArrayType) {
result.append(Keywords.cpLBRACKET);
if (type instanceof ICArrayType) {
@ -247,7 +244,7 @@ public class ASTTypeUtil {
}
result.append(Keywords.VOLATILE);
}
}
}
IValue val= ((IArrayType) type).getSize();
if (val != null && val != Value.UNKNOWN) {
if (normalize) {
@ -295,7 +292,7 @@ public class ASTTypeUtil {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.LONG_LONG); needSpace = true;
}
}
if (basicType.isComplex()) {
if (needSpace) {
@ -309,7 +306,7 @@ public class ASTTypeUtil {
}
result.append(Keywords.c_IMAGINARY); needSpace = true;
}
switch (kind) {
case eChar:
if (needSpace) result.append(SPACE);
@ -420,7 +417,7 @@ public class ASTTypeUtil {
result.append(Keywords.RESTRICT); needSpace = true;
}
}
IQualifierType qt= (IQualifierType) type;
needSpace= appendCVQ(result, needSpace, qt.isConst(), qt.isVolatile(), false);
} else if (type instanceof TypeOfDependentExpression) {
@ -428,7 +425,7 @@ public class ASTTypeUtil {
} else if (type instanceof ISemanticProblem) {
result.append('?');
} else if (type != null) {
result.append('@').append(type.hashCode());
result.append('@').append(type.hashCode());
}
}
@ -447,23 +444,23 @@ public class ASTTypeUtil {
final boolean isVolatile, final boolean isRestrict) {
if (isConst) {
if (needSpace) {
target.append(SPACE);
target.append(SPACE);
}
target.append(Keywords.CONST);
target.append(Keywords.CONST);
needSpace = true;
}
if (isVolatile) {
if (needSpace) {
target.append(SPACE);
target.append(SPACE);
}
target.append(Keywords.VOLATILE);
target.append(Keywords.VOLATILE);
needSpace = true;
}
if (isRestrict) {
if (needSpace) {
target.append(SPACE);
target.append(SPACE);
}
target.append(Keywords.RESTRICT);
target.append(Keywords.RESTRICT);
needSpace = true;
}
return needSpace;
@ -472,21 +469,21 @@ public class ASTTypeUtil {
private static void appendRefQualifier(StringBuilder target, boolean needSpace,
boolean isRValueReference) {
if (needSpace) {
target.append(SPACE);
target.append(SPACE);
}
target.append(isRValueReference ? Keywords.cpAND : Keywords.cpAMPER);
}
/**
* Returns the normalized string representation of the type.
* Returns the normalized string representation of the type.
* @see #getType(IType, boolean)
*/
public static String getType(IType type) {
return getType(type, true);
}
/**
* Returns a string representation of a type.
* Returns a string representation of a type.
* Optionally the representation is normalized:
* <br> typedefs are resolved
* <br> template parameter names are represented by their parameter position
@ -500,67 +497,68 @@ public class ASTTypeUtil {
appendType(type, normalize, result);
return result.toString();
}
/**
* Appends the the result of {@link #getType(IType, boolean)} to the given buffer.
* @since 5.3
*/
public static void appendType(IType type, boolean normalize, StringBuilder result) {
IType[] types = new IType[DEAULT_ITYPE_SIZE];
// Push all of the types onto the stack
int numTypes = 0;
// Push all of the types onto the stack.
int i = 0;
IQualifierType cvq= null;
ICPPReferenceType ref= null;
while (type != null && ++i < 100) {
if (type instanceof ITypedef) {
if (normalize) {
// Skip the typedef and proceed with its target type.
} else {
// If normalization was not requested, skip the typedef and proceed with its target
// type.
if (!normalize) {
// Output reference, qualifier and typedef, then stop.
if (ref != null) {
types = ArrayUtil.append(IType.class, types, ref);
types = ArrayUtil.appendAt(types, numTypes++, ref);
ref= null;
}
if (cvq != null) {
types = ArrayUtil.append(IType.class, types, cvq);
types = ArrayUtil.appendAt(types, numTypes++, cvq);
cvq= null;
}
types = ArrayUtil.append(IType.class, types, type);
type= null;
types = ArrayUtil.appendAt(types, numTypes++, type);
type= null;
}
} else {
if (type instanceof ICPPReferenceType) {
// Reference types ignore cv-qualifiers
// Reference types ignore cv-qualifiers.
cvq= null;
// Lvalue references win over rvalue references
// Lvalue references win over rvalue references.
if (ref == null || ref.isRValueReference()) {
// Delay reference to see if there are more
// Delay reference to see if there are more.
ref= (ICPPReferenceType) type;
}
} else {
if (cvq != null) {
// Merge cv qualifiers
// Merge cv qualifiers.
if (type instanceof IQualifierType || type instanceof IPointerType) {
type= SemanticUtil.addQualifiers(type, cvq.isConst(), cvq.isVolatile(), false);
cvq= null;
}
}
}
}
if (type instanceof IQualifierType) {
// Delay cv qualifier to merge it with others
cvq= (IQualifierType) type;
} else {
// No reference, no cv qualifier: output reference and cv-qualifier
// No reference, no cv qualifier: output reference and cv-qualifier.
if (ref != null) {
types = ArrayUtil.append(IType.class, types, ref);
types = ArrayUtil.appendAt(types, numTypes++, ref);
ref= null;
}
if (cvq != null) {
types = ArrayUtil.append(IType.class, types, cvq);
types = ArrayUtil.appendAt(types, numTypes++, cvq);
cvq= null;
}
types = ArrayUtil.append(IType.class, types, type);
}
types = ArrayUtil.appendAt(types, numTypes++, type);
}
}
}
if (type instanceof ITypeContainer) {
@ -570,30 +568,30 @@ public class ASTTypeUtil {
} else {
type= null;
}
}
// Pop all of the types off of the stack, and build the string representation while doing so.
}
// Pop all of the types from the stack, and build the string representation while doing so.
List<IType> postfix= null;
BitSet parenthesis= null;
boolean needParenthesis= false;
boolean needSpace= false;
for (int j = types.length; --j >= 0;) {
for (int j = numTypes; --j >= 0;) {
IType tj = types[j];
if (tj != null) {
if (j > 0 && types[j - 1] instanceof IQualifierType) {
if (needSpace)
result.append(SPACE);
result.append(SPACE);
appendTypeString(types[j - 1], normalize, result);
result.append(SPACE);
appendTypeString(tj, normalize, result);
needSpace= true;
--j;
} else {
// Handle post-fix
// Handle post-fix.
if (tj instanceof IFunctionType || tj instanceof IArrayType) {
if (j == 0) {
if (needSpace)
result.append(SPACE);
result.append(SPACE);
appendTypeString(tj, normalize, result);
needSpace= true;
} else {
@ -635,18 +633,18 @@ public class ASTTypeUtil {
/**
* For testing purposes, only.
* Returns the normalized string representation of the type defined by the given declarator.
*
*
* @noreference This method is not intended to be referenced by clients.
*/
public static String getType(IASTDeclarator declarator) {
// get the most nested declarator
// Get the most nested declarator.
while (declarator.getNestedDeclarator() != null) {
declarator = declarator.getNestedDeclarator();
}
IBinding binding = declarator.getName().resolveBinding();
IType type = null;
if (binding instanceof IEnumerator) {
type = ((IEnumerator)binding).getType();
} else if (binding instanceof IFunction) {
@ -656,18 +654,18 @@ public class ASTTypeUtil {
} else if (binding instanceof IVariable) {
type = ((IVariable)binding).getType();
}
if (type != null) {
return getType(type);
}
return EMPTY_STRING;
}
/**
* For testing purposes, only.
* Return's the String representation of a node's type (if available).
*
* Return's the String representation of a node's type (if available).
*
* @noreference This method is not intended to be referenced by clients.
*/
public static String getNodeType(IASTNode node) {
@ -681,13 +679,13 @@ public class ASTTypeUtil {
return getType((IType)((IASTName) node).resolveBinding());
if (node instanceof IASTTypeId)
return getType((IASTTypeId) node);
return EMPTY_STRING;
}
/**
* Returns the type representation of the IASTTypeId as a String.
*
*
* @param typeId
* @return the type representation of the IASTTypeId as a String
*/
@ -696,20 +694,20 @@ public class ASTTypeUtil {
return createCType(typeId.getAbstractDeclarator());
else if (typeId instanceof CPPASTTypeId)
return createCPPType(typeId.getAbstractDeclarator());
return EMPTY_STRING;
}
private static String createCType(IASTDeclarator declarator) {
IType type = CVisitor.createType(declarator);
return getType(type);
}
private static String createCPPType(IASTDeclarator declarator) {
IType type = CPPVisitor.createType(declarator);
return getType(type);
}
/**
* @deprecated don't use it does something strange
*/
@ -744,7 +742,7 @@ public class ASTTypeUtil {
appendCppName(binding, false, true, buf);
return buf.toString();
}
private static void appendCppName(IBinding binding, boolean normalize, boolean qualify, StringBuilder result) {
ICPPTemplateParameter tpar= getTemplateParameter(binding);
if (tpar != null) {
@ -784,18 +782,18 @@ public class ASTTypeUtil {
}
appendNameCheckAnonymous(binding, result);
}
if (binding instanceof ICPPTemplateInstance) {
appendArgumentList(((ICPPTemplateInstance) binding).getTemplateArguments(), normalize, result);
} else if (binding instanceof ICPPUnknownMemberClassInstance) {
appendArgumentList(((ICPPUnknownMemberClassInstance) binding).getArguments(), normalize, result);
}
}
private static ICPPTemplateParameter getTemplateParameter(IBinding binding) {
if (binding instanceof ICPPTemplateParameter)
if (binding instanceof ICPPTemplateParameter)
return (ICPPTemplateParameter) binding;
if (binding instanceof ICPPDeferredClassInstance)
return getTemplateParameter(((ICPPDeferredClassInstance) binding).getTemplateDefinition());
@ -816,10 +814,10 @@ public class ASTTypeUtil {
appendNameForAnonymous(binding, result);
if (result.length() == 0)
return null;
return extractChars(result);
}
private static char[] extractChars(StringBuilder buf) {
final int length = buf.length();
char[] result= new char[length];

80
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ProblemBinding.java
View file

@ -143,79 +143,51 @@ public class ProblemBinding extends PlatformObject implements IProblemBinding, I
return msg;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
*/
@Override
public String getName() {
return node instanceof IASTName ? new String(((IASTName) node).getSimpleID()) : CPPSemantics.EMPTY_NAME;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
*/
@Override
public char[] getNameCharArray() {
return node instanceof IASTName ? ((IASTName) node).getSimpleID() : CharArrayUtils.EMPTY;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
*/
@Override
public IScope getScope() throws DOMException {
throw new DOMException(this);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IBinding#getPhysicalNode()
*/
@Override
public IASTNode getPhysicalNode() {
return getASTNode();
}
@Override
public Object clone() {
// Don't clone problems
// Don't clone problems.
return this;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#getParent()
*/
@Override
public IScope getParent() throws DOMException {
throw new DOMException(this);
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#find(java.lang.String)
*/
@Override
public IBinding[] find(String name) {
return IBinding.EMPTY_BINDING_ARRAY;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#getScopeName()
*/
@Override
public IName getScopeName() {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#addName(org.eclipse.cdt.core.dom.ast.IASTName)
*/
@Override
public void addName(IASTName name) {
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#getBinding(org.eclipse.cdt.core.dom.ast.IASTName, boolean)
*/
@Override
public IBinding getBinding(IASTName name, boolean resolve) {
return null;
@ -226,37 +198,22 @@ public class ProblemBinding extends PlatformObject implements IProblemBinding, I
return IBinding.EMPTY_BINDING_ARRAY;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#getBinding(org.eclipse.cdt.core.dom.ast.IASTName, boolean)
*/
@Override
public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#getBinding(org.eclipse.cdt.core.dom.ast.IASTName, boolean)
*/
/**
* @deprecated Use {@link #getBindings(ScopeLookupData)} instead
*/
@Deprecated
@Override
public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
return getBindings(new ScopeLookupData(name, resolve, prefixLookup));
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IScope#getBinding(org.eclipse.cdt.core.dom.ast.IASTName, boolean)
*/
@Override
public IBinding[] getBindings(ScopeLookupData lookup) {
return IBinding.EMPTY_BINDING_ARRAY;
}
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType)
*/
@Override
public boolean isSameType(IType type) {
return type == this;
@ -320,76 +277,99 @@ public class ProblemBinding extends PlatformObject implements IProblemBinding, I
public void removeNestedFromCache(IASTNode container) {
}
// Dummy methods for derived classes
// Dummy methods for derived classes.
public IType getType() {
return new ProblemType(getID());
}
public boolean isStatic() {
return false;
}
public String[] getQualifiedName() throws DOMException {
throw new DOMException(this);
}
public char[][] getQualifiedNameCharArray() throws DOMException {
throw new DOMException(this);
}
public boolean isGloballyQualified() throws DOMException {
throw new DOMException(this);
}
public boolean isMutable() {
return false;
}
public boolean isExtern() {
return false;
}
public boolean isExternC() {
return false;
}
public boolean isAuto() {
return false;
}
public boolean isRegister() {
return false;
}
public IValue getInitialValue() {
public IValue getInitialValue() {
return null;
}
public boolean isAnonymous() {
public boolean isAnonymous() {
return false;
}
public boolean isDeleted() {
public boolean isDeleted() {
return false;
}
public boolean isInline() {
return false;
}
public boolean takesVarArgs() {
return false;
}
public IType[] getExceptionSpecification() {
public IType[] getExceptionSpecification() {
return null;
}
public boolean hasParameterPack() {
return false;
}
public boolean isVirtual() {
return false;
}
public boolean isPureVirtual() {
return false;
}
public boolean isImplicit() {
return false;
}
public boolean isExplicit() {
public boolean isExplicit() {
return false;
}
public boolean hasDefaultValue() {
return false;
}
public IValue getDefaultValue() {
return null;
}
public boolean isParameterPack() {
return false;
}

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionScope.java
View file

@ -16,7 +16,6 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.cdt.core.dom.IName;
import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.EScopeKind;
import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
@ -84,7 +83,7 @@ public class CPPFunctionScope extends CPPScope implements ICPPFunctionScope {
}
@Override
public IScope getParent() throws DOMException {
public IScope getParent() {
//we can't just resolve the function and get its parent scope, since there are cases where that
//could loop since resolving functions requires resolving their parameter types
IASTFunctionDeclarator fdtor = (IASTFunctionDeclarator) getPhysicalNode();

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java
View file

@ -17,7 +17,6 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp;
import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.IName;
import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
@ -78,7 +77,7 @@ abstract public class CPPScope implements ICPPASTInternalScope {
}
@Override
public IScope getParent() throws DOMException {
public IScope getParent() {
return CPPVisitor.getContainingNonTemplateScope(physicalNode);
}

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java
View file

@ -118,6 +118,7 @@ public class CPPScopeMapper {
public IBinding[] getBindings(ScopeLookupData lookup) {
return fScope.getBindings(lookup);
}
@Override
public IScope getParent() throws DOMException {
IScope parent= fScope.getParent();

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

@ -14,15 +14,19 @@ import org.eclipse.cdt.core.dom.ast.IASTNode;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding;
/**
* Non API methods for cpp bindings.
* Non API methods for C++ bindings.
*/
public interface ICPPInternalBinding extends ICPPBinding {
/**
* Returns the definition of the binding, or {@code null} if the binding doesn't have
* a definition.
*/
IASTNode getDefinition();
/** Implementors must keep the node with the lowest offset in declarations[0] */
IASTNode[] getDeclarations();
void addDefinition(IASTNode node);
void addDeclaration(IASTNode node);
}