codegen: Replace emit_property_assignment by store_property

diff --git a/codegen/valaccodeassignmentmodule.vala b/codegen/valaccodeassignmentmodule.vala
index 60fc04094861ad319c6d473c09572c56debc9968..7f20bc3076506acc53ad8687bf23006d10d30047 100644 (file)
--- a/codegen/valaccodeassignmentmodule.vala
+++ b/codegen/valaccodeassignmentmodule.vala
@@ -28,34 +28,6 @@ using GLib;
  * The link between an assignment and generated code.
  */
 public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
-       CCodeExpression? emit_property_assignment (Assignment assignment) {
-               var ma = assignment.left as MemberAccess;
-
-               var prop = (Property) assignment.left.symbol_reference;
-
-               if (!(prop is DynamicProperty)) {
-                       generate_property_accessor_declaration (prop.set_accessor, cfile);
-
-                       if (!prop.external && prop.external_package) {
-                               // internal VAPI properties
-                               // only add them once per source file
-                               if (add_generated_external_symbol (prop)) {
-                                       visit_property (prop);
-                               }
-                       }
-               }
-
-               CCodeExpression cexpr = get_cvalue (assignment.right);
-
-               if (prop.property_type.is_real_non_null_struct_type ()) {
-                       cexpr = get_address_of_expression (assignment.right, cexpr);
-               }
-
-               store_property (prop, ma, cexpr, assignment.right);
-
-               return get_ccodenode (assignment.right);
-       }
-
        CCodeExpression? emit_simple_assignment (Assignment assignment) {
                CCodeExpression rhs = get_cvalue (assignment.right);
                CCodeExpression lhs = (CCodeExpression) get_ccodenode (assignment.left);
@@ -183,7 +155,12 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
                }
 
                if (assignment.left.symbol_reference is Property) {
-                       set_cvalue (assignment, emit_property_assignment (assignment));
+                       var ma = assignment.left as MemberAccess;
+                       var prop = (Property) assignment.left.symbol_reference;
+
+                       store_property (prop, ma.inner, assignment.right.target_value);
+
+                       set_cvalue (assignment, get_ccodenode (assignment.right));
                } else {
                        var array_type = assignment.left.value_type as ArrayType;
                        if (array_type != null && array_type.fixed_length) {

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 86fe786b14f7730d6f1e7d949b6c0c291e3f4814..48d89ebcc320ff71b6ea325ba2d83301c932fb22 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -3717,7 +3717,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        // increment/decrement property
                        var op = expr.increment ? CCodeBinaryOperator.PLUS : CCodeBinaryOperator.MINUS;
                        var cexpr = new CCodeBinaryExpression (op, get_variable_cexpression (temp_decl.name), new CCodeConstant ("1"));
-                       store_property (prop, ma, cexpr);
+                       store_property (prop, ma.inner, new GLibValue (expr.value_type, cexpr));
                        
                        // return previous value
                        set_cvalue (expr, get_variable_cexpression (temp_decl.name));
@@ -4437,8 +4437,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                                        var inst_ma = new MemberAccess.simple ("new");
                                        inst_ma.value_type = expr.type_reference;
                                        set_cvalue (inst_ma, instance);
-                                       var ma = new MemberAccess (inst_ma, init.name);
-                                       store_property ((Property) init.symbol_reference, ma, get_cvalue (init.initializer));
+                                       store_property ((Property) init.symbol_reference, inst_ma, init.initializer.target_value);
                                }
                        }
 
@@ -5400,16 +5399,16 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                }
        }
 
-       public void store_property (Property prop, MemberAccess ma, CCodeExpression cexpr, Expression? rhs = null) {
-               if (ma.inner is BaseAccess) {
+       public void store_property (Property prop, Expression? instance, TargetValue value) {
+               if (instance is BaseAccess) {
                        if (prop.base_property != null) {
                                var base_class = (Class) prop.base_property.parent_symbol;
                                var vcast = new CCodeFunctionCall (new CCodeIdentifier ("%s_CLASS".printf (base_class.get_upper_case_cname (null))));
                                vcast.add_argument (new CCodeIdentifier ("%s_parent_class".printf (current_class.get_lower_case_cname (null))));
                                
                                var ccall = new CCodeFunctionCall (new CCodeMemberAccess.pointer (vcast, "set_%s".printf (prop.name)));
-                               ccall.add_argument ((CCodeExpression) get_ccodenode (ma.inner));
-                               ccall.add_argument (cexpr);
+                               ccall.add_argument ((CCodeExpression) get_ccodenode (instance));
+                               ccall.add_argument (get_cvalue_ (value));
 
                                ccode.add_expression (ccall);
                        } else if (prop.base_interface_property != null) {
@@ -5417,8 +5416,8 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                                string parent_iface_var = "%s_%s_parent_iface".printf (current_class.get_lower_case_cname (null), base_iface.get_lower_case_cname (null));
 
                                var ccall = new CCodeFunctionCall (new CCodeMemberAccess.pointer (new CCodeIdentifier (parent_iface_var), "set_%s".printf (prop.name)));
-                               ccall.add_argument ((CCodeExpression) get_ccodenode (ma.inner));
-                               ccall.add_argument (cexpr);
+                               ccall.add_argument ((CCodeExpression) get_ccodenode (instance));
+                               ccall.add_argument (get_cvalue_ (value));
 
                                ccode.add_expression (ccall);
                        }
@@ -5440,6 +5439,14 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        } else {
                                generate_property_accessor_declaration (base_property.set_accessor, cfile);
                                set_func = base_property.set_accessor.get_cname ();
+
+                               if (!prop.external && prop.external_package) {
+                                       // internal VAPI properties
+                                       // only add them once per source file
+                                       if (add_generated_external_symbol (prop)) {
+                                               visit_property (prop);
+                                       }
+                               }
                        }
                }
                
@@ -5447,29 +5454,29 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
                if (prop.binding == MemberBinding.INSTANCE) {
                        /* target instance is first argument */
-                       var instance = (CCodeExpression) get_ccodenode (ma.inner);
+                       var cinstance = (CCodeExpression) get_ccodenode (instance);
 
                        if (prop.parent_symbol is Struct) {
                                // we need to pass struct instance by reference
-                               var unary = instance as CCodeUnaryExpression;
+                               var unary = cinstance as CCodeUnaryExpression;
                                if (unary != null && unary.operator == CCodeUnaryOperator.POINTER_INDIRECTION) {
                                        // *expr => expr
-                                       instance = unary.inner;
-                               } else if (instance is CCodeIdentifier || instance is CCodeMemberAccess) {
-                                       instance = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, instance);
+                                       cinstance = unary.inner;
+                               } else if (cinstance is CCodeIdentifier || cinstance is CCodeMemberAccess) {
+                                       cinstance = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cinstance);
                                } else {
                                        // if instance is e.g. a function call, we can't take the address of the expression
                                        // (tmp = expr, &tmp)
 
-                                       var temp_var = get_temp_variable (ma.inner.target_type, true, null, false);
+                                       var temp_var = get_temp_variable (instance.target_type, true, null, false);
                                        emit_temp_var (temp_var);
-                                       ccode.add_expression (new CCodeAssignment (get_variable_cexpression (temp_var.name), instance));
+                                       ccode.add_expression (new CCodeAssignment (get_variable_cexpression (temp_var.name), cinstance));
 
-                                       instance = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_variable_cexpression (temp_var.name));
+                                       cinstance = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_variable_cexpression (temp_var.name));
                                }
                        }
 
-                       ccall.add_argument (instance);
+                       ccall.add_argument (cinstance);
                }
 
                if (prop.no_accessor_method) {
@@ -5477,6 +5484,12 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        ccall.add_argument (prop.get_canonical_cconstant ());
                }
 
+               var cexpr = get_cvalue_ (value);
+
+               if (prop.property_type.is_real_non_null_struct_type ()) {
+                       cexpr = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cexpr);
+               }
+
                var array_type = prop.property_type as ArrayType;
 
                if (array_type != null && !prop.no_array_length) {
@@ -5488,15 +5501,14 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        ccall.add_argument (cexpr);
                }
 
-               if (array_type != null && !prop.no_array_length && rhs != null) {
+               if (array_type != null && !prop.no_array_length) {
                        for (int dim = 1; dim <= array_type.rank; dim++) {
-                               ccall.add_argument (get_array_length_cexpression (rhs, dim));
+                               ccall.add_argument (get_array_length_cvalue (value, dim));
                        }
-               } else if (prop.property_type is DelegateType && rhs != null) {
+               } else if (prop.property_type is DelegateType) {
                        var delegate_type = (DelegateType) prop.property_type;
                        if (delegate_type.delegate_symbol.has_target) {
-                               CCodeExpression delegate_target_destroy_notify;
-                               ccall.add_argument (get_delegate_target_cexpression (rhs, out delegate_target_destroy_notify));
+                               ccall.add_argument (get_delegate_target_cvalue (value));
                        }
                }
 

diff --git a/codegen/valadovaassignmentmodule.vala b/codegen/valadovaassignmentmodule.vala
index d0d6e3d55d1293b5bca2ead529673540b9f67bcf..777ac6fb6f049edaff8aa1fb826433de12848a97 100644 (file)
--- a/codegen/valadovaassignmentmodule.vala
+++ b/codegen/valadovaassignmentmodule.vala
@@ -24,35 +24,6 @@
  * The link between an assignment and generated code.
  */
 public class Vala.DovaAssignmentModule : DovaMemberAccessModule {
-       CCodeExpression? emit_property_assignment (Assignment assignment) {
-               var ma = assignment.left as MemberAccess;
-
-               var prop = (Property) assignment.left.symbol_reference;
-
-               if (!(prop is DynamicProperty)) {
-                       generate_property_accessor_declaration (prop.set_accessor, cfile);
-
-                       if (!prop.external && prop.external_package) {
-                               // internal VAPI properties
-                               // only add them once per source file
-                               if (add_generated_external_symbol (prop)) {
-                                       visit_property (prop);
-                               }
-                       }
-               }
-
-               CCodeExpression cexpr = get_cvalue (assignment.right);
-
-               store_property (prop, ma, cexpr, assignment.right);
-
-               // assignments are expressions, so return the current property value, except if we're sure that it can't be used
-               if (assignment.parent_node is ExpressionStatement) {
-                       return null;
-               } else {
-                       return get_ccodenode (ma); // current property value
-               }
-       }
-
        CCodeExpression? emit_simple_assignment (Assignment assignment) {
                CCodeExpression rhs = get_cvalue (assignment.right);
                CCodeExpression lhs = (CCodeExpression) get_ccodenode (assignment.left);
@@ -145,7 +116,12 @@ public class Vala.DovaAssignmentModule : DovaMemberAccessModule {
                }
 
                if (assignment.left.symbol_reference is Property) {
-                       set_cvalue (assignment, emit_property_assignment (assignment));
+                       var ma = assignment.left as MemberAccess;
+                       var prop = (Property) assignment.left.symbol_reference;
+
+                       store_property (prop, ma.inner, assignment.right.target_value);
+
+                       set_cvalue (assignment, get_ccodenode (assignment.right));
                } else {
                        var array_type = assignment.left.value_type as ArrayType;
                        if (array_type != null && array_type.fixed_length) {

diff --git a/codegen/valadovabasemodule.vala b/codegen/valadovabasemodule.vala
index a77045477a36a6fb3b3de50b7d1f078cfa38e591..8443c400fae362dc3303964c9df8ba5ddd0450e4 100644 (file)
--- a/codegen/valadovabasemodule.vala
+++ b/codegen/valadovabasemodule.vala
@@ -1390,7 +1390,7 @@ public abstract class Vala.DovaBaseModule : CodeGenerator {
                        // increment/decrement property
                        var op = expr.increment ? CCodeBinaryOperator.PLUS : CCodeBinaryOperator.MINUS;
                        var cexpr = new CCodeBinaryExpression (op, get_variable_cexpression (temp_decl.name), new CCodeConstant ("1"));
-                       store_property (prop, ma, cexpr);
+                       store_property (prop, ma.inner, new DovaValue (expr.value_type, cexpr));
 
                        // return previous value
                        set_cvalue (expr, new CCodeIdentifier (temp_decl.name));
@@ -1709,8 +1709,7 @@ public abstract class Vala.DovaBaseModule : CodeGenerator {
                                        var inst_ma = new MemberAccess.simple ("new");
                                        inst_ma.value_type = expr.type_reference;
                                        set_cvalue (inst_ma, instance);
-                                       var ma = new MemberAccess (inst_ma, init.name);
-                                       store_property ((Property) init.symbol_reference, ma, get_cvalue (init.initializer));
+                                       store_property ((Property) init.symbol_reference, inst_ma, init.initializer.target_value);
                                }
                        }
 
@@ -2156,7 +2155,7 @@ public abstract class Vala.DovaBaseModule : CodeGenerator {
                }
        }
 
-       public void store_property (Property prop, MemberAccess ma, CCodeExpression cexpr, Expression? rhs = null) {
+       public void store_property (Property prop, Expression? instance, TargetValue value) {
                string set_func;
 
                var base_property = prop;
@@ -2169,14 +2168,22 @@ public abstract class Vala.DovaBaseModule : CodeGenerator {
                generate_property_accessor_declaration (base_property.set_accessor, cfile);
                set_func = base_property.set_accessor.get_cname ();
 
+               if (!prop.external && prop.external_package) {
+                       // internal VAPI properties
+                       // only add them once per source file
+                       if (add_generated_external_symbol (prop)) {
+                               visit_property (prop);
+                       }
+               }
+
                var ccall = new CCodeFunctionCall (new CCodeIdentifier (set_func));
 
                if (prop.binding == MemberBinding.INSTANCE) {
                        /* target instance is first argument */
-                       ccall.add_argument ((CCodeExpression) get_ccodenode (ma.inner));
+                       ccall.add_argument ((CCodeExpression) get_ccodenode (instance));
                }
 
-               ccall.add_argument (cexpr);
+               ccall.add_argument (get_cvalue_ (value));
 
                ccode.add_expression (ccall);
        }