diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-04-20 14:36:11 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2016-04-24 14:34:23 +0200 |
| commit | 23ff87b66beb415b00ec8a8855a1edbbf129f66a (patch) | |
| tree | bdd2a3d9d26f2374e7321b51dcfb19bb548e0a04 /vala | |
| parent | 9e62eefba6feeedc700dfcd72463649bae34fa89 (diff) | |
| download | vala-23ff87b66beb415b00ec8a8855a1edbbf129f66a.tar.gz | |
girparser: Respect "transfer container" and support (unowned type)[] arrays
Diffstat (limited to 'vala')
| -rw-r--r-- | vala/valagirparser.vala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala index e900c6198..257894d86 100644 --- a/vala/valagirparser.vala +++ b/vala/valagirparser.vala @@ -2512,7 +2512,7 @@ public class Vala.GirParser : CodeVisitor { } next (); var element_type = parse_type (); - element_type.value_owned = true; + element_type.value_owned = transfer_elements; end_element ("array"); return new ArrayType (element_type, 1, src); } @@ -2907,6 +2907,7 @@ public class Vala.GirParser : CodeVisitor { start_element ("property"); push_node (element_get_name().replace ("-", "_"), false); bool is_abstract = metadata.get_bool (ArgumentType.ABSTRACT, current.parent.symbol is Interface); + string transfer = reader.get_attribute ("transfer-ownership"); next (); @@ -2914,7 +2915,7 @@ public class Vala.GirParser : CodeVisitor { bool no_array_length; bool array_null_terminated; - var type = parse_type (null, null, false, out no_array_length, out array_null_terminated); + var type = parse_type (null, null, transfer != "container", out no_array_length, out array_null_terminated); type = element_get_type (type, true, ref no_array_length, ref array_null_terminated); var prop = new Property (current.name, type, null, null, current.source_reference); prop.comment = comment; |