← Back to branch summary

~ubuntu-branches/ubuntu/vivid/vala/vivid

« back to all changes in this revision

Viewing changes to codegen/valagvariantmodule.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-07-28 07:58:01 UTC
  • mfrom: (1.5.5 upstream) (7.3.14 experimental)
  • Revision ID: james.westby@ubuntu.com-20100728075801-18u9cg5hv5oety6m
Tags: 0.9.4-1
New upstream development release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
codegen/valagvariantmodule.c
263
263
        void (*visit_enum) (ValaCCodeModule* self, ValaEnum* en);
264
264
        void (*visit_error_domain) (ValaCCodeModule* self, ValaErrorDomain* edomain);
265
265
        void (*visit_delegate) (ValaCCodeModule* self, ValaDelegate* d);
266
 
        void (*visit_member) (ValaCCodeModule* self, ValaMember* m);
 
266
        void (*visit_member) (ValaCCodeModule* self, ValaSymbol* m);
267
267
        void (*visit_constant) (ValaCCodeModule* self, ValaConstant* c);
268
268
        void (*visit_field) (ValaCCodeModule* self, ValaField* f);
269
269
        void (*visit_method) (ValaCCodeModule* self, ValaMethod* m);
890
890
                                                        f = (ValaField*) vala_iterator_get (_f_it);
891
891
                                                        if (vala_field_get_binding (f) == MEMBER_BINDING_INSTANCE) {
892
892
                                                                char* _tmp9_;
893
 
                                                                g_string_append (str, _tmp9_ = vala_gvariant_module_get_type_signature (vala_field_get_field_type (f), NULL));
 
893
                                                                g_string_append (str, _tmp9_ = vala_gvariant_module_get_type_signature (vala_variable_get_variable_type ((ValaVariable*) f), NULL));
894
894
                                                                _g_free0 (_tmp9_);
895
895
                                                        }
896
896
                                                        _vala_code_node_unref0 (f);
1187
1187
                        enum_value = (ValaEnumValue*) vala_iterator_get (_enum_value_it);
1188
1188
                        true_block = vala_ccode_block_new ();
1189
1189
                        vala_ccode_block_set_suppress_newline (true_block, TRUE);
1190
 
                        vala_ccode_block_add_statement (true_block, (ValaCCodeNode*) (_tmp14_ = vala_ccode_expression_statement_new ((ValaCCodeExpression*) (_tmp13_ = vala_ccode_assignment_new ((ValaCCodeExpression*) (_tmp10_ = vala_ccode_identifier_new ("value")), (ValaCCodeExpression*) (_tmp12_ = vala_ccode_identifier_new (_tmp11_ = vala_enum_value_get_cname (enum_value))), VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE)))));
 
1190
                        vala_ccode_block_add_statement (true_block, (ValaCCodeNode*) (_tmp14_ = vala_ccode_expression_statement_new ((ValaCCodeExpression*) (_tmp13_ = vala_ccode_assignment_new ((ValaCCodeExpression*) (_tmp10_ = vala_ccode_identifier_new ("value")), (ValaCCodeExpression*) (_tmp12_ = vala_ccode_identifier_new (_tmp11_ = vala_constant_get_cname ((ValaConstant*) enum_value))), VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE)))));
1191
1191
                        _vala_ccode_node_unref0 (_tmp14_);
1192
1192
                        _vala_ccode_node_unref0 (_tmp13_);
1193
1193
                        _vala_ccode_node_unref0 (_tmp12_);
1586
1586
                                continue;
1587
1587
                        }
1588
1588
                        field_found = TRUE;
1589
 
                        vala_gvariant_module_read_expression (self, fragment, vala_field_get_field_type (f), (ValaCCodeExpression*) (_tmp12_ = vala_ccode_identifier_new (subiter_name)), (ValaCCodeExpression*) (_tmp15_ = vala_ccode_member_access_new ((ValaCCodeExpression*) (_tmp13_ = vala_ccode_identifier_new (temp_name)), _tmp14_ = vala_field_get_cname (f), FALSE)), (ValaSymbol*) f);
 
1589
                        vala_gvariant_module_read_expression (self, fragment, vala_variable_get_variable_type ((ValaVariable*) f), (ValaCCodeExpression*) (_tmp12_ = vala_ccode_identifier_new (subiter_name)), (ValaCCodeExpression*) (_tmp15_ = vala_ccode_member_access_new ((ValaCCodeExpression*) (_tmp13_ = vala_ccode_identifier_new (temp_name)), _tmp14_ = vala_field_get_cname (f), FALSE)), (ValaSymbol*) f);
1590
1590
                        _vala_ccode_node_unref0 (_tmp15_);
1591
1591
                        _g_free0 (_tmp14_);
1592
1592
                        _vala_ccode_node_unref0 (_tmp13_);
2056
2056
                        }
2057
2057
                        enum_value = (ValaEnumValue*) vala_iterator_get (_enum_value_it);
2058
2058
                        dbus_value = vala_gvariant_module_get_dbus_value (self, enum_value, vala_symbol_get_name ((ValaSymbol*) enum_value));
2059
 
                        vala_ccode_block_add_statement ((ValaCCodeBlock*) cswitch, (ValaCCodeNode*) (_tmp11_ = vala_ccode_case_statement_new ((ValaCCodeExpression*) (_tmp10_ = vala_ccode_identifier_new (_tmp9_ = vala_enum_value_get_cname (enum_value))))));
 
2059
                        vala_ccode_block_add_statement ((ValaCCodeBlock*) cswitch, (ValaCCodeNode*) (_tmp11_ = vala_ccode_case_statement_new ((ValaCCodeExpression*) (_tmp10_ = vala_ccode_identifier_new (_tmp9_ = vala_constant_get_cname ((ValaConstant*) enum_value))))));
2060
2060
                        _vala_ccode_node_unref0 (_tmp11_);
2061
2061
                        _vala_ccode_node_unref0 (_tmp10_);
2062
2062
                        _g_free0 (_tmp9_);
2310
2310
                                continue;
2311
2311
                        }
2312
2312
                        field_found = TRUE;
2313
 
                        vala_gvariant_module_write_expression (self, fragment, vala_field_get_field_type (f), (ValaCCodeExpression*) (_tmp9_ = vala_ccode_identifier_new (builder_name)), (ValaCCodeExpression*) (_tmp11_ = vala_ccode_member_access_new (struct_expr, _tmp10_ = vala_field_get_cname (f), FALSE)), (ValaSymbol*) f);
 
2313
                        vala_gvariant_module_write_expression (self, fragment, vala_variable_get_variable_type ((ValaVariable*) f), (ValaCCodeExpression*) (_tmp9_ = vala_ccode_identifier_new (builder_name)), (ValaCCodeExpression*) (_tmp11_ = vala_ccode_member_access_new (struct_expr, _tmp10_ = vala_field_get_cname (f), FALSE)), (ValaSymbol*) f);
2314
2314
                        _vala_ccode_node_unref0 (_tmp11_);
2315
2315
                        _g_free0 (_tmp10_);
2316
2316
                        _vala_ccode_node_unref0 (_tmp9_);