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

Fix up InstantiatedTypes during substituion pass, not as side effect of mkTypeMap

Browse Source
This commit is contained in:
Kevin Glynn 2011-03-04 18:10:13 +01:00
parent a39ab27081
commit 01a5d58bd1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1673,7 +1673,7 @@ namespace Twiglet.CS2J.Translator.TypeRep
InstantiatedTypes = new TypeRepTemplate[len]; InstantiatedTypes = new TypeRepTemplate[len];
for (int i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
InstantiatedTypes[i] = copyFrom.InstantiatedTypes[i].Instantiate(null); InstantiatedTypes[i] = copyFrom.InstantiatedTypes[i];
} }
} }
@ -1746,7 +1746,6 @@ namespace Twiglet.CS2J.Translator.TypeRep
} }
} }
// IMPORTANT: Call this on the fresh copy because it has the side effect of updating this type's TypeParams.
protected Dictionary<string,TypeRepTemplate> mkTypeMap(ICollection<TypeRepTemplate> args) { protected Dictionary<string,TypeRepTemplate> mkTypeMap(ICollection<TypeRepTemplate> args) {
Dictionary<string,TypeRepTemplate> ret = new Dictionary<string,TypeRepTemplate>(); Dictionary<string,TypeRepTemplate> ret = new Dictionary<string,TypeRepTemplate>();
if (args == null) if (args == null)
@ -1755,12 +1754,10 @@ namespace Twiglet.CS2J.Translator.TypeRep
} }
if (args.Count == TypeParams.Length) if (args.Count == TypeParams.Length)
{ {
InstantiatedTypes = new TypeRepTemplate[args.Count];
int i = 0; int i = 0;
foreach (TypeRepTemplate sub in args) foreach (TypeRepTemplate sub in args)
{ {
ret[TypeParams[i]] = sub; ret[TypeParams[i]] = sub;
InstantiatedTypes[i] = sub;
i++; i++;
} }
} }
@ -1792,6 +1789,11 @@ namespace Twiglet.CS2J.Translator.TypeRep
Inherits[i] = TemplateUtilities.SubstituteInType(Inherits[i],args); Inherits[i] = TemplateUtilities.SubstituteInType(Inherits[i],args);
} }
} }
InstantiatedTypes = new TypeRepTemplate[args.Count];
for (int i = 0; i < TypeParams.Length; i++)
{
InstantiatedTypes[i] = args[TypeParams[i]];
}
base.Apply(args); base.Apply(args);
} }
@ -2278,7 +2280,6 @@ namespace Twiglet.CS2J.Translator.TypeRep
protected string mkFormattedTypeName(bool incNameSpace, string langle, string rangle) protected string mkFormattedTypeName(bool incNameSpace, string langle, string rangle)
{ {
StringBuilder fmt = new StringBuilder(); StringBuilder fmt = new StringBuilder();
if (TypeName == "System.Array") if (TypeName == "System.Array")
{ {