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 inherits for MultiDelegateClass case when type params are involved

Browse Source
This commit is contained in:
Kevin Glynn 2011-05-19 17:17:42 +02:00
parent 84a767f445
commit 1967cfb048
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
CSharpTranslator/antlr3/src/CS2JTranslator/CS2JTransform/TemplateExtracter.g
View File

@ -85,6 +85,30 @@ scope NSContext {
} }
} }
protected string mkTypeString(string tyName, List<String> tyargs) {
StringBuilder ty = new StringBuilder();
ty.Append(tyName);
ty.Append(mkTypeArgString(tyargs));
return ty.ToString();
}
protected string mkTypeArgString(List<String> tyargs) {
StringBuilder ty = new StringBuilder();
if (tyargs != null && tyargs.Count > 0) {
ty.Append("*[");
bool isFirst = true;
foreach (String v in tyargs) {
if (!isFirst) {
ty.Append(",");
}
isFirst = false;
ty.Append(v);
}
ty.Append("]*");
}
return ty.ToString();
}
} }
/******************************************************************************************** /********************************************************************************************
@ -888,12 +912,13 @@ scope NSContext;
// now add a class for the MultiDelegateClass that we will be generating // now add a class for the MultiDelegateClass that we will be generating
genericNameSpace = NSPrefix(ParentNameSpace) + mkGenericTypeAlias("__Multi"+$identifier.text, $variant_generic_parameter_list.tyargs); genericNameSpace = NSPrefix(ParentNameSpace) + mkGenericTypeAlias("__Multi"+$identifier.text, $variant_generic_parameter_list.tyargs);
multiDelegateClass.TypeName = NSPrefix(ParentNameSpace) + "__Multi" + $identifier.text; multiDelegateClass.TypeName = NSPrefix(ParentNameSpace) + "__Multi" + $identifier.text;
multiDelegateClass.Inherits = new String[] { dlegate.TypeName }; String delIfaceName = mkTypeString(dlegate.TypeName, $variant_generic_parameter_list.tyargs);
multiDelegateClass.Inherits = new String[] { delIfaceName };
if ($variant_generic_parameter_list.tyargs != null && $variant_generic_parameter_list.tyargs.Count > 0) { if ($variant_generic_parameter_list.tyargs != null && $variant_generic_parameter_list.tyargs.Count > 0) {
multiDelegateClass.TypeParams = $variant_generic_parameter_list.tyargs.ToArray(); multiDelegateClass.TypeParams = $variant_generic_parameter_list.tyargs.ToArray();
} }
multiDelegateClass.Methods.Add(new MethodRepTemplate($return_type.thetext, "Invoke", null, $formal_parameter_list.paramlist)); multiDelegateClass.Methods.Add(new MethodRepTemplate($return_type.thetext, "Invoke", null, $formal_parameter_list.paramlist));
multiDelegateClass.Methods.Add(new MethodRepTemplate("System.Collections.Generic.List*[" + dlegate.TypeName + "]*", "GetInvocationList", null, null)); multiDelegateClass.Methods.Add(new MethodRepTemplate("System.Collections.Generic.List*[" + delIfaceName + "]*", "GetInvocationList", null, null));
AppEnv[genericNameSpace] = multiDelegateClass; AppEnv[genericNameSpace] = multiDelegateClass;
multiDelegateClass.Uses = this.CollectUses; multiDelegateClass.Uses = this.CollectUses;
multiDelegateClass.Aliases = this.CollectAliases; multiDelegateClass.Aliases = this.CollectAliases;