diff options
| -rw-r--r-- | codegen/valaccodearraymodule.vala | 48 | ||||
| -rw-r--r-- | codegen/valaccodebasemodule.vala | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/arrays/inline-struct.vala | 18 |
4 files changed, 62 insertions, 9 deletions
diff --git a/codegen/valaccodearraymodule.vala b/codegen/valaccodearraymodule.vala index 0192f2cc9..68e77a15e 100644 --- a/codegen/valaccodearraymodule.vala +++ b/codegen/valaccodearraymodule.vala @@ -269,6 +269,36 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule { return cname; } + public override string? append_struct_array_destroy (Struct st) { + string cname = "_vala_%s_array_destroy".printf (get_ccode_name (st)); + + if (cfile.add_declaration (cname)) { + return cname; + } + + var fun = new CCodeFunction (cname, "void"); + fun.modifiers = CCodeModifiers.STATIC; + fun.add_parameter (new CCodeParameter ("array", "%s *".printf (get_ccode_name (st)))); + fun.add_parameter (new CCodeParameter ("array_length", get_ccode_name (int_type))); + + push_function (fun); + + var ccondarr = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("array"), new CCodeConstant ("NULL")); + ccode.open_if (ccondarr); + + ccode.add_declaration (get_ccode_name (int_type), new CCodeVariableDeclarator ("i")); + append_struct_array_free_loop (st); + + ccode.close (); + + pop_function (); + + cfile.add_function_declaration (fun); + cfile.add_function (fun); + + return cname; + } + void append_vala_array_free_loop () { var cforinit = new CCodeAssignment (new CCodeIdentifier ("i"), new CCodeConstant ("0")); var cforcond = new CCodeBinaryExpression (CCodeBinaryOperator.LESS_THAN, new CCodeIdentifier ("i"), new CCodeIdentifier ("array_length")); @@ -477,21 +507,21 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule { } public override CCodeExpression destroy_value (TargetValue value, bool is_macro_definition = false) { - var type = value.value_type; - - if (type is ArrayType) { - var array_type = (ArrayType) type; + unowned ArrayType? array_type = value.value_type as ArrayType; - if (!array_type.fixed_length) { - return base.destroy_value (value, is_macro_definition); + if (array_type != null && array_type.fixed_length) { + unowned Struct? st = array_type.element_type.type_symbol as Struct; + if (st != null && !array_type.element_type.nullable) { + var ccall = new CCodeFunctionCall (new CCodeIdentifier (append_struct_array_destroy (st))); + ccall.add_argument (get_cvalue_ (value)); + ccall.add_argument (get_ccodenode (array_type.length)); + return ccall; } requires_array_free = true; generate_type_declaration (delegate_target_destroy_type, cfile); - var ccall = new CCodeFunctionCall (get_destroy_func_expression (type)); - - ccall = new CCodeFunctionCall (new CCodeIdentifier ("_vala_array_destroy")); + var ccall = new CCodeFunctionCall (new CCodeIdentifier ("_vala_array_destroy")); ccall.add_argument (get_cvalue_ (value)); ccall.add_argument (get_ccodenode (array_type.length)); ccall.add_argument (new CCodeCastExpression (get_destroy_func_expression (array_type.element_type), get_ccode_name (delegate_target_destroy_type))); diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala index 26ddcb7b8..084c5eaba 100644 --- a/codegen/valaccodebasemodule.vala +++ b/codegen/valaccodebasemodule.vala @@ -3606,6 +3606,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator { return destroy_func; } + public virtual string? append_struct_array_destroy (Struct st) { + return null; + } + public virtual string? append_struct_array_free (Struct st) { return null; } diff --git a/tests/Makefile.am b/tests/Makefile.am index b224eb437..c604b2887 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -93,6 +93,7 @@ TESTS = \ arrays/inline-local-instantiation.test \ arrays/inline-local-variable.test \ arrays/inline-parameter.test \ + arrays/inline-struct.vala \ arrays/inline-struct-field.test \ arrays/in-operator-with-boxed-needle.vala \ arrays/length-inline-assignment.vala \ diff --git a/tests/arrays/inline-struct.vala b/tests/arrays/inline-struct.vala new file mode 100644 index 000000000..a8f05103b --- /dev/null +++ b/tests/arrays/inline-struct.vala @@ -0,0 +1,18 @@ +[CCode (has_type_id = false)] +public struct FooStruct { + public uint8 i; + public string s; +} + +void main () { + { + FooStruct array[2]; + array[0] = { 23, "foo"}; + array[1] = { 42, "bar"}; + } + { + GLib.Value array[2]; + array[0].init (typeof (int)); + array[1].init (typeof (string)); + } +} |