backup/cs2j
1
0
Fork 0
mirror of https://github.com/twiglet/cs2j.git synced 2025-01-18 13:15:17 +01:00
Code Issues Projects Releases Activity

Don't cache FormattedTypeName. We have at least two representations using this routine. Move to callers if necessary

Browse Source
This commit is contained in:
Kevin Glynn 2011-03-04 18:08:30 +01:00
parent d20d2c689e
commit a39ab27081
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTemplate/TranslationTemplate.cs
View File

@ -2276,38 +2276,33 @@ namespace Twiglet.CS2J.Translator.TypeRep
} }
#endregion #endregion
private string _formattedTypeName = null;
protected string mkFormattedTypeName(bool incNameSpace, string langle, string rangle) protected string mkFormattedTypeName(bool incNameSpace, string langle, string rangle)
{ {
if (_formattedTypeName == null)
{
StringBuilder fmt = new StringBuilder(); StringBuilder fmt = new StringBuilder();
if (TypeName == "System.Array") if (TypeName == "System.Array")
{ {
fmt.Append(InstantiatedTypes[0].mkFormattedTypeName(incNameSpace, langle, rangle)); fmt.Append(InstantiatedTypes[0].mkFormattedTypeName(incNameSpace, langle, rangle));
fmt.Append("[]"); 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();
} }
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() protected string mkFormattedTypeName()