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

Support for Generic Type Parameters on methods

Browse Source
This commit is contained in:
Kevin Glynn 2010-10-19 14:12:42 +02:00
parent aeadd3744e
commit f26a2f3172
2 changed files with 69 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
CSharpTranslator/antlr3/src/cs2j/CLR/TranslationTemplate.cs
View File

@ -296,6 +296,9 @@ namespace RusticiSoftware.Translator.CLR
// Method name // Method name
public string Name { get; set; } public string Name { get; set; }
[XmlArrayItem("Name")]
public string[] TypeParams { get; set; }
// Return type // Return type
public string Return { get; set; } public string Return { get; set; }
@ -303,13 +306,14 @@ namespace RusticiSoftware.Translator.CLR
{ {
} }
public MethodRepTemplate (string retType, string methodName, List<ParamRepTemplate> pars, string[] imps, string javaRep) : base(pars, imps, javaRep) public MethodRepTemplate (string retType, string methodName, string[] tParams, List<ParamRepTemplate> pars, string[] imps, string javaRep) : base(pars, imps, javaRep)
{ {
Name = methodName; Name = methodName;
TypeParams = tParams;
Return = retType; Return = retType;
} }
public MethodRepTemplate (string retType, string methodName, List<ParamRepTemplate> pars) : this(retType, methodName, pars, null, null) public MethodRepTemplate (string retType, string methodName, string[] tParams, List<ParamRepTemplate> pars) : this(retType, methodName, tParams, pars, null, null)
{ {
} }
@ -318,6 +322,15 @@ namespace RusticiSoftware.Translator.CLR
{ {
if (other == null) if (other == null)
return false; return false;
if (TypeParams != other.TypeParams) {
if (TypeParams == null || other.TypeParams == null || TypeParams.Length != other.TypeParams.Length)
return false;
for (int i = 0; i < TypeParams.Length; i++) {
if (TypeParams[i] != other.TypeParams[i])
return false;
}
}
return Return == other.Return && Name == other.Name && base.Equals(other); return Return == other.Return && Name == other.Name && base.Equals(other);
} }
@ -344,7 +357,14 @@ namespace RusticiSoftware.Translator.CLR
public override int GetHashCode () public override int GetHashCode ()
{ {
return (Return ?? String.Empty).GetHashCode () ^ (Name ?? String.Empty).GetHashCode () ^ base.GetHashCode(); int hashCode = 0;
if (TypeParams != null) {
foreach (string o in TypeParams) {
hashCode = hashCode ^ o.GetHashCode() ;
}
}
return hashCode ^ (Return ?? String.Empty).GetHashCode () ^ (Name ?? String.Empty).GetHashCode () ^ base.GetHashCode();
} }
#endregion #endregion
@ -603,8 +623,8 @@ namespace RusticiSoftware.Translator.CLR
[XmlElementAttribute("Name")] [XmlElementAttribute("Name")]
public string TypeName { get; set; } public string TypeName { get; set; }
// [XmlElementAttribute("Name")] [XmlArrayItem("Name")]
// public string[] TypeName { get; set; } public string[] TypeParams { get; set; }
// Path to use when resolving types // Path to use when resolving types
[XmlElementAttribute("Use")] [XmlElementAttribute("Use")]
@ -622,9 +642,10 @@ namespace RusticiSoftware.Translator.CLR
TypeName = typeName; TypeName = typeName;
} }
protected TypeRepTemplate (string tName, UseRepTemplate[] usePath, string[] imports, string javaTemplate) : base(imports, javaTemplate) protected TypeRepTemplate (string tName, string[] tParams, UseRepTemplate[] usePath, string[] imports, string javaTemplate) : base(imports, javaTemplate)
{ {
TypeName = tName; TypeName = tName;
TypeParams = tParams;
Uses = usePath; Uses = usePath;
} }
@ -710,6 +731,14 @@ namespace RusticiSoftware.Translator.CLR
return false; return false;
} }
} }
if (TypeParams != other.TypeParams) {
if (TypeParams == null || other.TypeParams == null || TypeParams.Length != other.TypeParams.Length)
return false;
for (int i = 0; i < TypeParams.Length; i++) {
if (TypeParams[i] != other.TypeParams[i])
return false;
}
}
return TypeName == other.TypeName && base.Equals(other); return TypeName == other.TypeName && base.Equals(other);
} }
@ -742,6 +771,11 @@ namespace RusticiSoftware.Translator.CLR
hashCode ^= e.GetHashCode(); hashCode ^= e.GetHashCode();
} }
} }
if (TypeParams != null) {
foreach (string e in TypeParams) {
hashCode ^= e.GetHashCode();
}
}
return (Java ?? String.Empty).GetHashCode () ^ hashCode; return (Java ?? String.Empty).GetHashCode () ^ hashCode;
} }
#endregion #endregion
@ -965,7 +999,8 @@ namespace RusticiSoftware.Translator.CLR
{ {
} }
protected InterfaceRepTemplate (string tName, UseRepTemplate[] usePath, string[] inherits, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, string[] imps, string javaTemplate) : base(tName, usePath, imps, javaTemplate) protected InterfaceRepTemplate (string tName, string[] tParams, UseRepTemplate[] usePath, string[] inherits, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, string[] imps, string javaTemplate)
: base(tName, tParams, usePath, imps, javaTemplate)
{ {
Inherits = inherits; Inherits = inherits;
_methods = ms; _methods = ms;
@ -1130,15 +1165,17 @@ namespace RusticiSoftware.Translator.CLR
{ {
} }
public ClassRepTemplate (string tName, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts, public ClassRepTemplate (string tName, string[] tParams, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts,
string[] imports, string javaTemplate) : base(tName, usePath, inherits, ms, ps, es, ixs, imports, javaTemplate) string[] imports, string javaTemplate)
: base(tName, tParams, usePath, inherits, ms, ps, es, ixs, imports, javaTemplate)
{ {
_constructors = cs; _constructors = cs;
_fields = fs; _fields = fs;
_casts = cts; _casts = cts;
} }
public ClassRepTemplate (string tName, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts) : base(tName, usePath, inherits, ms, ps, es, ixs, null, null) public ClassRepTemplate (string tName, string[] tParams, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts)
: base(tName, tParams, usePath, inherits, ms, ps, es, ixs, null, null)
{ {
_constructors = cs; _constructors = cs;
_fields = fs; _fields = fs;
@ -1247,14 +1284,14 @@ namespace RusticiSoftware.Translator.CLR
{ {
} }
public StructRepTemplate (string tName, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts, public StructRepTemplate (string tName, string[] tParams, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts,
string[] imports, string javaTemplate) : base(tName, usePath, inherits, cs, ms, ps, fs, es, ixs, cts, string[] imports, string javaTemplate) : base(tName, tParams, usePath, inherits, cs, ms, ps, fs, es, ixs, cts,
imports, javaTemplate) imports, javaTemplate)
{ {
} }
public StructRepTemplate (string tName, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts) : base(tName, usePath, inherits, cs, ms, ps, fs, es, ixs, cts, public StructRepTemplate (string tName, string[] tParams, UseRepTemplate[] usePath, string[] inherits, List<ConstructorRepTemplate> cs, List<MethodRepTemplate> ms, List<PropRepTemplate> ps, List<FieldRepTemplate> fs, List<FieldRepTemplate> es, List<MethodRepTemplate> ixs, List<CastRepTemplate> cts)
null, null) : base(tName, tParams, usePath, inherits, cs, ms, ps, fs, es, ixs, cts, null, null)
{ {
} }

19
CSharpTranslator/antlr3/src/cs2jTemplateGen/Main.cs
View File

@ -76,7 +76,17 @@ namespace cs2j.Template.Utils
private void buildInterface(InterfaceRepTemplate iface, Type t) { private void buildInterface(InterfaceRepTemplate iface, Type t) {
iface.TypeName = TypeHelper.buildTypeName(t); if (t.IsGenericType) {
iface.TypeName = t.GetGenericTypeDefinition().FullName;
string[] tParams = new string[t.GetGenericArguments().Length];
for (int i = 0; i < t.GetGenericArguments().Length; i++) {
tParams[i] = t.GetGenericArguments()[i].Name;
}
iface.TypeParams = tParams;
}
else {
iface.TypeName = t.FullName;
}
List<String> bases = new List<String>(); List<String> bases = new List<String>();
if (t.BaseType != null) if (t.BaseType != null)
@ -92,6 +102,13 @@ namespace cs2j.Template.Utils
MethodRepTemplate methRep = new MethodRepTemplate(); MethodRepTemplate methRep = new MethodRepTemplate();
methRep.Name = m.Name; methRep.Name = m.Name;
methRep.Return = TypeHelper.buildTypeName(m.ReturnType); methRep.Return = TypeHelper.buildTypeName(m.ReturnType);
if (m.IsGenericMethod) {
string[] tParams = new string[m.GetGenericArguments().Length];
for (int i = 0; i < m.GetGenericArguments().Length; i++) {
tParams[i] = m.GetGenericArguments()[i].Name;
}
methRep.TypeParams = tParams;
}
buildParameters(methRep, m); buildParameters(methRep, m);
iface.Methods.Add(methRep); iface.Methods.Add(methRep);
} }