From 5404679aba387c5295ae7b50fa1af2259d4b9cf7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 16 Nov 2008 20:58:35 +0000 Subject: Bug 560241 - Out-arguments should not be marked as being pointers in all cases svn path=/trunk/; revision=928 --- ChangeLog | 6 ++++++ girepository/girparser.c | 26 +++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17169772..721a9a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,12 @@ Bug 560241 - Out-arguments should not be marked as being pointers in all cases + * girepository/girparser.c: Improved logic for out arguments. + +2008-11-16 Andreas Rottmann + + Bug 559601 - Pointers in structs/unions unduly treated as arrays + * giscanner/transformer.py: Differentiate type creation logic between parameters and struct components. diff --git a/girepository/girparser.c b/girepository/girparser.c index 65ba2829..ecc2e10f 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -1656,18 +1656,26 @@ start_type (GMarkupParseContext *context, } else { - gboolean is_pointer; + int pointer_depth; name = find_attribute ("name", attribute_names, attribute_values); if (name == NULL) MISSING_ATTRIBUTE (context, error, element_name, "name"); + pointer_depth = 0; ctype = find_attribute ("c:type", attribute_names, attribute_values); - if (ctype != NULL && strchr (ctype, '*')) - is_pointer = TRUE; - else - is_pointer = FALSE; - + if (ctype != NULL) + { + const char *cp = ctype + strlen(ctype) - 1; + while (cp > ctype && *cp-- == '*') + pointer_depth++; + } + + if (ctx->current_typed->type == G_IR_NODE_PARAM && + ((GIrNodeParam *)ctx->current_typed)->out && + pointer_depth > 0) + pointer_depth--; + typenode = parse_type (ctx, name); /* A 'disguised' structure is one where the c:type is a typedef that @@ -1675,10 +1683,10 @@ start_type (GMarkupParseContext *context, */ if (typenode->tag == GI_TYPE_TAG_INTERFACE && is_disguised_structure (ctx, typenode->interface)) - is_pointer = TRUE; + pointer_depth++; - if (is_pointer) - typenode->is_pointer = is_pointer; + if (pointer_depth > 0) + typenode->is_pointer = TRUE; } ctx->type_parameters = g_list_append (ctx->type_parameters, typenode); -- cgit v1.2.1