mirror of
https://github.com/twiglet/cs2j.git
synced 2025-01-18 13:15:17 +01:00
Don't cache FormattedTypeName. We have at least two representations using this routine. Move to callers if necessary
This commit is contained in:
parent
d20d2c689e
commit
a39ab27081
@ -2276,38 +2276,33 @@ namespace Twiglet.CS2J.Translator.TypeRep
|
||||
}
|
||||
#endregion
|
||||
|
||||
private string _formattedTypeName = null;
|
||||
protected string mkFormattedTypeName(bool incNameSpace, string langle, string rangle)
|
||||
{
|
||||
if (_formattedTypeName == null)
|
||||
{
|
||||
|
||||
StringBuilder fmt = new StringBuilder();
|
||||
if (TypeName == "System.Array")
|
||||
{
|
||||
fmt.Append(InstantiatedTypes[0].mkFormattedTypeName(incNameSpace, langle, rangle));
|
||||
fmt.Append("[]");
|
||||
}
|
||||
else
|
||||
{
|
||||
fmt.Append(TypeName.Substring(incNameSpace ? 0 : TypeName.LastIndexOf('.')+1));
|
||||
if (InstantiatedTypes != null && InstantiatedTypes.Length > 0)
|
||||
{
|
||||
bool isFirst = true;
|
||||
fmt.Append(langle);
|
||||
foreach (TypeRepTemplate t in InstantiatedTypes)
|
||||
{
|
||||
if (!isFirst)
|
||||
fmt.Append(", ");
|
||||
fmt.Append(t.mkFormattedTypeName(incNameSpace, langle, rangle));
|
||||
isFirst = false;
|
||||
}
|
||||
fmt.Append(rangle);
|
||||
}
|
||||
}
|
||||
_formattedTypeName = fmt.ToString();
|
||||
StringBuilder fmt = new StringBuilder();
|
||||
if (TypeName == "System.Array")
|
||||
{
|
||||
fmt.Append(InstantiatedTypes[0].mkFormattedTypeName(incNameSpace, langle, rangle));
|
||||
fmt.Append("[]");
|
||||
}
|
||||
return _formattedTypeName;
|
||||
else
|
||||
{
|
||||
fmt.Append(TypeName.Substring(incNameSpace ? 0 : TypeName.LastIndexOf('.')+1));
|
||||
if (InstantiatedTypes != null && InstantiatedTypes.Length > 0)
|
||||
{
|
||||
bool isFirst = true;
|
||||
fmt.Append(langle);
|
||||
foreach (TypeRepTemplate t in InstantiatedTypes)
|
||||
{
|
||||
if (!isFirst)
|
||||
fmt.Append(", ");
|
||||
fmt.Append(t.mkFormattedTypeName(incNameSpace, langle, rangle));
|
||||
isFirst = false;
|
||||
}
|
||||
fmt.Append(rangle);
|
||||
}
|
||||
}
|
||||
return fmt.ToString();
|
||||
}
|
||||
|
||||
protected string mkFormattedTypeName()
|
||||
|
Loading…
x
Reference in New Issue
Block a user