[vala/staging: 3/6] codegen: Some simplifications



commit 1897979fb3d00ed61ffce0b5dfbf22d4c7f4ecff
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Oct 21 15:47:30 2016 +0200

    codegen: Some simplifications

 codegen/valaccodebasemodule.vala |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index b0bd6eb..803b9ce 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -1510,14 +1510,8 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
                if (acc.value_type is ArrayType) {
                        var array_type = (ArrayType) acc.value_type;
-
-                       var length_ctype = "int";
-                       if (acc.readable) {
-                               length_ctype = "int*";
-                       }
-
                        for (int dim = 1; dim <= array_type.rank; dim++) {
-                               function.add_parameter (new CCodeParameter (get_array_length_cname 
(acc.readable ? "result" : "value", dim), length_ctype));
+                               function.add_parameter (new CCodeParameter (get_array_length_cname 
(acc.readable ? "result" : "value", dim), acc.readable ? "int*" : "int"));
                        }
                } else if ((acc.value_type is DelegateType) && ((DelegateType) 
acc.value_type).delegate_symbol.has_target) {
                        function.add_parameter (new CCodeParameter (get_delegate_target_cname (acc.readable ? 
"result" : "value"), acc.readable ? "gpointer*" : "gpointer"));
@@ -1617,14 +1611,8 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
                        if (acc.value_type is ArrayType) {
                                var array_type = (ArrayType) acc.value_type;
-
-                               var length_ctype = "int";
-                               if (acc.readable) {
-                                       length_ctype = "int*";
-                               }
-
                                for (int dim = 1; dim <= array_type.rank; dim++) {
-                                       function.add_parameter (new CCodeParameter (get_array_length_cname 
(acc.readable ? "result" : "value", dim), length_ctype));
+                                       function.add_parameter (new CCodeParameter (get_array_length_cname 
(acc.readable ? "result" : "value", dim), acc.readable ? "int*" : "int"));
                                }
                        } else if ((acc.value_type is DelegateType) && ((DelegateType) 
acc.value_type).delegate_symbol.has_target) {
                                function.add_parameter (new CCodeParameter (get_delegate_target_cname 
(acc.readable ? "result" : "value"), acc.readable ? "gpointer*" : "gpointer"));
@@ -1741,14 +1729,8 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
                        if (acc.value_type is ArrayType) {
                                var array_type = (ArrayType) acc.value_type;
-
-                               var length_ctype = "int";
-                               if (acc.readable) {
-                                       length_ctype = "int*";
-                               }
-
                                for (int dim = 1; dim <= array_type.rank; dim++) {
-                                       function.add_parameter (new CCodeParameter (get_array_length_cname 
(acc.readable ? "result" : "value", dim), length_ctype));
+                                       function.add_parameter (new CCodeParameter (get_array_length_cname 
(acc.readable ? "result" : "value", dim), acc.readable ? "int*" : "int"));
                                }
                        } else if ((acc.value_type is DelegateType) && ((DelegateType) 
acc.value_type).delegate_symbol.has_target) {
                                function.add_parameter (new CCodeParameter (get_delegate_target_cname 
(acc.readable ? "result" : "value"), acc.readable ? "gpointer*" : "gpointer"));


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]