More closure fixes for array variables

2008-12-30  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodearraymodule.vala:

	More closure fixes for array variables

svn path=/trunk/; revision=2247

diff --git a/ChangeLog b/ChangeLog
index 120ea9b8e04359489045d3b8920ff169c41af2d4..8477530aeb57215a1a78a394f6ae4b334b49e1c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-30  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodearraymodule.vala:
+
+       More closure fixes for array variables
+
 2008-12-30  Jürg Billeter  <j@bitron.ch>
 
        * vapi/glib-2.0.vapi:

diff --git a/gobject/valaccodearraymodule.vala b/gobject/valaccodearraymodule.vala
index 0e8df1979111848503b7f4f58023a3bb4e8a8a15..20ffe2338a1c41b1622dbbe3af6f5d677a7ff751 100644 (file)
--- a/gobject/valaccodearraymodule.vala
+++ b/gobject/valaccodearraymodule.vala
@@ -144,7 +144,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
                        if (array_expr.symbol_reference is FormalParameter) {
                                var param = (FormalParameter) array_expr.symbol_reference;
                                if (!param.no_array_length) {
-                                       CCodeExpression length_expr = new CCodeIdentifier (get_array_length_cname (param.name, dim));
+                                       CCodeExpression length_expr = get_variable_cexpression (get_array_length_cname (param.name, dim));
                                        if (param.direction != ParameterDirection.IN) {
                                                // accessing argument of out/ref param
                                                length_expr = new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, length_expr);
@@ -158,7 +158,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
                                }
                        } else if (array_expr.symbol_reference is LocalVariable) {
                                var local = (LocalVariable) array_expr.symbol_reference;
-                               var length_expr = new CCodeIdentifier (get_array_length_cname (get_variable_cname (local.name), dim));
+                               var length_expr = get_variable_cexpression (get_array_length_cname (get_variable_cname (local.name), dim));
                                if (is_out) {
                                        return new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, length_expr);
                                } else {