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

toString method.

Browse source
This commit is contained in:
Sergey Prigogin 2008-03-17 00:12:41 +00:00
parent ce309040bd
commit e1c98f2c02
2 changed files with 229 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding;
* @author dsteffle * @author dsteffle
*/ */
public class ASTTypeUtil { public class ASTTypeUtil {
private static final String COMMA_SPACE = ", "; //$NON-NLS-1$ private static final String COMMA_SPACE = ", "; //$NON-NLS-1$
private static final String EMPTY_STRING = ""; //$NON-NLS-1$ private static final String EMPTY_STRING = ""; //$NON-NLS-1$
private static final String SPACE = " "; //$NON-NLS-1$ private static final String SPACE = " "; //$NON-NLS-1$
@ -72,10 +71,11 @@ public class ASTTypeUtil {
String[] parms = getParameterTypeStringArray(type); String[] parms = getParameterTypeStringArray(type);
result.append(Keywords.cpLPAREN); result.append(Keywords.cpLPAREN);
for(int i=0; i<parms.length; i++) { for (int i = 0; i < parms.length; i++) {
if (parms[i] != null) { if (parms[i] != null) {
result.append(parms[i]); result.append(parms[i]);
if (i<parms.length-1) result.append(COMMA_SPACE); if (i < parms.length - 1)
result.append(COMMA_SPACE);
} }
} }
result.append(Keywords.cpRPAREN); result.append(Keywords.cpRPAREN);
@ -90,10 +90,11 @@ public class ASTTypeUtil {
*/ */
public static String getTypeListString(IType[] types) { public static String getTypeListString(IType[] types) {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
for(int i=0; i<types.length; i++) { for (int i = 0; i < types.length; i++) {
if (types[i] != null) { if (types[i] != null) {
result.append(getTypeString(types[i])); result.append(getTypeString(types[i]));
if (i<types.length-1) result.append(COMMA_SPACE); if (i < types.length - 1)
result.append(COMMA_SPACE);
} }
} }
return result.toString(); return result.toString();
@ -109,11 +110,13 @@ public class ASTTypeUtil {
IType[] parms = null; IType[] parms = null;
try { try {
parms = type.getParameterTypes(); parms = type.getParameterTypes();
} catch (DOMException e) { return EMPTY_STRING_ARRAY; } } catch (DOMException e) {
return EMPTY_STRING_ARRAY;
}
String[] result = new String[parms.length]; String[] result = new String[parms.length];
for(int i=0; i<parms.length; i++) { for (int i = 0; i < parms.length; i++) {
if (parms[i] != null) { if (parms[i] != null) {
result[i] = getType(parms[i]); result[i] = getType(parms[i]);
} }
@ -130,36 +133,86 @@ public class ASTTypeUtil {
result.append(Keywords.cpLBRACKET); result.append(Keywords.cpLBRACKET);
if (type instanceof ICArrayType) { if (type instanceof ICArrayType) {
try { try {
if (((ICArrayType)type).isConst()) { result.append(Keywords.CONST); needSpace=true; } if (((ICArrayType) type).isConst()) {
if (((ICArrayType)type).isRestrict()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.RESTRICT); needSpace=true; } result.append(Keywords.CONST); needSpace = true;
if (((ICArrayType)type).isStatic()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.STATIC); needSpace=true; } }
if (((ICArrayType)type).isVolatile()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.VOLATILE); } if (((ICArrayType) type).isRestrict()) {
} catch (DOMException e) {} if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.RESTRICT); needSpace = true;
}
if (((ICArrayType) type).isStatic()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.STATIC); needSpace = true;
}
if (((ICArrayType) type).isVolatile()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.VOLATILE);
}
} catch (DOMException e) {
}
} }
result.append(Keywords.cpRBRACKET); result.append(Keywords.cpRBRACKET);
} else if (type instanceof IBasicType) { } else if (type instanceof IBasicType) {
try { try {
if (((IBasicType)type).isSigned()) { result.append(Keywords.SIGNED); needSpace = true; } if (((IBasicType) type).isSigned()) {
else if (((IBasicType)type).isUnsigned()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.UNSIGNED); needSpace=true; } result.append(Keywords.SIGNED); needSpace = true;
if (((IBasicType)type).isLong()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.LONG); needSpace = true; } } else if (((IBasicType) type).isUnsigned()) {
else if (((IBasicType)type).isShort()) { if (needSpace) { result.append(SPACE); needSpace=false; }result.append(Keywords.SHORT); needSpace = true; } if (needSpace) {
} catch (DOMException e) {} result.append(SPACE); needSpace = false;
}
result.append(Keywords.UNSIGNED); needSpace = true;
}
if (((IBasicType) type).isLong()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.LONG); needSpace = true;
} else if (((IBasicType) type).isShort()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.SHORT); needSpace = true;
}
} catch (DOMException e) {
}
if (type instanceof IGPPBasicType) { if (type instanceof IGPPBasicType) {
try { try {
if (((IGPPBasicType)type).isLongLong()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.LONG_LONG); needSpace=true; } if (((IGPPBasicType) type).isLongLong()) {
if (((IGPPBasicType)type).isComplex()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.c_COMPLEX); needSpace=true; } if (needSpace) {
if (((IGPPBasicType)type).isImaginary()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.c_IMAGINARY); needSpace=true; } result.append(SPACE); needSpace = false;
}
result.append(Keywords.LONG_LONG); needSpace = true;
}
if (((IGPPBasicType) type).isComplex()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.c_COMPLEX); needSpace = true;
}
if (((IGPPBasicType) type).isImaginary()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.c_IMAGINARY); needSpace = true;
}
switch (((IGPPBasicType)type).getType()) { switch (((IGPPBasicType) type).getType()) {
case IGPPBasicType.t_typeof: case IGPPBasicType.t_typeof:
result.append(GCCKeywords.TYPEOF); result.append(GCCKeywords.TYPEOF);
break; break;
} }
} catch (DOMException e) {} } catch (DOMException e) {
}
} else if (type instanceof ICPPBasicType) { } else if (type instanceof ICPPBasicType) {
try { try {
switch (((ICPPBasicType)type).getType()) { switch (((ICPPBasicType) type).getType()) {
case ICPPBasicType.t_bool: case ICPPBasicType.t_bool:
result.append(Keywords.BOOL); result.append(Keywords.BOOL);
break; break;
@ -167,50 +220,62 @@ public class ASTTypeUtil {
result.append(Keywords.WCHAR_T); result.append(Keywords.WCHAR_T);
break; break;
} }
} catch (DOMException e) {} } catch (DOMException e) {
}
} else if (type instanceof ICBasicType) { } else if (type instanceof ICBasicType) {
try { try {
if (((ICBasicType)type).isComplex()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.c_COMPLEX); needSpace=true; } if (((ICBasicType) type).isComplex()) {
if (((ICBasicType)type).isImaginary()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.c_IMAGINARY); needSpace=true; } if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.c_COMPLEX); needSpace = true;
}
if (((ICBasicType) type).isImaginary()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.c_IMAGINARY); needSpace = true;
}
switch (((ICBasicType)type).getType()) { switch (((ICBasicType) type).getType()) {
case ICBasicType.t_Bool: case ICBasicType.t_Bool:
result.append(Keywords.c_BOOL); result.append(Keywords.c_BOOL);
break; break;
} }
} catch (DOMException e) {} } catch (DOMException e) {
}
} }
try { try {
switch (((IBasicType)type).getType()) { switch (((IBasicType) type).getType()) {
case IBasicType.t_char: case IBasicType.t_char:
if (needSpace) result.append( SPACE ); if (needSpace) result.append(SPACE);
result.append(Keywords.CHAR); result.append(Keywords.CHAR);
break; break;
case IBasicType.t_double: case IBasicType.t_double:
if (needSpace) result.append( SPACE ); if (needSpace) result.append(SPACE);
result.append(Keywords.DOUBLE); result.append(Keywords.DOUBLE);
break; break;
case IBasicType.t_float: case IBasicType.t_float:
if (needSpace) result.append( SPACE ); if (needSpace) result.append(SPACE);
result.append(Keywords.FLOAT); result.append(Keywords.FLOAT);
break; break;
case IBasicType.t_int: case IBasicType.t_int:
if (needSpace) result.append( SPACE ); if (needSpace) result.append(SPACE);
result.append(Keywords.INT); result.append(Keywords.INT);
break; break;
case IBasicType.t_void: case IBasicType.t_void:
if (needSpace) result.append( SPACE ); if (needSpace) result.append(SPACE);
result.append(Keywords.VOID); result.append(Keywords.VOID);
break; break;
} }
} catch (DOMException e) {} } catch (DOMException e) {
}
} else if (type instanceof ICompositeType) { } else if (type instanceof ICompositeType) {
// 101114 fix, do not display class, and for consistency don't display struct/union as well // 101114 fix, do not display class, and for consistency don't display struct/union as well
// if (type instanceof ICPPClassType) { // if (type instanceof ICPPClassType) {
// try { // try {
// switch(((ICPPClassType)type).getKey()) { // switch(((ICPPClassType) type).getKey()) {
// case ICPPClassType.k_class: // case ICPPClassType.k_class:
// result.append(Keywords.CLASS); // result.append(Keywords.CLASS);
// break; // break;
@ -219,7 +284,7 @@ public class ASTTypeUtil {
// } // }
// //
// try { // try {
// switch(((ICompositeType)type).getKey()) { // switch(((ICompositeType) type).getKey()) {
// case ICompositeType.k_struct: // case ICompositeType.k_struct:
// result.append(Keywords.STRUCT); // result.append(Keywords.STRUCT);
// break; // break;
@ -229,64 +294,103 @@ public class ASTTypeUtil {
// } // }
// } catch (DOMException e) {} // } catch (DOMException e) {}
// result.append(SPACE); // result.append(SPACE);
if(type instanceof ICPPClassType) { if (type instanceof ICPPClassType) {
try { try {
String qn = CPPVisitor.renderQualifiedName(getQualifiedNameForAnonymous((ICPPClassType)type)); String qn = CPPVisitor.renderQualifiedName(getQualifiedNameForAnonymous((ICPPClassType) type));
result.append(qn); result.append(qn);
} catch(DOMException de) { } catch (DOMException e) {
result.append(getNameForAnonymous((ICompositeType)type)); result.append(getNameForAnonymous((ICompositeType) type));
} }
} else { } else {
result.append(getNameForAnonymous((ICompositeType)type)); result.append(getNameForAnonymous((ICompositeType) type));
} }
} else if (type instanceof ICPPReferenceType) { } else if (type instanceof ICPPReferenceType) {
result.append(Keywords.cpAMPER); result.append(Keywords.cpAMPER);
} else if (type instanceof ICPPTemplateTypeParameter) { } else if (type instanceof ICPPTemplateTypeParameter) {
result.append(((ICPPTemplateTypeParameter)type).getName()); result.append(((ICPPTemplateTypeParameter) type).getName());
} else if (type instanceof ICPPTemplateTemplateParameter) { } else if (type instanceof ICPPTemplateTemplateParameter) {
result.append(((ICPPTemplateTemplateParameter)type).getName()); result.append(((ICPPTemplateTemplateParameter) type).getName());
} else if (type instanceof IEnumeration) { } else if (type instanceof IEnumeration) {
result.append(Keywords.ENUM); result.append(Keywords.ENUM);
result.append(SPACE); result.append(SPACE);
result.append(getNameForAnonymous((IEnumeration)type)); result.append(getNameForAnonymous((IEnumeration) type));
} else if (type instanceof IFunctionType) { } else if (type instanceof IFunctionType) {
try { try {
String temp = getType(((IFunctionType)type).getReturnType()); String temp = getType(((IFunctionType) type).getReturnType());
if (temp != null && !temp.equals(EMPTY_STRING)) { result.append(temp); needSpace=true; } if (temp != null && !temp.equals(EMPTY_STRING)) {
if (needSpace) { result.append(SPACE); needSpace=false; } result.append(temp); needSpace = true;
temp = getParameterTypeString((IFunctionType)type); }
if (temp != null && !temp.equals(EMPTY_STRING)) { result.append(temp); needSpace=false; } if (needSpace) {
} catch (DOMException e) {} result.append(SPACE); needSpace = false;
}
temp = getParameterTypeString((IFunctionType) type);
if (temp != null && !temp.equals(EMPTY_STRING)) {
result.append(temp); needSpace = false;
}
} catch (DOMException e) {
}
} else if (type instanceof IPointerType) { } else if (type instanceof IPointerType) {
result.append(Keywords.cpSTAR); needSpace=true; result.append(Keywords.cpSTAR); needSpace = true;
if (type instanceof IGPPPointerType) { if (type instanceof IGPPPointerType) {
if (((IGPPPointerType)type).isRestrict()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.RESTRICT); needSpace=true; } if (((IGPPPointerType) type).isRestrict()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.RESTRICT); needSpace = true;
}
} else if (type instanceof ICPointerType) { } else if (type instanceof ICPointerType) {
if (((ICPointerType)type).isRestrict()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.RESTRICT); needSpace=true; } if (((ICPointerType) type).isRestrict()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.RESTRICT); needSpace = true;
}
} }
try { try {
if (((IPointerType)type).isConst()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.CONST); needSpace=true; } if (((IPointerType) type).isConst()) {
if (((IPointerType)type).isVolatile()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.VOLATILE); needSpace=true; } if (needSpace) {
} catch (DOMException e) {} result.append(SPACE); needSpace = false;
}
result.append(Keywords.CONST); needSpace = true;
}
if (((IPointerType) type).isVolatile()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.VOLATILE); needSpace = true;
}
} catch (DOMException e) {
}
} else if (type instanceof IQualifierType) { } else if (type instanceof IQualifierType) {
if (type instanceof ICQualifierType) { if (type instanceof ICQualifierType) {
if (((ICQualifierType)type).isRestrict()) { result.append(Keywords.RESTRICT); needSpace=true; } if (((ICQualifierType) type).isRestrict()) {
result.append(Keywords.RESTRICT); needSpace = true;
}
} else if (type instanceof IGPPQualifierType) { } else if (type instanceof IGPPQualifierType) {
if (((IGPPQualifierType)type).isRestrict()) { result.append(Keywords.RESTRICT); needSpace=true; } if (((IGPPQualifierType) type).isRestrict()) {
result.append(Keywords.RESTRICT); needSpace = true;
}
} }
try { try {
if (((IQualifierType)type).isConst()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.CONST); needSpace=true; } if (((IQualifierType) type).isConst()) {
if (((IQualifierType)type).isVolatile()) { if (needSpace) { result.append(SPACE); needSpace=false; } result.append(Keywords.VOLATILE); needSpace=true; } if (needSpace) {
} catch (DOMException e) {} result.append(SPACE); needSpace = false;
}
} result.append(Keywords.CONST); needSpace = true;
else if (type instanceof ITypedef) { }
result.append(((ITypedef)type).getNameCharArray()); if (((IQualifierType) type).isVolatile()) {
if (needSpace) {
result.append(SPACE); needSpace = false;
}
result.append(Keywords.VOLATILE); needSpace = true;
}
} catch (DOMException e) {
}
} else if (type instanceof ITypedef) {
result.append(((ITypedef) type).getNameCharArray());
} }
return result.toString(); return result.toString();
@ -314,46 +418,47 @@ public class ASTTypeUtil {
IType[] types = new IType[DEAULT_ITYPE_SIZE]; IType[] types = new IType[DEAULT_ITYPE_SIZE];
// push all of the types onto the stack // push all of the types onto the stack
while(type != null) { while (type != null) {
final boolean isTypedef= type instanceof ITypedef; final boolean isTypedef= type instanceof ITypedef;
if (!resolveTypedefs || !isTypedef) { if (!resolveTypedefs || !isTypedef) {
types = (IType[]) ArrayUtil.append( IType.class, types, type ); types = (IType[]) ArrayUtil.append(IType.class, types, type);
} }
if (!resolveTypedefs && isTypedef) { if (!resolveTypedefs && isTypedef) {
type= null; // stop here type= null; // stop here
} } else if (type instanceof ITypeContainer) {
else if (type instanceof ITypeContainer) {
try { try {
type = ((ITypeContainer)type).getType(); type = ((ITypeContainer) type).getType();
} catch (DOMException e) { } catch (DOMException e) {
type= null; type= null;
} }
} } else {
else {
type= null; type= null;
} }
} }
// pop all of the types off of the stack, and build the string representation while doing so // pop all of the types off of the stack, and build the string representation while doing so
for(int j=types.length-1; j>=0; j--) { for (int j = types.length - 1; j >= 0; j--) {
if (types[j] != null && result.length() > 0) result.append(SPACE); // only add a space if this is not the first type being added
if (types[j] != null) { if (types[j] != null) {
if (j > 0 && types[j-1] instanceof IQualifierType) { if (j > 0 && types[j - 1] instanceof IQualifierType) {
result.append(getTypeString(types[j-1])); smartAppend(result, getTypeString(types[j - 1]));
result.append(SPACE); smartAppend(result, getTypeString(types[j]));
result.append(getTypeString(types[j]));
--j; --j;
} } else {
else { smartAppend(result, getTypeString(types[j]));
result.append(getTypeString(types[j]));
} }
} }
} }
return result.toString(); return result.toString();
} }
private static void smartAppend(StringBuilder buf, String str) {
if (buf.length() > 0 && str.length() > 0 && "&*".indexOf(str.charAt(0)) < 0) { //$NON-NLS-1$
buf.append(SPACE);
}
buf.append(str);
}
/** /**
* Returns the type representation of the declarator (including parameters) as a String. * Returns the type representation of the declarator (including parameters) as a String.
* *
@ -401,15 +506,15 @@ public class ASTTypeUtil {
public static String getNodeType(IASTNode node) { public static String getNodeType(IASTNode node) {
try { try {
if (node instanceof IASTDeclarator) if (node instanceof IASTDeclarator)
return getType((IASTDeclarator)node); return getType((IASTDeclarator) node);
if (node instanceof IASTName && ((IASTName)node).resolveBinding() instanceof IVariable) if (node instanceof IASTName && ((IASTName) node).resolveBinding() instanceof IVariable)
return getType(((IVariable)((IASTName)node).resolveBinding()).getType()); return getType(((IVariable)((IASTName) node).resolveBinding()).getType());
if (node instanceof IASTName && ((IASTName)node).resolveBinding() instanceof IFunction) if (node instanceof IASTName && ((IASTName) node).resolveBinding() instanceof IFunction)
return getType(((IFunction)((IASTName)node).resolveBinding()).getType()); return getType(((IFunction)((IASTName) node).resolveBinding()).getType());
if (node instanceof IASTName && ((IASTName)node).resolveBinding() instanceof IType) if (node instanceof IASTName && ((IASTName) node).resolveBinding() instanceof IType)
return getType((IType)((IASTName)node).resolveBinding()); return getType((IType)((IASTName) node).resolveBinding());
if (node instanceof IASTTypeId) if (node instanceof IASTTypeId)
return getType((IASTTypeId)node); return getType((IASTTypeId) node);
} catch (DOMException e) { return EMPTY_STRING; } } catch (DOMException e) { return EMPTY_STRING; }
return EMPTY_STRING; return EMPTY_STRING;
@ -454,43 +559,43 @@ public class ASTTypeUtil {
public static boolean isConst(IType type) { public static boolean isConst(IType type) {
if (type instanceof IQualifierType) { if (type instanceof IQualifierType) {
try { try {
return ((IQualifierType)type).isConst(); return ((IQualifierType) type).isConst();
} catch (DOMException e) { } catch (DOMException e) {
return false; return false;
} }
} else if (type instanceof ITypeContainer) { } else if (type instanceof ITypeContainer) {
try { try {
return isConst(((ITypeContainer)type).getType()); return isConst(((ITypeContainer) type).getType());
} catch (DOMException e) { } catch (DOMException e) {
return false; return false;
} }
} else if (type instanceof IArrayType) { } else if (type instanceof IArrayType) {
try { try {
return isConst(((IArrayType)type).getType()); return isConst(((IArrayType) type).getType());
} catch (DOMException e) { } catch (DOMException e) {
return false; return false;
} }
} else if (type instanceof ICPPReferenceType) { } else if (type instanceof ICPPReferenceType) {
try { try {
return isConst(((ICPPReferenceType)type).getType()); return isConst(((ICPPReferenceType) type).getType());
} catch (DOMException e) { } catch (DOMException e) {
return false; return false;
} }
} else if (type instanceof IFunctionType) { } else if (type instanceof IFunctionType) {
try { try {
return isConst(((IFunctionType)type).getReturnType()); return isConst(((IFunctionType) type).getReturnType());
} catch (DOMException e) { } catch (DOMException e) {
return false; return false;
} }
} else if (type instanceof IPointerType) { } else if (type instanceof IPointerType) {
try { try {
return isConst(((IPointerType)type).getType()); return isConst(((IPointerType) type).getType());
} catch (DOMException e) { } catch (DOMException e) {
return false; return false;
} }
} else if (type instanceof ITypedef) { } else if (type instanceof ITypedef) {
try { try {
return isConst(((ITypedef)type).getType()); return isConst(((ITypedef) type).getType());
} catch (DOMException e) { } catch (DOMException e) {
return false; return false;
} }
@ -504,7 +609,7 @@ public class ASTTypeUtil {
LinkedList<String> result= new LinkedList<String>(); LinkedList<String> result= new LinkedList<String>();
result.addFirst(getNameForAnonymous(binding)); result.addFirst(getNameForAnonymous(binding));
ICPPScope scope = (ICPPScope) binding.getScope(); ICPPScope scope = (ICPPScope) binding.getScope();
while( scope != null ){ while (scope != null) {
if (scope instanceof ICPPBlockScope || scope instanceof ICPPFunctionScope) { if (scope instanceof ICPPBlockScope || scope instanceof ICPPFunctionScope) {
break; break;
} }
@ -514,7 +619,7 @@ public class ASTTypeUtil {
break; break;
} }
char[] name= n.toCharArray(); char[] name= n.toCharArray();
if (name.length == 0){ if (name.length == 0) {
if (!(scope instanceof ICPPNamespaceScope)) { if (!(scope instanceof ICPPNamespaceScope)) {
name= createNameForAnonymous(scope); name= createNameForAnonymous(scope);
if (name == null) { if (name == null) {
@ -522,8 +627,7 @@ public class ASTTypeUtil {
} }
result.addFirst(new String(name)); result.addFirst(new String(name));
} }
} } else {
else {
result.addFirst(new String(name)); result.addFirst(new String(name));
} }
} }
@ -583,7 +687,7 @@ public class ASTTypeUtil {
private static int findFileNameStart(char[] fname) { private static int findFileNameStart(char[] fname) {
for (int i= fname.length-2; i>=0; i--) { for (int i= fname.length - 2; i >= 0; i--) {
switch (fname[i]) { switch (fname[i]) {
case '/': case '/':
case '\\': case '\\':

30
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java
View file

@ -14,6 +14,7 @@
*/ */
package org.eclipse.cdt.internal.core.dom.parser.cpp; package org.eclipse.cdt.internal.core.dom.parser.cpp;
import org.eclipse.cdt.core.dom.ast.ASTTypeUtil;
import org.eclipse.cdt.core.dom.ast.DOMException; import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.ITypedef;
@ -30,7 +31,7 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer {
* @param type * @param type
* @param operator * @param operator
*/ */
public CPPReferenceType( IType type ) { public CPPReferenceType(IType type) {
this.type = type; this.type = type;
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -40,36 +41,41 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer {
return type; return type;
} }
public void setType( IType t ){ public void setType(IType t) {
type = t; type = t;
} }
public boolean isSameType(IType obj) { public boolean isSameType(IType obj) {
if( obj == this ) if (obj == this)
return true; return true;
if( obj instanceof ITypedef ) if (obj instanceof ITypedef)
return ((ITypedef)obj).isSameType( this ); return ((ITypedef)obj).isSameType(this);
if( type == null ) if (type == null)
return (obj == null); return (obj == null);
if( obj instanceof ICPPReferenceType ){ if (obj instanceof ICPPReferenceType) {
try { try {
return type.isSameType( ((ICPPReferenceType) obj).getType() ); return type.isSameType(((ICPPReferenceType) obj).getType());
} catch ( DOMException e ) { } catch (DOMException e) {
return false; return false;
} }
} }
return false; return false;
} }
public Object clone(){ public Object clone() {
IType t = null; IType t = null;
try { try {
t = (IType) super.clone(); t = (IType) super.clone();
} catch ( CloneNotSupportedException e ) { } catch (CloneNotSupportedException e) {
//not going to happen // not going to happen
} }
return t; return t;
} }
@Override
public String toString() {
return ASTTypeUtil.getType(this);
}
} }