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

Look in c:type to determine pointer nature

Browse Source 
* girepository/girparser.c: Look at c:type to determine
	whether or not an item is a pointer.

svn path=/trunk/; revision=571
This commit is contained in:
Colin Walters 2008-09-01 18:52:34 +00:00
parent ae48f17999
commit 71473eb033
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
girparser.c
View File

@ -330,11 +330,6 @@ parse_type_internal (const gchar *str, char **next, gboolean in_glib)
type->is_pointer = basic->pointer; type->is_pointer = basic->pointer;
str += strlen(basic->str); str += strlen(basic->str);
if (*str == '*' && !type->is_pointer)
{
type->is_pointer = TRUE;
(str)++;
}
} }
else if (in_glib) else if (in_glib)
{ {
@ -484,12 +479,6 @@ parse_type_internal (const gchar *str, char **next, gboolean in_glib)
(str)++; (str)++;
type->interface = g_strndup (start, str - start); type->interface = g_strndup (start, str - start);
if (*str == '*')
{
type->is_pointer = TRUE;
(str)++;
}
} }
if (g_str_has_prefix (str, "[")) if (g_str_has_prefix (str, "["))
@ -1552,6 +1541,9 @@ start_type (GMarkupParseContext *context,
GError **error) GError **error)
{ {
const gchar *name; const gchar *name;
const gchar *ctype;
gboolean is_pointer;
GIrNodeType *typenode;
if (strcmp (element_name, "type") != 0) if (strcmp (element_name, "type") != 0)
return FALSE; return FALSE;
@ -1593,31 +1585,41 @@ start_type (GMarkupParseContext *context,
if (name == NULL) if (name == NULL)
MISSING_ATTRIBUTE (context, error, element_name, "name"); MISSING_ATTRIBUTE (context, error, element_name, "name");
ctype = find_attribute ("c:type", attribute_names, attribute_values);
if (ctype != NULL && strchr (ctype, '*'))
is_pointer = TRUE;
else
is_pointer = FALSE;
typenode = parse_type (ctx, name);
if (is_pointer)
typenode->is_pointer = is_pointer;
switch (ctx->current_typed->type) switch (ctx->current_typed->type)
{ {
case G_IR_NODE_PARAM: case G_IR_NODE_PARAM:
{ {
GIrNodeParam *param = (GIrNodeParam *)ctx->current_typed; GIrNodeParam *param = (GIrNodeParam *)ctx->current_typed;
param->type = parse_type (ctx, name); param->type = typenode;
} }
break; break;
case G_IR_NODE_FIELD: case G_IR_NODE_FIELD:
{ {
GIrNodeField *field = (GIrNodeField *)ctx->current_typed; GIrNodeField *field = (GIrNodeField *)ctx->current_typed;
field->type = parse_type (ctx, name); field->type = typenode;
} }
break; break;
case G_IR_NODE_PROPERTY: case G_IR_NODE_PROPERTY:
{ {
GIrNodeProperty *property = (GIrNodeProperty *) ctx->current_typed; GIrNodeProperty *property = (GIrNodeProperty *) ctx->current_typed;
property->type = parse_type (ctx, name); property->type = typenode;
} }
break; break;
case G_IR_NODE_CONSTANT: case G_IR_NODE_CONSTANT:
{ {
GIrNodeConstant *constant = (GIrNodeConstant *)ctx->current_typed; GIrNodeConstant *constant = (GIrNodeConstant *)ctx->current_typed;
constant->type = parse_type (ctx, name); constant->type = typenode;
} }
break; break;
default: default:
@ -1625,6 +1627,7 @@ start_type (GMarkupParseContext *context,
g_assert_not_reached (); g_assert_not_reached ();
} }
ctx->current_typed = NULL; ctx->current_typed = NULL;
return TRUE; return TRUE;
} }