From d1367eb5156925d4f5fd94730bc3335e73fa9f30 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Mon, 19 Jan 2004 05:30:05 +0000
Subject: [PATCH] 2004-01-18 Mike Kestner <mkestner@ximian.com>
* generator/Field.cs : refactored code from StructBase
* generator/StructBase.cs : spin off Field class
svn path=/trunk/gtk-sharp/; revision=22239
---
ChangeLog | 5 ++
generator/Field.cs | 150 ++++++++++++++++++++++++++++++++++++++++
generator/StructBase.cs | 128 ++++------------------------------
3 files changed, 168 insertions(+), 115 deletions(-)
create mode 100644 generator/Field.cs
diff --git a/ChangeLog b/ChangeLog
index bafd54df4..f4855af3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-18 Mike Kestner <mkestner@ximian.com>
+
+ * generator/Field.cs : refactored code from StructBase
+ * generator/StructBase.cs : spin off Field class
+
2004-01-18 Mike Kestner <mkestner@ximian.com>
* generator/SymbolTable.cs : mangle parms named readonly
diff --git a/generator/Field.cs b/generator/Field.cs
new file mode 100644
index 000000000..d09f34be0
--- /dev/null
+++ b/generator/Field.cs
@@ -0,0 +1,150 @@
+// GtkSharp.Generation.Field.cs - The Field generation Class.
+//
+// Author: Mike Kestner <mkestner@ximian.com>
+//
+// (c) 2004 Novell, Inc.
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+ using System.Xml;
+
+ public class Field {
+
+ public static int bitfields;
+
+ XmlElement elem;
+
+ public Field (XmlElement elem)
+ {
+ this.elem = elem;
+ }
+
+ public string CSType {
+ get {
+ string type = SymbolTable.Table.GetCSType (CType);
+ if (IsArray)
+ // FIXME
+ type = "IntPtr";
+ else if (IsBit)
+ type = "uint";
+ else if ((IsPointer || SymbolTable.Table.IsOpaque (CType)) && type != "string")
+ type = "IntPtr";
+ else if (SymbolTable.Table.IsCallback (CType))
+ type = "IntPtr";
+
+ return type;
+ }
+ }
+
+ public string CType {
+ get {
+ return elem.GetAttribute ("type");
+ }
+ }
+
+ public bool IsArray {
+ get {
+ return elem.HasAttribute("array_len");
+ }
+ }
+
+ public bool IsBit {
+ get {
+ return (elem.HasAttribute("bits") && (elem.GetAttribute("bits") == "1"));
+ }
+ }
+
+ public bool IsPadding {
+ get {
+ string c_name = elem.GetAttribute ("cname");
+ return (c_name.StartsWith ("dummy"));
+ }
+ }
+
+ public bool IsPointer {
+ get {
+ return (CType.EndsWith ("*") || CType.EndsWith ("pointer"));
+ }
+ }
+
+ public string Name {
+ get {
+ string result = "";
+ if ((IsPointer || SymbolTable.Table.IsOpaque (CType)) && CSType != "string")
+ result = "_";
+
+ if (IsBit)
+ result = String.Format ("_bitfield{0}", bitfields++);
+ else
+ result += SymbolTable.Table.MangleName (elem.GetAttribute ("cname"));
+
+ return result;
+ }
+ }
+
+ public string Protection {
+ get {
+ if (IsArray)
+ // FIXME
+ return "private";
+ else if (IsBit || IsPadding || SymbolTable.Table.IsCallback (CType))
+ return "private";
+ else if ((IsPointer || SymbolTable.Table.IsOpaque (CType)) && CSType != "string")
+ return "private";
+ else
+ return "public";
+ }
+ }
+
+ public bool Generate (StreamWriter sw)
+ {
+ if (CSType == "") {
+ Console.WriteLine ("Field has unknown Type {0}", CType);
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ SymbolTable table = SymbolTable.Table;
+
+ // FIXME
+ if (IsArray)
+ Console.WriteLine ("warning: array field {0} probably incorrectly generated", Name);
+ sw.WriteLine ("\t\t{0} {1} {2};", Protection, CSType, table.MangleName (Name));
+
+
+ string wrapped = table.GetCSType (CType);
+ string wrapped_name = SymbolTable.Table.MangleName (elem.GetAttribute ("cname"));
+ if (table.IsObject (CType)) {
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
+ sw.WriteLine ("\t\t\tget { ");
+ sw.WriteLine ("\t\t\t\t" + wrapped + " ret = " + table.FromNativeReturn(CType, Name) + ";");
+ sw.WriteLine ("\t\t\t\treturn ret;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t\tset { " + Name + " = " + table.CallByName (CType, "value") + "; }");
+ sw.WriteLine ("\t\t}");
+ } else if (table.IsOpaque (CType)) {
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
+ sw.WriteLine ("\t\t\tget { ");
+ sw.WriteLine ("\t\t\t\t" + wrapped + " ret = " + table.FromNativeReturn(CType, Name) + ";");
+ sw.WriteLine ("\t\t\t\tif (ret == null) ret = new " + wrapped + "(" + Name + ");");
+ sw.WriteLine ("\t\t\t\treturn ret;");
+ sw.WriteLine ("\t\t\t}");
+
+ sw.WriteLine ("\t\t\tset { " + Name + " = " + table.CallByName (CType, "value") + "; }");
+ sw.WriteLine ("\t\t}");
+ } else if (IsPointer && (table.IsStruct (CType) || table.IsBoxed (CType))) {
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
+ sw.WriteLine ("\t\t\tget { return " + table.FromNativeReturn (CType, Name) + "; }");
+ sw.WriteLine ("\t\t}");
+ }
+
+ return true;
+ }
+ }
+}
+
diff --git a/generator/StructBase.cs b/generator/StructBase.cs
index 8fc59856d..0c68320d4 100644
--- a/generator/StructBase.cs
+++ b/generator/StructBase.cs
@@ -15,7 +15,6 @@ namespace GtkSharp.Generation {
public class StructBase : ClassBase {
ArrayList fields = new ArrayList ();
- uint bitfields;
public StructBase (XmlElement ns, XmlElement elem) : base (ns, elem)
{
@@ -43,168 +42,67 @@ namespace GtkSharp.Generation {
}
}
- public override String MarshalType {
+ public override string MarshalType {
get
{
return "ref " + QualifiedName;
}
}
- public override String MarshalReturnType {
+ public override string MarshalReturnType {
get
{
return "IntPtr";
}
}
- public override String CallByName (String var_name)
+ public override string CallByName (string var_name)
{
return "ref " + var_name;
}
- public override String CallByName ()
+ public override string CallByName ()
{
return "ref this";
}
- public override String AssignToName {
+ public override string AssignToName {
get { return "raw"; }
}
- public override String FromNative(String var)
+ public override string FromNative(string var)
{
return var;
}
- public override String FromNativeReturn(String var)
+ public override string FromNativeReturn(string var)
{
return QualifiedName + ".New (" + var + ")";
}
- public override String ToNativeReturn(String var)
+ public override string ToNativeReturn(string var)
{
// FIXME
return var;
}
- bool IsBit (XmlElement field)
- {
- return (field.HasAttribute("bits") && (field.GetAttribute("bits") == "1"));
- }
-
- bool IsPointer (XmlElement field)
- {
- string c_type = field.GetAttribute("type");
- return (c_type.EndsWith ("*") || c_type.EndsWith ("pointer"));
- }
-
- bool IsPadding (XmlElement field)
- {
- string c_name = field.GetAttribute ("cname");
- return (c_name.StartsWith ("dummy"));
- }
-
protected void GenFields (StreamWriter sw)
{
- bitfields = 0;
+ Field.bitfields = 0;
bool need_field = true;
- foreach (XmlElement field in fields) {
- if (IsBit (field)) {
+ foreach (XmlElement field_elem in fields) {
+ Field field = new Field (field_elem);
+ if (field.IsBit) {
if (need_field)
need_field = false;
else
continue;
} else
need_field = true;
- GenField (field, sw);
+ field.Generate (sw);
}
}
- protected bool GetFieldInfo (XmlElement field, out string c_type, out string type, out string name, out string protection)
- {
- name = "";
- protection = "";
- c_type = field.GetAttribute ("type");
- type = SymbolTable.Table.GetCSType (c_type);
- if (IsBit (field)) {
- type = "uint";
- protection = "private";
- } else if ((IsPointer (field) || SymbolTable.Table.IsOpaque (c_type)) && type != "string") {
- type = "IntPtr";
- name = "_";
- protection = "private";
- } else if (SymbolTable.Table.IsCallback (c_type)) {
- type = "IntPtr";
- protection = "private";
- } else if (IsPadding (field)) {
- protection = "private";
- } else {
- if (type == "") {
- Console.WriteLine ("Field has unknown Type {0}", c_type);
- Statistics.ThrottledCount++;
- return false;
- }
-
- protection = "public";
- }
-
- // FIXME: marshalling not implemented here in mono
- if (field.HasAttribute("array_len")) {
- type = "IntPtr";
- protection = "private";
- }
-
- if (IsBit (field))
- name = String.Format ("_bitfield{0}", bitfields++);
- else
- name += SymbolTable.Table.MangleName (field.GetAttribute ("cname"));
-
- return true;
- }
-
- protected bool GenField (XmlElement field, StreamWriter sw)
- {
- string c_type, type, name, protection;
- if (!GetFieldInfo (field, out c_type, out type, out name, out protection))
- return false;
- sw.WriteLine ("\t\t{0} {1} {2};", protection, type, SymbolTable.Table.MangleName (name));
-
- if (field.HasAttribute("array_len"))
- Console.WriteLine ("warning: array field {0}.{1} probably incorrectly generated", QualifiedName, name);
- SymbolTable table = SymbolTable.Table;
-
- string wrapped = table.GetCSType (c_type);
- string wrapped_name = SymbolTable.Table.MangleName (field.GetAttribute ("cname"));
- if (table.IsObject (c_type)) {
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
- sw.WriteLine ("\t\t\tget { ");
- sw.WriteLine ("\t\t\t\t" + wrapped + " ret = " + table.FromNativeReturn(c_type, name) + ";");
- sw.WriteLine ("\t\t\t\treturn ret;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t\tset { " + name + " = " + table.CallByName (c_type, "value") + "; }");
- sw.WriteLine ("\t\t}");
- } else if (table.IsOpaque (c_type)) {
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
- sw.WriteLine ("\t\t\tget { ");
- sw.WriteLine ("\t\t\t\t" + wrapped + " ret = " + table.FromNativeReturn(c_type, name) + ";");
- sw.WriteLine ("\t\t\t\tif (ret == null) ret = new " + wrapped + "(" + name + ");");
- sw.WriteLine ("\t\t\t\treturn ret;");
- sw.WriteLine ("\t\t\t}");
-
- sw.WriteLine ("\t\t\tset { " + name + " = " + table.CallByName (c_type, "value") + "; }");
- sw.WriteLine ("\t\t}");
- } else if (IsPointer (field) && (table.IsStruct (c_type) || table.IsBoxed (c_type))) {
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic " + wrapped + " " + wrapped_name + " {");
- sw.WriteLine ("\t\t\tget { return " + table.FromNativeReturn (c_type, name) + "; }");
- sw.WriteLine ("\t\t}");
- }
-
- return true;
- }
-
public virtual void Generate (GenerationInfo gen_info)
{
bool need_close = false;