diff options
| -rw-r--r-- | giscanner/minixpath.py | 6 | ||||
| -rw-r--r-- | tools/generate.c | 19 |
2 files changed, 16 insertions, 9 deletions
diff --git a/giscanner/minixpath.py b/giscanner/minixpath.py index a14afa90..b142e8b6 100644 --- a/giscanner/minixpath.py +++ b/giscanner/minixpath.py @@ -49,11 +49,15 @@ def myxpath(node, expr): if not curnodes: return None found = True + #print "LOOKING %d nodes" % (len(curnodes), ) for node in curnodes: + #print "LOOKING: %r expecting: %r attrib: %r" \ + # % (node, exp_attrs, node.attrib) passes = True - for (name, val) in exp_attrs: + for name, val in exp_attrs: a = node.attrib.get(name) if not a or a != val: + #print "ATTR FAIL: %r=%r" % (val, a) passes = False break if passes: diff --git a/tools/generate.c b/tools/generate.c index f10bdf91..dca2cdac 100644 --- a/tools/generate.c +++ b/tools/generate.c @@ -100,9 +100,9 @@ write_type_info (const gchar *namespace, else g_fprintf (file, "%s", "none"); } - else if (tag < 20) + else if (tag < GI_TYPE_TAG_ARRAY) g_fprintf (file, "%s", basic[tag]); - else if (tag == 20) + else if (tag == GI_TYPE_TAG_ARRAY) { gint length; @@ -121,13 +121,13 @@ write_type_info (const gchar *namespace, g_fprintf (file, "]"); g_base_info_unref ((GIBaseInfo *)type); } - else if (tag == 21) + else if (tag == GI_TYPE_TAG_INTERFACE) { GIBaseInfo *iface = g_type_info_get_interface (info); write_type_name (namespace, iface, file); g_base_info_unref (iface); } - else if (tag == 22) + else if (tag == GI_TYPE_TAG_GLIST) { type = g_type_info_get_param_type (info, 0); g_fprintf (file, "GLib.List"); @@ -139,7 +139,7 @@ write_type_info (const gchar *namespace, g_base_info_unref ((GIBaseInfo *)type); } } - else if (tag == 23) + else if (tag == GI_TYPE_TAG_GSLIST) { type = g_type_info_get_param_type (info, 0); g_fprintf (file, "GLib.SList"); @@ -151,7 +151,7 @@ write_type_info (const gchar *namespace, g_base_info_unref ((GIBaseInfo *)type); } } - else if (tag == 24) + else if (tag == GI_TYPE_TAG_GHASH) { type = g_type_info_get_param_type (info, 0); g_fprintf (file, "GLib.HashTable"); @@ -167,7 +167,7 @@ write_type_info (const gchar *namespace, g_base_info_unref ((GIBaseInfo *)type); } } - else if (tag == 25) + else if (tag == GI_TYPE_TAG_ERROR) { gint n; @@ -188,7 +188,10 @@ write_type_info (const gchar *namespace, } } else - g_assert_not_reached (); + { + g_printerr ("Unhandled type tag %d\n", tag); + g_assert_not_reached (); + } } static void |