mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
Improve toString() methods, follow up for bug 256113.
This commit is contained in:
parent
eeea9a4a25
commit
3e469f7de0
6 changed files with 9 additions and 6 deletions
|
@ -107,7 +107,8 @@ public class ASTTypeUtil {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a comma-separated list of the string representations of the arguments.
|
* Returns a comma-separated list of the string representations of the arguments, enclosed
|
||||||
|
* in angle brackets.
|
||||||
* Optionally normalization is performed:
|
* Optionally normalization is performed:
|
||||||
* <br> template parameter names are represented by their parameter position,
|
* <br> template parameter names are represented by their parameter position,
|
||||||
* <br> further normalization may be performed in future versions.
|
* <br> further normalization may be performed in future versions.
|
||||||
|
@ -117,6 +118,7 @@ public class ASTTypeUtil {
|
||||||
public static String getArgumentListString(ICPPTemplateArgument[] args, boolean normalize) {
|
public static String getArgumentListString(ICPPTemplateArgument[] args, boolean normalize) {
|
||||||
StringBuilder result= new StringBuilder();
|
StringBuilder result= new StringBuilder();
|
||||||
boolean first= true;
|
boolean first= true;
|
||||||
|
result.append('<');
|
||||||
for (ICPPTemplateArgument arg : args) {
|
for (ICPPTemplateArgument arg : args) {
|
||||||
if (!first) {
|
if (!first) {
|
||||||
result.append(',');
|
result.append(',');
|
||||||
|
@ -124,6 +126,7 @@ public class ASTTypeUtil {
|
||||||
first= false;
|
first= false;
|
||||||
result.append(getArgumentString(arg, normalize));
|
result.append(getArgumentString(arg, normalize));
|
||||||
}
|
}
|
||||||
|
result.append('>');
|
||||||
return result.toString();
|
return result.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class CPPClassInstance extends CPPClassSpecialization implements ICPPTemp
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return getName() + " <" + ASTTypeUtil.getArgumentListString(arguments, true) + ">"; //$NON-NLS-1$ //$NON-NLS-2$
|
return getName() + " " + ASTTypeUtil.getArgumentListString(arguments, true); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -66,7 +66,7 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
try {
|
try {
|
||||||
return super.toString() + '<' + ASTTypeUtil.getArgumentListString(getTemplateArguments(), true) + '>';
|
return super.toString() + ASTTypeUtil.getArgumentListString(getTemplateArguments(), true);
|
||||||
} catch (DOMException e) {
|
} catch (DOMException e) {
|
||||||
return super.toString() + '<' + e.getProblem().toString() + '>';
|
return super.toString() + '<' + e.getProblem().toString() + '>';
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class CPPFunctionInstance extends CPPFunctionSpecialization implements IC
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return getName() + " <" + ASTTypeUtil.getArgumentListString(fArguments, true) + ">"; //$NON-NLS-1$ //$NON-NLS-2$
|
return getName() + " " + ASTTypeUtil.getArgumentListString(fArguments, true); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class CPPUnknownClassInstance extends CPPUnknownClass implements ICPPUnkn
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return getName() + " <" + ASTTypeUtil.getArgumentListString(arguments, true) + ">"; //$NON-NLS-1$ //$NON-NLS-2$
|
return getName() + " " + ASTTypeUtil.getArgumentListString(arguments, true); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -74,7 +74,7 @@ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICP
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return getName() + " <" + ASTTypeUtil.getArgumentListString(getArguments(), true) + ">"; //$NON-NLS-1$ //$NON-NLS-2$
|
return getName() + " " + ASTTypeUtil.getArgumentListString(getArguments(), true); //$NON-NLS-1$
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Add table
Reference in a new issue