luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 19:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle GLib.List, GLib.Error etc

Browse Source 
* girepository/girparser.c: Accept both List (for
	compiling GLib) and GLib.List (what the scanner
	generates).
	* tests/ - Update.
	* tools/generate.c: Generate canonical form.

svn path=/trunk/; revision=522
This commit is contained in:
Colin Walters 2008-08-29 18:19:26 +00:00
parent b31a2ae395
commit a633e4b1f3
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
girparser.c
View File

@ -337,22 +337,26 @@ parse_type_internal (gchar *str, gchar **rest)
if (i < n_basic) if (i < n_basic)
/* found a basic type */; /* found a basic type */;
else if (g_str_has_prefix (*rest, "GList") || else if (g_str_has_prefix (*rest, "GLib.List") ||
g_str_has_prefix (*rest, "GSList")) g_str_has_prefix (*rest, "GLib.SList") ||
g_str_has_prefix (*rest, "List") ||
g_str_has_prefix (*rest, "SList"))
{ {
if (g_str_has_prefix (*rest, "GList")) if (g_str_has_prefix (*rest, "GLib."))
*rest += strlen ("GLib.");
if (g_str_has_prefix (*rest, "List"))
{ {
type->tag = GI_TYPE_TAG_GLIST; type->tag = GI_TYPE_TAG_GLIST;
type->is_glist = TRUE; type->is_glist = TRUE;
type->is_pointer = TRUE; type->is_pointer = TRUE;
*rest += strlen ("GList"); *rest += strlen ("List");
} }
else else
{ {
type->tag = GI_TYPE_TAG_GSLIST; type->tag = GI_TYPE_TAG_GSLIST;
type->is_gslist = TRUE; type->is_gslist = TRUE;
type->is_pointer = TRUE; type->is_pointer = TRUE;
*rest += strlen ("GSList"); *rest += strlen ("SList");
} }
*rest = g_strchug (*rest); *rest = g_strchug (*rest);
@ -376,12 +380,16 @@ parse_type_internal (gchar *str, gchar **rest)
type->parameter_type1 = create_pointer (); type->parameter_type1 = create_pointer ();
} }
} }
else if (g_str_has_prefix (*rest, "GHashTable")) else if (g_str_has_prefix (*rest, "HashTable") ||
g_str_has_prefix (*rest, "GLib.HashTable"))
{ {
if (g_str_has_prefix (*rest, "GLib."))
*rest += strlen ("GLib.");
type->tag = GI_TYPE_TAG_GHASH; type->tag = GI_TYPE_TAG_GHASH;
type->is_ghashtable = TRUE; type->is_ghashtable = TRUE;
type->is_pointer = TRUE; type->is_pointer = TRUE;
*rest += strlen ("GHashTable"); *rest += strlen ("HashTable");
*rest = g_strchug (*rest); *rest = g_strchug (*rest);
@ -414,8 +422,12 @@ parse_type_internal (gchar *str, gchar **rest)
} }
} }
else if (g_str_has_prefix (*rest, "GError")) else if (g_str_has_prefix (*rest, "GLib.Error")
|| g_str_has_prefix (*rest, "Error"))
{ {
if (g_str_has_prefix (*rest, "GLib."))
*rest += strlen ("GLib.");
type->tag = GI_TYPE_TAG_ERROR; type->tag = GI_TYPE_TAG_ERROR;
type->is_error = TRUE; type->is_error = TRUE;
type->is_pointer = TRUE; type->is_pointer = TRUE;