[vala] codegen: Rename store_variable to store_value and make it public
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] codegen: Rename store_variable to store_value and make it public
- Date: Sun, 15 May 2011 14:09:40 +0000 (UTC)
commit ebaf1b9031251c7fba1d1bd30a107ac51a625cf5
Author: Luca Bruno <lucabru src gnome org>
Date: Sun May 15 14:42:35 2011 +0200
codegen: Rename store_variable to store_value and make it public
codegen/valaccodeassignmentmodule.vala | 14 +++++++-------
codegen/valaccodebasemodule.vala | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/codegen/valaccodeassignmentmodule.vala b/codegen/valaccodeassignmentmodule.vala
index 01af22a..725fde0 100644
--- a/codegen/valaccodeassignmentmodule.vala
+++ b/codegen/valaccodeassignmentmodule.vala
@@ -187,8 +187,8 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
}
}
- void store_variable (Variable variable, TargetValue lvalue, TargetValue value, bool initializer) {
- var array_type = variable.variable_type as ArrayType;
+ public override void store_value (TargetValue lvalue, TargetValue value) {
+ var array_type = lvalue.value_type as ArrayType;
if (array_type != null && array_type.fixed_length) {
cfile.add_include ("string.h");
@@ -215,7 +215,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
ccode.add_assignment (get_cvalue_ (lvalue), cexpr);
- if (array_type != null && !variable.no_array_length) {
+ if (array_type != null && ((GLibValue) lvalue).array_length_cvalues != null) {
var glib_value = (GLibValue) value;
if (glib_value.array_length_cvalues != null) {
for (int dim = 1; dim <= array_type.rank; dim++) {
@@ -238,7 +238,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
}
}
- var delegate_type = variable.variable_type as DelegateType;
+ var delegate_type = lvalue.value_type as DelegateType;
if (delegate_type != null && delegate_type.delegate_symbol.has_target) {
if (get_delegate_target_cvalue (lvalue) != null) {
ccode.add_assignment (get_delegate_target_cvalue (lvalue), get_delegate_target_cvalue (value));
@@ -255,7 +255,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
ccode.add_expression (destroy_local (local));
}
- store_variable (local, get_local_cvalue (local), value, initializer);
+ store_value (get_local_cvalue (local), value);
}
public override void store_parameter (Parameter param, TargetValue value) {
@@ -264,7 +264,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
ccode.add_expression (destroy_parameter (param));
}
- store_variable (param, get_parameter_cvalue (param), value, false);
+ store_value (get_parameter_cvalue (param), value);
}
public override void store_field (Field field, TargetValue? instance, TargetValue value) {
@@ -273,6 +273,6 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
ccode.add_expression (destroy_field (field, instance));
}
- store_variable (field, get_field_cvalue (field, instance), value, false);
+ store_value (get_field_cvalue (field, instance), value);
}
}
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 161e7d3..c33ccfe 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -3533,6 +3533,8 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
public abstract TargetValue load_this_parameter (TypeSymbol sym);
+ public abstract void store_value (TargetValue lvalue, TargetValue value);
+
public virtual string get_delegate_target_cname (string delegate_cname) {
assert_not_reached ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]