[vala/staging] codegen: Replace hardcoded "gint"/"int" references (POSIX)
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging] codegen: Replace hardcoded "gint"/"int" references (POSIX)
- Date: Sat, 19 Oct 2019 08:38:54 +0000 (UTC)
commit 30f0146e147ac53c900ecc92e8cb1e18257419eb
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sat Oct 19 00:12:26 2019 +0200
codegen: Replace hardcoded "gint"/"int" references (POSIX)
Only applied up to CCodeDelegateModule
codegen/valaccodearraymodule.vala | 30 +++++++++++++++---------------
codegen/valaccodebasemodule.vala | 6 +++---
codegen/valaccodemethodmodule.vala | 4 ++--
3 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/codegen/valaccodearraymodule.vala b/codegen/valaccodearraymodule.vala
index 35274bf24..4a610e0aa 100644
--- a/codegen/valaccodearraymodule.vala
+++ b/codegen/valaccodearraymodule.vala
@@ -231,14 +231,14 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
var fun = new CCodeFunction (cname, "void");
fun.modifiers = CCodeModifiers.STATIC;
fun.add_parameter (new CCodeParameter ("array", "%s *".printf (get_ccode_name (st))));
- fun.add_parameter (new CCodeParameter ("array_length", "gint"));
+ fun.add_parameter (new CCodeParameter ("array_length", get_ccode_name (int_type)));
push_function (fun);
var ccondarr = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier
("array"), new CCodeConstant ("NULL"));
ccode.open_if (ccondarr);
- ccode.add_declaration ("int", new CCodeVariableDeclarator ("i"));
+ ccode.add_declaration (get_ccode_name (int_type), new CCodeVariableDeclarator ("i"));
append_struct_array_free_loop (st);
ccode.close ();
@@ -280,7 +280,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
var fun = new CCodeFunction ("_vala_array_destroy", "void");
fun.modifiers = CCodeModifiers.STATIC;
fun.add_parameter (new CCodeParameter ("array", "gpointer"));
- fun.add_parameter (new CCodeParameter ("array_length", "gint"));
+ fun.add_parameter (new CCodeParameter ("array_length", get_ccode_name (int_type)));
fun.add_parameter (new CCodeParameter ("destroy_func", "GDestroyNotify"));
push_function (fun);
@@ -289,7 +289,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
var ccondfunc = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new
CCodeIdentifier ("destroy_func"), new CCodeConstant ("NULL"));
ccode.open_if (new CCodeBinaryExpression (CCodeBinaryOperator.AND, ccondarr, ccondfunc));
- ccode.add_declaration ("int", new CCodeVariableDeclarator ("i"));
+ ccode.add_declaration (get_ccode_name (int_type), new CCodeVariableDeclarator ("i"));
append_vala_array_free_loop ();
ccode.close ();
@@ -304,7 +304,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
fun = new CCodeFunction ("_vala_array_free", "void");
fun.modifiers = CCodeModifiers.STATIC;
fun.add_parameter (new CCodeParameter ("array", "gpointer"));
- fun.add_parameter (new CCodeParameter ("array_length", "gint"));
+ fun.add_parameter (new CCodeParameter ("array_length", get_ccode_name (int_type)));
fun.add_parameter (new CCodeParameter ("destroy_func", "GDestroyNotify"));
push_function (fun);
@@ -335,9 +335,9 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
fun.modifiers = CCodeModifiers.STATIC;
fun.add_parameter (new CCodeParameter ("array", "gpointer"));
fun.add_parameter (new CCodeParameter ("element_size", "gsize"));
- fun.add_parameter (new CCodeParameter ("src", "gint"));
- fun.add_parameter (new CCodeParameter ("dest", "gint"));
- fun.add_parameter (new CCodeParameter ("length", "gint"));
+ fun.add_parameter (new CCodeParameter ("src", get_ccode_name (int_type)));
+ fun.add_parameter (new CCodeParameter ("dest", get_ccode_name (int_type)));
+ fun.add_parameter (new CCodeParameter ("length", get_ccode_name (int_type)));
push_function (fun);
@@ -391,13 +391,13 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
}
public override void append_vala_array_length () {
- var fun = new CCodeFunction ("_vala_array_length", "gint");
+ var fun = new CCodeFunction ("_vala_array_length", get_ccode_name (int_type));
fun.modifiers = CCodeModifiers.STATIC;
fun.add_parameter (new CCodeParameter ("array", "gpointer"));
push_function (fun);
- ccode.add_declaration ("int", new CCodeVariableDeclarator ("length", new CCodeConstant
("0")));
+ ccode.add_declaration (get_ccode_name (int_type), new CCodeVariableDeclarator ("length", new
CCodeConstant ("0")));
// return 0 if the array is NULL
// avoids an extra NULL check on the caller side
@@ -495,7 +495,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
function.add_parameter (new CCodeParameter ("self", get_ccode_name (array_type)));
// total length over all dimensions
- function.add_parameter (new CCodeParameter ("length", "int"));
+ function.add_parameter (new CCodeParameter ("length", get_ccode_name (int_type)));
if (array_type.element_type is GenericType) {
// dup function array elements
string func_name = "%s_dup_func".printf (((GenericType)
array_type.element_type).type_parameter.name.down ());
@@ -522,7 +522,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
ccode.add_declaration (get_ccode_name (array_type), cvardecl);
ccode.add_assignment (new CCodeIdentifier ("result"), gnew);
- ccode.add_declaration ("int", new CCodeVariableDeclarator ("i"));
+ ccode.add_declaration (get_ccode_name (int_type), new CCodeVariableDeclarator ("i"));
ccode.open_for (new CCodeAssignment (new CCodeIdentifier ("i"), new CCodeConstant
("0")),
new CCodeBinaryExpression (CCodeBinaryOperator.LESS_THAN, new
CCodeIdentifier ("i"), new CCodeIdentifier ("length")),
@@ -575,7 +575,7 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
push_function (function);
if (requires_copy (array_type.element_type)) {
- ccode.add_declaration ("int", new CCodeVariableDeclarator ("i"));
+ ccode.add_declaration (get_ccode_name (int_type), new CCodeVariableDeclarator ("i"));
ccode.open_for (new CCodeAssignment (new CCodeIdentifier ("i"), new CCodeConstant
("0")),
new CCodeBinaryExpression (CCodeBinaryOperator.LESS_THAN, new
CCodeIdentifier ("i"), get_ccodenode (array_type.length)),
@@ -619,8 +619,8 @@ public class Vala.CCodeArrayModule : CCodeMethodCallModule {
function.modifiers = CCodeModifiers.STATIC;
function.add_parameter (new CCodeParameter ("array", "%s *".printf (get_ccode_name
(array_type))));
- function.add_parameter (new CCodeParameter ("length", "int*"));
- function.add_parameter (new CCodeParameter ("size", "int*"));
+ function.add_parameter (new CCodeParameter ("length", "%s*".printf (get_ccode_name
(int_type))));
+ function.add_parameter (new CCodeParameter ("size", "%s*".printf (get_ccode_name
(int_type))));
push_function (function);
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 7e0676e21..97bb84ce7 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -5611,7 +5611,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
function.modifiers = CCodeModifiers.STATIC;
function.add_parameter (new CCodeParameter ("stack", "%s *".printf (get_ccode_name
(array_type.element_type))));
- function.add_parameter (new CCodeParameter ("stack_length", "int"));
+ function.add_parameter (new CCodeParameter ("stack_length", get_ccode_name (int_type)));
if (array_type.element_type is StructValueType) {
function.add_parameter (new CCodeParameter ("needle", "const %s *".printf
(get_ccode_name (array_type.element_type))));
} else {
@@ -5620,7 +5620,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
push_function (function);
- ccode.add_declaration ("int", new CCodeVariableDeclarator ("i"));
+ ccode.add_declaration (get_ccode_name (int_type), new CCodeVariableDeclarator ("i"));
var cloop_initializer = new CCodeAssignment (new CCodeIdentifier ("i"), new CCodeConstant
("0"));
var cloop_condition = new CCodeBinaryExpression (CCodeBinaryOperator.LESS_THAN, new
CCodeIdentifier ("i"), new CCodeIdentifier ("stack_length"));
@@ -5676,7 +5676,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
if (cmpid.name == "g_strcmp0") {
cmp0_func = cmpid.name;
} else if (add_wrapper (cmp0_func)) {
- var cmp0_fun = new CCodeFunction (cmp0_func, "int");
+ var cmp0_fun = new CCodeFunction (cmp0_func, get_ccode_name (int_type));
cmp0_fun.add_parameter (new CCodeParameter ("s1", "const void *"));
cmp0_fun.add_parameter (new CCodeParameter ("s2", "const void *"));
cmp0_fun.modifiers = CCodeModifiers.STATIC;
diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index acbc6ae65..7a4b30394 100644
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -371,14 +371,14 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
cfile.add_include ("stdio.h");
var counter = new CCodeIdentifier (prefix + "_counter");
- var counter_decl = new CCodeDeclaration ("gint");
+ var counter_decl = new CCodeDeclaration (get_ccode_name (int_type));
counter_decl.add_declarator (new CCodeVariableDeclarator (counter.name));
counter_decl.modifiers = CCodeModifiers.STATIC;
cfile.add_type_member_declaration (counter_decl);
// nesting level for recursive functions
var level = new CCodeIdentifier (prefix + "_level");
- var level_decl = new CCodeDeclaration ("gint");
+ var level_decl = new CCodeDeclaration (get_ccode_name (int_type));
level_decl.add_declarator (new CCodeVariableDeclarator (level.name));
level_decl.modifiers = CCodeModifiers.STATIC;
cfile.add_type_member_declaration (level_decl);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]