ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2004-11-17 Mike Kestner <mkestner@novell.com>

Browse source 
* generator/Makefile.am : add new file.
	* generator/Method.cs : refactoring to use ReturnValue.
	* generator/MethodBody.cs : remove unnecessary code.
	* generator/ReturnValue.cs : class for redundant retval handling.
	* generator/Signal.cs : refactoring for ReturnValue.
	* generator/SignalHandler.cs : refactoring for ReturnValue.

svn path=/trunk/gtk-sharp/; revision=36218
This commit is contained in:
Mike Kestner 2004-11-17 15:57:17 +00:00
parent dcf31a8f33
commit 520eb22a96
6 changed files with 91 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2004-11-17 Mike Kestner <mkestner@novell.com>
* generator/Makefile.am : add new file.
* generator/Method.cs : refactoring to use ReturnValue.
* generator/MethodBody.cs : remove unnecessary code.
* generator/ReturnValue.cs : class for redundant retval handling.
* generator/Signal.cs : refactoring for ReturnValue.
* generator/SignalHandler.cs : refactoring for ReturnValue.
2004-11-16 Dan Winship <danw@novell.com>
* glib/Value.cs: add new constructors for enum and boxed values

1
generator/Makefile.am
View file

@ -36,6 +36,7 @@ sources = \
Parameters.cs \
Parser.cs \
Property.cs \
ReturnValue.cs \
Signal.cs \
SignalHandler.cs \
Signature.cs \

129
generator/Method.cs
View file

@ -31,6 +31,7 @@ namespace GtkSharp.Generation {
private string libname;
private XmlElement elem;
private ReturnValue retval;
private Parameters parms;
private Signature sig;
private ImportSignature isig;
@ -39,9 +40,7 @@ namespace GtkSharp.Generation {
private bool initialized = false;
private string call;
private string rettype, m_ret, s_ret;
private string element_type = null;
private string name, cname, safety;
private string name;
private string protection = "public";
private bool is_get, is_set;
private bool needs_ref = false;
@ -50,8 +49,10 @@ namespace GtkSharp.Generation {
public Method (string libname, XmlElement elem, ClassBase container_type)
{
this.elem = elem;
this.retval = new ReturnValue (elem["return-type"]);
if (elem["parameters"] != null) {
parms = new Parameters (elem["parameters"], container_type.NS);
parms.Static = IsShared;
}
this.container_type = container_type;
if (!container_type.IsDeprecated && elem.HasAttribute ("deprecated"))
@ -69,6 +70,12 @@ namespace GtkSharp.Generation {
this.needs_ref = (elem.GetAttribute ("needs_ref") == "1");
}
public string CName {
get {
return elem.GetAttribute ("cname");
}
}
public bool IsDeprecated {
get {
return deprecated;
@ -89,8 +96,7 @@ namespace GtkSharp.Generation {
private bool IsShared {
get {
return elem.HasAttribute("shared") &&
(elem.GetAttribute("shared") == "true");
return elem.GetAttribute ("shared") == "true";
}
}
@ -114,7 +120,16 @@ namespace GtkSharp.Generation {
public string ReturnType {
get {
return s_ret;
return retval.CSType;
}
}
string Safety {
get {
if (body.ThrowsException && !(container_type is InterfaceGen))
return "unsafe ";
else
return "";
}
}
@ -148,48 +163,14 @@ namespace GtkSharp.Generation {
if (initialized)
return true;
if (parms != null && !parms.Validate ()) {
Console.Write ("in method " + Name + " ");
return false;
}
XmlElement ret_elem = elem["return-type"];
if (ret_elem == null) {
Console.Write("Missing return type in method " + Name + " ");
Statistics.ThrottledCount++;
return false;
}
is_get = (((parms != null && ((parms.IsAccessor && retval.CSType == "void") || (parms.Count == 0 && retval.CSType != "void"))) || (parms == null && retval.CSType != "void")) && Name.Length > 3 && (Name.StartsWith ("Get") || Name.StartsWith ("Is") || Name.StartsWith ("Has")));
is_set = ((parms != null && (parms.IsAccessor || (parms.Count == 1 && retval.CSType == "void"))) && (Name.Length > 3 && Name.Substring(0, 3) == "Set"));
SymbolTable table = SymbolTable.Table;
rettype = ret_elem.GetAttribute("type");
m_ret = table.GetMarshalReturnType(rettype);
s_ret = table.GetCSType(rettype);
cname = elem.GetAttribute("cname");
if (ret_elem.HasAttribute("element_type"))
element_type = ret_elem.GetAttribute("element_type");
if (ret_elem.HasAttribute("array")) {
s_ret += "[]";
m_ret += "[]";
}
is_get = (((parms != null && ((parms.IsAccessor && s_ret == "void") || (parms.Count == 0 && s_ret != "void"))) || (parms == null && s_ret != "void")) && Name.Length > 3 && (Name.StartsWith ("Get") || Name.StartsWith ("Is") || Name.StartsWith ("Has")));
is_set = ((parms != null && (parms.IsAccessor || (parms.Count == 1 && s_ret == "void"))) && (Name.Length > 3 && Name.Substring(0, 3) == "Set"));
if (parms != null)
parms.Static = IsShared;
sig = new Signature (parms);
isig = new ImportSignature (parms, container_type.NS);
body = new MethodBody (parms, container_type.NS);
call = "(" + (IsShared ? "" : container_type.CallByName () + (parms != null ? ", " : "")) + body.GetCallString (is_set) + ")";
if (body.ThrowsException && !(container_type is InterfaceGen))
safety = "unsafe ";
else
safety = "";
initialized = true;
return true;
}
@ -199,9 +180,13 @@ namespace GtkSharp.Generation {
if (!Initialize ())
return false;
if (m_ret == "" || s_ret == "") {
Console.Write("rettype: " + rettype + " in method " + Name + " ");
Statistics.ThrottledCount++;
if (parms != null && !parms.Validate ()) {
Console.Write ("in method " + Name + " ");
return false;
}
if (!retval.Validate ()) {
Console.Write(" in method " + Name + " ");
return false;
}
return true;
@ -220,10 +205,9 @@ namespace GtkSharp.Generation {
private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor)
{
if (elem.HasAttribute("shared") &&
(elem.GetAttribute("shared") == "true"))
if (elem.GetAttribute ("shared") == "true"))
sw.Write("static ");
sw.Write(safety);
sw.Write (Safety);
Method dup = null;
if (container_type != null)
dup = container_type.GetMethodRecursively (Name);
@ -238,9 +222,10 @@ namespace GtkSharp.Generation {
sw.Write("new ");
if (is_get || is_set) {
if (s_ret == "void")
s_ret = parms.AccessorReturnType;
sw.Write(s_ret);
if (retval.CSType == "void")
sw.Write (parms.AccessorReturnType);
else
sw.Write(retval.CSType);
sw.Write(" ");
if (Name.StartsWith ("Get") || Name.StartsWith ("Set"))
sw.Write (Name.Substring (3));
@ -250,7 +235,7 @@ namespace GtkSharp.Generation {
} else if (IsAccessor) {
sw.Write (sig.AccessorType + " " + Name + "(" + sig.AsAccessor + ")");
} else {
sw.Write(s_ret + " " + Name + "(" + (sig != null ? sig.ToString() : "") + ")");
sw.Write(retval.CSType + " " + Name + "(" + (sig != null ? sig.ToString() : "") + ")");
}
}
@ -298,10 +283,10 @@ namespace GtkSharp.Generation {
import_sig += !IsShared && parms != null ? ", " : "";
import_sig += isig.ToString();
sw.WriteLine("\t\t[DllImport(\"" + libname + "\")]");
if (m_ret.StartsWith ("[return:"))
sw.WriteLine("\t\t" + m_ret + " static extern " + safety + s_ret + " " + cname + "(" + import_sig + ");");
if (retval.MarshalType.StartsWith ("[return:"))
sw.WriteLine("\t\t" + retval.MarshalType + " static extern " + Safety + retval.CSType + " " + CName + "(" + import_sig + ");");
else
sw.WriteLine("\t\tstatic extern " + safety + m_ret + " " + cname + "(" + import_sig + ");");
sw.WriteLine("\t\tstatic extern " + Safety + retval.MarshalType + " " + CName + "(" + import_sig + ");");
sw.WriteLine();
}
@ -322,9 +307,9 @@ namespace GtkSharp.Generation {
if (!elem.HasAttribute("new_flag") && container_type.GetPropertyRecursively (Name.Substring (3)) != null)
return;
comp = GetComplement ();
if (comp != null && comp.Validate () && is_set && parms.AccessorReturnType == comp.s_ret)
if (comp != null && comp.Validate () && is_set && parms.AccessorReturnType == comp.ReturnType)
return;
if (comp != null && is_set && parms.AccessorReturnType != comp.s_ret)
if (comp != null && is_set && parms.AccessorReturnType != comp.ReturnType)
{
is_set = false;
call = "(Handle, " + body.GetCallString (false) + ")";
@ -336,7 +321,7 @@ namespace GtkSharp.Generation {
}
GenerateImport (gen_info.Writer);
if (comp != null && s_ret == comp.parms.AccessorReturnType)
if (comp != null && retval.CSType == comp.parms.AccessorReturnType)
comp.GenerateImport (gen_info.Writer);
if (IsDeprecated)
@ -357,7 +342,7 @@ namespace GtkSharp.Generation {
if (is_get || is_set)
{
if (comp != null && s_ret == comp.parms.AccessorReturnType)
if (comp != null && retval.CSType == comp.parms.AccessorReturnType)
{
gen_info.Writer.WriteLine ();
gen_info.Writer.Write ("\t\t\tset");
@ -383,27 +368,27 @@ namespace GtkSharp.Generation {
body.Initialize(gen_info, is_get, is_set, indent);
SymbolTable table = SymbolTable.Table;
IGeneratable ret_igen = table [rettype];
IGeneratable ret_igen = table [retval.CType];
sw.Write(indent + "\t\t\t");
if (m_ret == "void") {
sw.WriteLine(cname + call + ";");
if (retval.MarshalType == "void") {
sw.WriteLine(CName + call + ";");
} else if (ret_igen is ObjectGen || ret_igen is OpaqueGen) {
sw.WriteLine(m_ret + " raw_ret = " + cname + call + ";");
sw.WriteLine(indent +"\t\t\t" + s_ret + " ret;");
sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
sw.WriteLine(indent +"\t\t\t" + retval.CSType + " ret;");
sw.WriteLine(indent + "\t\t\tif (raw_ret == IntPtr.Zero)");
sw.WriteLine(indent + "\t\t\t\tret = null;");
sw.WriteLine(indent + "\t\t\telse");
sw.WriteLine(indent +"\t\t\t\tret = " + table.FromNativeReturn(rettype, "raw_ret") + ";");
sw.WriteLine(indent +"\t\t\t\tret = " + table.FromNativeReturn(retval.CType, "raw_ret") + ";");
} else if (ret_igen is CustomMarshalerGen) {
sw.WriteLine(s_ret + " ret = " + cname + call + ";");
sw.WriteLine(retval.CSType + " ret = " + CName + call + ";");
} else {
sw.WriteLine(m_ret + " raw_ret = " + cname + call + ";");
sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
sw.Write(indent + "\t\t\t");
string raw_parms = "raw_ret";
if (element_type != null)
raw_parms += ", typeof (" + element_type + ")";
sw.WriteLine(s_ret + " ret = " + table.FromNativeReturn(rettype, raw_parms) + ";");
if (retval.ElementType != String.Empty)
raw_parms += ", typeof (" + retval.ElementType + ")";
sw.WriteLine(retval.CSType + " ret = " + table.FromNativeReturn(retval.CType, raw_parms) + ";");
}
body.Finish (sw, indent);
@ -411,7 +396,7 @@ namespace GtkSharp.Generation {
if (is_get && parms != null)
sw.WriteLine (indent + "\t\t\treturn " + parms.AccessorName + ";");
else if (m_ret != "void")
else if (retval.MarshalType != "void")
sw.WriteLine (indent + "\t\t\treturn ret;");
else if (IsAccessor)
body.FinishAccessor (sw, sig, indent);
@ -421,7 +406,7 @@ namespace GtkSharp.Generation {
bool IsAccessor {
get {
return s_ret == "void" && sig.IsAccessor;
return retval.CSType == "void" && sig.IsAccessor;
}
}
}

6
generator/MethodBody.cs
View file

@ -126,12 +126,6 @@ namespace GtkSharp.Generation {
if (is_set)
name = "value";
if (is_get) {
sw.WriteLine (indent + "\t\t\t" + p.CSType + " " + name + ";");
if (p.PassAs != "out" && UsesHandle (gen))
sw.WriteLine(indent + "\t\t\t" + name + " = new " + p.CSType + "();");
}
if ((is_get || p.PassAs == "out") && UsesHandle (gen))
sw.WriteLine(indent + "\t\t\tIntPtr " + name + "_handle;");

35
generator/Signal.cs
View file

@ -31,6 +31,7 @@ namespace GtkSharp.Generation {
private string name;
private XmlElement elem;
private ReturnValue retval;
private Parameters parms;
private ClassBase container_type;
SignalHandler sig_handler;
@ -39,6 +40,7 @@ namespace GtkSharp.Generation {
{
this.elem = elem;
this.name = elem.GetAttribute ("name");
this.retval = new ReturnValue (elem ["return-type"]);
if (elem["parameters"] != null)
parms = new Parameters (elem["parameters"], container_type.NS);
this.container_type = container_type;
@ -65,6 +67,9 @@ namespace GtkSharp.Generation {
if (parms != null && !parms.Validate ())
return false;
if (!retval.Validate ())
return false;
return true;
}
@ -116,25 +121,18 @@ namespace GtkSharp.Generation {
private bool IsVoid {
get {
return ReturnType == "void";
}
}
private string MarshalReturnType {
get {
string ctype = elem ["return-type"].GetAttribute("type");
return SymbolTable.Table.GetMarshalType (ctype);
return retval.CSType == "void";
}
}
private string ReturnGType {
get {
ClassBase igen = SymbolTable.Table.GetClassGen (elem ["return-type"].GetAttribute("type"));
ClassBase igen = SymbolTable.Table.GetClassGen (retval.CType);
if (igen is ObjectGen)
return "GLib.GType.Object";
switch (ReturnType) {
switch (retval.CSType) {
case "bool":
return "GLib.GType.Boolean";
case "string":
@ -142,18 +140,11 @@ namespace GtkSharp.Generation {
case "int":
return "GLib.GType.Int";
default:
throw new Exception (ReturnType);
throw new Exception (retval.CSType);
}
}
}
private string ReturnType {
get {
string ctype = elem ["return-type"].GetAttribute("type");
return SymbolTable.Table.GetCSType (ctype);
}
}
public void GenEventHandler (GenerationInfo gen_info)
{
if (EventHandlerName == "EventHandler")
@ -190,7 +181,7 @@ namespace GtkSharp.Generation {
{
VMSignature vmsig = new VMSignature (parms);
sw.WriteLine ("\t\t[GLib.DefaultSignalHandler(Type=typeof(" + (implementor != null ? implementor.QualifiedName : container_type.QualifiedName) + "), ConnectionMethod=\"Override" + Name +"\")]");
sw.WriteLine ("\t\tprotected virtual {0} {1} ({2})", ReturnType, "On" + Name, vmsig.ToString ());
sw.WriteLine ("\t\tprotected virtual {0} {1} ({2})", retval.CSType, "On" + Name, vmsig.ToString ());
sw.WriteLine ("\t\t{");
if (IsVoid)
sw.WriteLine ("\t\t\tGLib.Value ret = GLib.Value.Empty;");
@ -218,7 +209,7 @@ namespace GtkSharp.Generation {
if (cleanup != "")
sw.WriteLine (cleanup);
if (!IsVoid)
sw.WriteLine ("\t\t\treturn (" + ReturnType + ") ret;");
sw.WriteLine ("\t\t\treturn (" + retval.CSType + ") ret;");
sw.WriteLine ("\t\t}\n");
}
@ -226,9 +217,9 @@ namespace GtkSharp.Generation {
{
ImportSignature isig = new ImportSignature (parms, container_type.NS);
ManagedCallString call = new ManagedCallString (parms);
sw.WriteLine ("\t\tdelegate " + MarshalReturnType + " " + Name + "Delegate (" + isig.ToString () + ");\n");
sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "Delegate (" + isig.ToString () + ");\n");
sw.WriteLine ("\t\tstatic {0} {1};\n", Name + "Delegate", Name + "Callback");
sw.WriteLine ("\t\tstatic " + MarshalReturnType + " " + Name.ToLower() + "_cb (" + isig.ToString () + ")");
sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + Name.ToLower() + "_cb (" + isig.ToString () + ")");
sw.WriteLine ("\t\t{");
sw.WriteLine ("\t\t\t{0} obj = GLib.Object.GetObject ({1}, false) as {0};", implementor != null ? implementor.Name : container_type.Name, parms[0].Name);
sw.Write ("\t\t\t{0}", IsVoid ? "" : "return ");

38
generator/SignalHandler.cs
View file

@ -23,7 +23,6 @@
namespace GtkSharp.Generation {
using System;
using System.Collections;
using System.IO;
using System.Xml;
@ -31,15 +30,14 @@ namespace GtkSharp.Generation {
XmlElement sig;
string ns;
string retval = "";
string s_ret = "";
string p_ret = "";
ReturnValue retval;
Parameters parms = null;
public SignalHandler (XmlElement sig, string ns)
{
this.sig = sig;
this.ns = ns;
retval = new ReturnValue (sig["return-type"]);
XmlElement params_elem = sig["parameters"] as XmlElement;
if (params_elem != null)
parms = new Parameters (params_elem, ns);
@ -47,22 +45,8 @@ namespace GtkSharp.Generation {
public bool Validate ()
{
XmlElement ret_elem = sig["return-type"];
if (ret_elem == null) {
Console.Write("Missing return-type ");
return false;
}
retval = ret_elem.GetAttribute("type");
if (retval == "") {
Console.Write("Invalid return-type ");
return false;
}
s_ret = SymbolTable.Table.GetCSType(retval);
p_ret = SymbolTable.Table.GetMarshalReturnType(retval);
if ((s_ret == "") || (p_ret == "")) {
Console.Write("Funky type: " + retval);
if (!retval.Validate ()) {
Console.Write(" in signal handler " + Name);
return false;
}
@ -89,7 +73,7 @@ namespace GtkSharp.Generation {
private string BaseName {
get {
string result = SymbolTable.Table.GetName (retval);
string result = SymbolTable.Table.GetName (retval.CType);
for (int i = 0; i < parms.Count; i++) {
if (parms[i].Generatable is ObjectGen || parms[i].Generatable is InterfaceGen) {
result += "Object";
@ -130,21 +114,21 @@ namespace GtkSharp.Generation {
sw.WriteLine("\tusing System;");
sw.WriteLine("\tusing System.Runtime.InteropServices;");
sw.WriteLine();
sw.Write("\tinternal delegate " + p_ret + " ");
sw.Write("\tinternal delegate " + retval.MarshalType + " ");
sw.WriteLine(DelegateName + "(" + ISig + ", int key);");
sw.WriteLine();
sw.WriteLine("\tinternal class " + Name + " : GLib.SignalCallback {");
sw.WriteLine();
sw.WriteLine("\t\tprivate static " + DelegateName + " _Delegate;");
sw.WriteLine();
sw.Write("\t\tprivate static " + p_ret + " ");
sw.Write("\t\tprivate static " + retval.MarshalType + " ");
sw.WriteLine(CallbackName + "(" + ISig + ", int key)");
sw.WriteLine("\t\t{");
sw.WriteLine("\t\t\tif (!_Instances.Contains(key))");
sw.WriteLine("\t\t\t\tthrow new Exception(\"Unexpected signal key \" + key);");
sw.WriteLine();
sw.WriteLine("\t\t\t" + Name + " inst = (" + Name + ") _Instances[key];");
if ((s_ret == "void") && (parms.Count == 1)) {
if ((retval.CSType == "void") && (parms.Count == 1)) {
sw.WriteLine("\t\t\tEventHandler h = (EventHandler) inst._handler;");
sw.WriteLine("\t\t\th (inst._obj, new EventArgs ());");
sw.WriteLine("\t\t}");
@ -174,14 +158,14 @@ namespace GtkSharp.Generation {
sw.WriteLine("\t\t\targv[0] = inst._obj;");
sw.WriteLine("\t\t\targv[1] = args;");
sw.WriteLine("\t\t\tinst._handler.DynamicInvoke(argv);");
if (retval != "void") {
if (retval.CSType != "void") {
sw.WriteLine ("\t\t\tif (args.RetVal == null)");
if (s_ret == "bool")
if (retval.CSType == "bool")
sw.WriteLine ("\t\t\t\treturn false;");
else
sw.WriteLine ("\t\t\t\tthrow new Exception(\"args.RetVal unset in callback\");");
sw.WriteLine("\t\t\treturn (" + p_ret + ") " + table.ToNativeReturn (retval, "((" + s_ret + ")args.RetVal)") + ";");
sw.WriteLine("\t\t\treturn (" + retval.MarshalType + ") " + table.ToNativeReturn (retval.CType, "((" + retval.CSType + ")args.RetVal)") + ";");
}
sw.WriteLine("\t\t}");
sw.WriteLine();