support nullable attribute in metadata

2008-01-09  Juerg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala: support nullable attribute in metadata

	* vapi/packages/gtk+-2.0/gtk+-2.0.metadata: set nullable attribute for
	  GtkTreeIter parameters where appropriate

	* vapi/gtk+-2.0.vapi, vapi/pango.vapi: regenerated

svn path=/trunk/; revision=811

diff --git a/ChangeLog b/ChangeLog
index 95e0442..f037bec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-01-09  Jürg Billeter  <j@bitron.ch>
 
+       * vapigen/valagidlparser.vala: support nullable attribute in metadata
+
+       * vapi/packages/gtk+-2.0/gtk+-2.0.metadata: set nullable attribute for
+         GtkTreeIter parameters where appropriate
+
+       * vapi/gtk+-2.0.vapi, vapi/pango.vapi: regenerated
+
+2008-01-09  Jürg Billeter  <j@bitron.ch>
+
        * vala/parser.y, vala/scanner.l, vala/valaclass.vala,
          vala/valacodecontext.vala, vala/valadatatype.vala,
          vala/valainterface.vala, vala/valanulltype.vala,

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index ab1847e..e84a9ef 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -2418,7 +2418,7 @@ namespace Gtk {
                public void store ();
                public weak Gtk.SelectionData wait_for_contents (Gdk.Atom target);
                public weak Gdk.Pixbuf wait_for_image ();
-               public uchar wait_for_rich_text (Gtk.TextBuffer buffer, Gdk.Atom format, ulong length);
+               public uchar wait_for_rich_text (Gtk.TextBuffer buffer, out Gdk.Atom format, ulong length);
                [NoArrayLength]
                public bool wait_for_targets (Gdk.Atom[] targets, int n_targets);
                public weak string wait_for_text ();
@@ -3402,15 +3402,15 @@ namespace Gtk {
                public void append (out Gtk.TreeIter iter);
                public void clear ();
                public void insert (out Gtk.TreeIter iter, int position);
-               public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter sibling);
-               public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter sibling);
+               public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter? sibling);
+               public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter? sibling);
                [CCode (sentinel = "-1")]
                public void insert_with_values (out Gtk.TreeIter iter, int position, ...);
                [NoArrayLength]
                public void insert_with_valuesv (out Gtk.TreeIter iter, int position, int columns, GLib.Value[] values, int n_values);
                public bool iter_is_valid (Gtk.TreeIter iter);
-               public void move_after (Gtk.TreeIter iter, Gtk.TreeIter position);
-               public void move_before (Gtk.TreeIter iter, Gtk.TreeIter position);
+               public void move_after (Gtk.TreeIter iter, Gtk.TreeIter? position);
+               public void move_before (Gtk.TreeIter iter, Gtk.TreeIter? position);
                public ListStore (int n_columns, ...);
                [NoArrayLength]
                [CCode (cname = "gtk_list_store_newv")]
@@ -5256,27 +5256,27 @@ namespace Gtk {
                public pointer default_sort_data;
                public Gtk.DestroyNotify default_sort_destroy;
                public uint columns_dirty;
-               public void append (out Gtk.TreeIter iter, Gtk.TreeIter parent);
+               public void append (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
                public void clear ();
-               public void insert (out Gtk.TreeIter iter, Gtk.TreeIter parent, int position);
-               public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter parent, Gtk.TreeIter sibling);
-               public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter parent, Gtk.TreeIter sibling);
+               public void insert (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position);
+               public void insert_after (out Gtk.TreeIter iter, Gtk.TreeIter? parent, Gtk.TreeIter? sibling);
+               public void insert_before (out Gtk.TreeIter iter, Gtk.TreeIter? parent, Gtk.TreeIter? sibling);
                [CCode (sentinel = "-1")]
-               public void insert_with_values (out Gtk.TreeIter iter, Gtk.TreeIter parent, int position, ...);
+               public void insert_with_values (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position, ...);
                [NoArrayLength]
-               public void insert_with_valuesv (out Gtk.TreeIter iter, Gtk.TreeIter parent, int position, int columns, GLib.Value[] values, int n_values);
+               public void insert_with_valuesv (out Gtk.TreeIter iter, Gtk.TreeIter? parent, int position, int columns, GLib.Value[] values, int n_values);
                public bool is_ancestor (Gtk.TreeIter iter, Gtk.TreeIter descendant);
                public int iter_depth (Gtk.TreeIter iter);
                public bool iter_is_valid (Gtk.TreeIter iter);
-               public void move_after (Gtk.TreeIter iter, Gtk.TreeIter position);
-               public void move_before (Gtk.TreeIter iter, Gtk.TreeIter position);
+               public void move_after (Gtk.TreeIter iter, Gtk.TreeIter? position);
+               public void move_before (Gtk.TreeIter iter, Gtk.TreeIter? position);
                public TreeStore (int n_columns, ...);
                [NoArrayLength]
                [CCode (cname = "gtk_tree_store_newv")]
                public TreeStore.newv (int n_columns, GLib.Type[] types);
-               public void prepend (out Gtk.TreeIter iter, Gtk.TreeIter parent);
+               public void prepend (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
                public bool remove (Gtk.TreeIter iter);
-               public void reorder (Gtk.TreeIter parent, int new_order);
+               public void reorder (Gtk.TreeIter? parent, int new_order);
                [CCode (sentinel = "-1")]
                public void set (Gtk.TreeIter iter, ...);
                [NoArrayLength]
@@ -5950,9 +5950,9 @@ namespace Gtk {
                public string get_string_from_iter (Gtk.TreeIter iter);
                public void get_valist (Gtk.TreeIter iter, pointer var_args);
                public abstract void get_value (Gtk.TreeIter iter, int column, GLib.Value value);
-               public abstract bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter parent);
+               public abstract bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
                public abstract bool iter_has_child (Gtk.TreeIter iter);
-               public abstract int iter_n_children (Gtk.TreeIter iter);
+               public abstract int iter_n_children (Gtk.TreeIter? iter);
                public abstract bool iter_next (ref Gtk.TreeIter iter);
                public abstract bool iter_nth_child (out Gtk.TreeIter iter, Gtk.TreeIter parent, int n);
                public abstract bool iter_parent (out Gtk.TreeIter iter, Gtk.TreeIter child);
@@ -6166,7 +6166,7 @@ namespace Gtk {
        public static delegate void ClipboardImageReceivedFunc (Gtk.Clipboard clipboard, Gdk.Pixbuf pixbuf, pointer data);
        public static delegate void ClipboardReceivedFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, pointer data);
        public static delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, uchar text, ulong length, pointer data);
-       public static delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom atoms, int n_atoms, pointer data);
+       public static delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, out Gdk.Atom atoms, int n_atoms, pointer data);
        public static delegate void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string text, pointer data);
        public static delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors);
        public static delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 3575ec6..7ecf60a 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -71,10 +71,14 @@ gtk_list_store_new ellipsis="1"
 gtk_list_store_append.iter is_out="1"
 gtk_list_store_insert.iter is_out="1"
 gtk_list_store_insert_after.iter is_out="1"
+gtk_list_store_insert_after.sibling nullable="1"
 gtk_list_store_insert_before.iter is_out="1"
+gtk_list_store_insert_before.sibling nullable="1"
 gtk_list_store_insert_with_values ellipsis="1" sentinel="-1"
 gtk_list_store_insert_with_values.iter is_out="1"
 gtk_list_store_insert_with_valuesv.iter is_out="1"
+gtk_list_store_move_after.position nullable="1"
+gtk_list_store_move_before.position nullable="1"
 gtk_list_store_prepend.iter is_out="1"
 gtk_list_store_set ellipsis="1" sentinel="-1"
 GtkMenuItem::activate has_emitter="1"
@@ -164,8 +168,11 @@ gtk_tree_model_get_iter_from_string.iter is_out="1"
 gtk_tree_model_get_path transfer_ownership="1"
 gtk_tree_model_get_string_from_iter transfer_ownership="1"
 gtk_tree_model_iter_children.iter is_out="1"
+gtk_tree_model_iter_children.parent nullable="1"
+gtk_tree_model_iter_n_children.iter nullable="1"
 gtk_tree_model_iter_next.iter is_ref="1"
 gtk_tree_model_iter_nth_child.iter is_out="1"
+gtk_tree_model_iter_nth_children.parent nullable="1"
 gtk_tree_model_iter_parent.iter is_out="1"
 GtkTreeModel::row_changed has_emitter="1"
 GtkTreeModel::row_deleted has_emitter="1"
@@ -183,13 +190,25 @@ gtk_tree_row_reference_reordered.new_order is_array="1"
 gtk_tree_selection_get_selected.iter is_out="1"
 gtk_tree_store_new ellipsis="1"
 gtk_tree_store_append.iter is_out="1"
+gtk_tree_store_append.parent nullable="1"
 gtk_tree_store_insert.iter is_out="1"
+gtk_tree_store_insert.parent nullable="1"
 gtk_tree_store_insert_after.iter is_out="1"
+gtk_tree_store_insert_after.parent nullable="1"
+gtk_tree_store_insert_after.sibling nullable="1"
 gtk_tree_store_insert_before.iter is_out="1"
+gtk_tree_store_insert_before.parent nullable="1"
+gtk_tree_store_insert_before.sibling nullable="1"
 gtk_tree_store_insert_with_values ellipsis="1" sentinel="-1"
 gtk_tree_store_insert_with_values.iter is_out="1"
+gtk_tree_store_insert_with_values.parent nullable="1"
 gtk_tree_store_insert_with_valuesv.iter is_out="1"
+gtk_tree_store_insert_with_valuesv.parent nullable="1"
+gtk_tree_store_move_after.position nullable="1"
+gtk_tree_store_move_before.position nullable="1"
 gtk_tree_store_prepend.iter is_out="1"
+gtk_tree_store_prepend.parent nullable="1"
+gtk_tree_store_reorder.parent nullable="1"
 gtk_tree_store_set ellipsis="1" sentinel="-1"
 GtkTreeSortable::sort_column_changed has_emitter="1"
 gtk_tree_view_column_cell_get_size.cell_area is_out="1"

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 91a3524..cfd5090 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -214,7 +214,7 @@ namespace Pango {
        }
        [CCode (cheader_filename = "pango/pango.h")]
        public class Language : GLib.Boxed {
-               public weak string! to_string ();
+               public weak string to_string ();
                public Language ();
                public static weak Pango.Language from_string (string language);
                public static weak Pango.Language get_default ();

diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 764e099..322d7ff 100644 (file)
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1256,6 +1256,10 @@ public class Vala.GIdlParser : CodeVisitor {
                                                if (eval (nv[1]) == "1") {
                                                        param_type.is_ref = true;
                                                }
+                                       } else if (nv[0] == "nullable") {
+                                               if (eval (nv[1]) == "1") {
+                                                       param_type.nullable = true;
+                                               }
                                        }
                                }
                        }