test: Avoid redeclaration of gint

In addition to e4fe55735fb3e151dd6340b6d3fb8acca38193a4

Found by -pedantic-errors

diff --git a/tests/basic-types/integer-negative-rank-incompatible.test b/tests/basic-types/integer-negative-rank-incompatible.test
index df0c6484239cfd0e0e2ae437ab42d4a02d6f1554..e6dc517914bb49f118be37f14d939a51b0b7a13f 100644 (file)
--- a/tests/basic-types/integer-negative-rank-incompatible.test
+++ b/tests/basic-types/integer-negative-rank-incompatible.test
@@ -1,11 +1,11 @@
 Invalid Code
 
-[CCode (cname = "gint", cheader_filename = "glib.h", default_value = "0", has_type_id = false)]
+[CCode (default_value = "0", has_type_id = false)]
 [IntegerType (rank = -1)]
 struct FooHandle {
 }
 
-[CCode (cname = "gint", cheader_filename = "glib.h", default_value = "0", has_type_id = false)]
+[CCode (default_value = "0", has_type_id = false)]
 [IntegerType (rank = -1)]
 struct BarHandle {
 }

diff --git a/tests/basic-types/integer-negative-rank-incompatible2.test b/tests/basic-types/integer-negative-rank-incompatible2.test
index f15c70f09da9eb55363eebd26f7ea0c03a7617e4..ef9b03bf2c0ac2d8256e888689ae1d9b15eeb6ff 100644 (file)
--- a/tests/basic-types/integer-negative-rank-incompatible2.test
+++ b/tests/basic-types/integer-negative-rank-incompatible2.test
@@ -1,6 +1,6 @@
 Invalid Code
 
-[CCode (cname = "gint", cheader_filename = "glib.h", default_value = "0", has_type_id = false)]
+[CCode (default_value = "0", has_type_id = false)]
 [IntegerType (rank = -1)]
 struct FooHandle {
 }

diff --git a/tests/basic-types/integer-negative-rank-incompatible3.test b/tests/basic-types/integer-negative-rank-incompatible3.test
index 2956a0a5807321aaa0a8f6477c908ed582a111bd..6c616099897cfce7667f551909079adfef3689f2 100644 (file)
--- a/tests/basic-types/integer-negative-rank-incompatible3.test
+++ b/tests/basic-types/integer-negative-rank-incompatible3.test
@@ -1,6 +1,6 @@
 Invalid Code
 
-[CCode (cname = "gint", cheader_filename = "glib.h", default_value = "0", has_type_id = false)]
+[CCode (default_value = "0", has_type_id = false)]
 [IntegerType (rank = -1)]
 struct BarHandle {
 }

diff --git a/tests/basic-types/integers-negative-rank.c-expected b/tests/basic-types/integers-negative-rank.c-expected
index acc57a0c4385cb5f02d12c75fda19d8c373b59e5..5c657967cc302ad27f43de263038af2a16868a61 100644 (file)
--- a/tests/basic-types/integers-negative-rank.c-expected
+++ b/tests/basic-types/integers-negative-rank.c-expected
@@ -13,8 +13,9 @@
 #endif
 #endif
 
-typedef int32_t gint;
-typedef gint BarHandle;
+typedef int32_t FooHandle;
+typedef FooHandle BarHandle;
+typedef int32_t BazHandle;
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -26,30 +27,30 @@ static void
 _vala_main (void)
 {
        {
-               gint foo = 0;
-               foo = 0;
-               _vala_assert (foo == 0, "foo == 0");
+               FooHandle foo = 0;
+               foo = (FooHandle) 0;
+               _vala_assert (((gint) foo) == 0, "foo == 0");
        }
        {
-               gint foo = 0;
-               foo = -1;
-               _vala_assert (foo == -1, "foo == -1");
+               FooHandle foo = 0;
+               foo = (FooHandle) -1;
+               _vala_assert (((gint) foo) == -1, "foo == -1");
        }
        {
-               gint foo = 0;
-               foo = 42;
-               _vala_assert (foo == 42, "foo == 42");
-               foo = 64;
-               _vala_assert (foo == 64, "foo == 64");
+               FooHandle foo = 0;
+               foo = (FooHandle) 42;
+               _vala_assert (((gint) foo) == 42, "foo == 42");
+               foo = (FooHandle) 64;
+               _vala_assert (((gint) foo) == 64, "foo == 64");
        }
        {
-               gint foo = 0;
+               FooHandle foo = 0;
                BarHandle bar = 0;
-               foo = 36;
+               foo = (FooHandle) 36;
                bar = (BarHandle) 64;
-               foo = (gint) bar;
-               _vala_assert (foo == 64, "foo == 64");
-               foo = 88;
+               foo = (FooHandle) bar;
+               _vala_assert (((gint) foo) == 64, "foo == 64");
+               foo = (FooHandle) 88;
                bar = (BarHandle) foo;
                _vala_assert (((gint) bar) == 88, "bar == 88");
        }
@@ -64,11 +65,11 @@ _vala_main (void)
                _vala_assert (baz == ((guint) 99), "baz == 99");
        }
        {
-               gint foo = 0;
-               gint baz = 0;
-               foo = 28;
-               baz = (gint) foo;
-               _vala_assert (baz == 28, "baz == 28");
+               FooHandle foo = 0;
+               BazHandle baz = 0;
+               foo = (FooHandle) 28;
+               baz = (BazHandle) foo;
+               _vala_assert (((gint) baz) == 28, "baz == 28");
        }
 }
 

diff --git a/tests/basic-types/integers-negative-rank.vala b/tests/basic-types/integers-negative-rank.vala
index cc35b92c05813e3ac226eb88a55c8b183c010c90..df5cdcf32a349ea4f771187869009242d0eb9e71 100644 (file)
--- a/tests/basic-types/integers-negative-rank.vala
+++ b/tests/basic-types/integers-negative-rank.vala
@@ -1,4 +1,4 @@
-[CCode (cname = "gint", cheader_filename = "glib.h", default_value = "0", has_type_id = false)]
+[CCode (default_value = "0", has_type_id = false)]
 [IntegerType (rank = -1)]
 struct FooHandle {
 }
@@ -7,7 +7,7 @@ struct BarHandle : FooHandle {
 }
 
 [IntegerType (rank = -2)]
-[CCode (cname = "gint", cheader_filename = "glib.h", default_value = "0", has_type_id = false)]
+[CCode (default_value = "0", has_type_id = false)]
 struct BazHandle {
 }