mirror of
https://github.com/twiglet/cs2j.git
synced 2025-01-18 13:15:17 +01:00
Mark static methods
This commit is contained in:
parent
f26a2f3172
commit
4933c8f3c5
@ -302,8 +302,14 @@ namespace RusticiSoftware.Translator.CLR
|
|||||||
// Return type
|
// Return type
|
||||||
public string Return { get; set; }
|
public string Return { get; set; }
|
||||||
|
|
||||||
|
// isStatic method?
|
||||||
|
[XmlAttribute("static")]
|
||||||
|
[System.ComponentModel.DefaultValueAttribute(false)]
|
||||||
|
public bool IsStatic{ get; set; }
|
||||||
|
|
||||||
public MethodRepTemplate ()
|
public MethodRepTemplate ()
|
||||||
{
|
{
|
||||||
|
IsStatic = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MethodRepTemplate (string retType, string methodName, string[] tParams, 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)
|
||||||
@ -311,6 +317,7 @@ namespace RusticiSoftware.Translator.CLR
|
|||||||
Name = methodName;
|
Name = methodName;
|
||||||
TypeParams = tParams;
|
TypeParams = tParams;
|
||||||
Return = retType;
|
Return = retType;
|
||||||
|
IsStatic = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MethodRepTemplate (string retType, string methodName, string[] tParams, List<ParamRepTemplate> pars) : this(retType, methodName, tParams, pars, null, null)
|
public MethodRepTemplate (string retType, string methodName, string[] tParams, List<ParamRepTemplate> pars) : this(retType, methodName, tParams, pars, null, null)
|
||||||
@ -332,7 +339,7 @@ namespace RusticiSoftware.Translator.CLR
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Return == other.Return && Name == other.Name && base.Equals(other);
|
return Return == other.Return && Name == other.Name && IsStatic == other.IsStatic && base.Equals(other);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool Equals (object obj)
|
public override bool Equals (object obj)
|
||||||
@ -364,7 +371,7 @@ namespace RusticiSoftware.Translator.CLR
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return hashCode ^ (Return ?? String.Empty).GetHashCode () ^ (Name ?? String.Empty).GetHashCode () ^ base.GetHashCode();
|
return hashCode ^ (Return ?? String.Empty).GetHashCode () ^ (Name ?? String.Empty).GetHashCode () ^ IsStatic.GetHashCode() ^ base.GetHashCode();
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -110,6 +110,9 @@ namespace cs2j.Template.Utils
|
|||||||
methRep.TypeParams = tParams;
|
methRep.TypeParams = tParams;
|
||||||
}
|
}
|
||||||
buildParameters(methRep, m);
|
buildParameters(methRep, m);
|
||||||
|
if (m.IsStatic) {
|
||||||
|
methRep.IsStatic = true;
|
||||||
|
}
|
||||||
iface.Methods.Add(methRep);
|
iface.Methods.Add(methRep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user