:art: Check shadowing in tests

diff --git a/examples/complex/invalid_func0.gw b/examples/complex/invalid_func0.gw
index 3edf12942888d66aa6c9641dd1eba55bc3523503..1a6c8f383d4d66967dce28504b44b0b0a7dd7fb8 100644 (file)
--- a/examples/complex/invalid_func0.gw
+++ b/examples/complex/invalid_func0.gw
@@ -1 +1 @@
-fun global void global_func_err() { <<< _func__ >>>; }
+fun global void global_func_err() { <<< __func__ >>>; }

diff --git a/examples/ptr_deref.gw b/examples/ptr_deref.gw
index e79165e6fdb9fda04025742a0526a7df66cb160b..4a5fd7a547aa848a41e5eb13e4c309ac51d98961 100644 (file)
--- a/examples/ptr_deref.gw
+++ b/examples/ptr_deref.gw
@@ -1,3 +1,3 @@
 int i;
-i :=> <~int~>Ptr pi;
-<<<12 => *pi, " ", *pi>>>;
+i :=> <~int~>Ptr pti;
+<<<12 => *pti, " ", *pti>>>;

diff --git a/examples/usr_postfix.gw b/examples/usr_postfix.gw
index 84b3932e5ebbb7aa4387883ef3eb5cda04e75a22..815584f90031766a0befc3dd1121a0ad9f170f65 100644 (file)
--- a/examples/usr_postfix.gw
+++ b/examples/usr_postfix.gw
@@ -1,6 +1,3 @@
-int i;
-i++;
-
 class C { int i; }
 operator ++ int (C c) {
   <<< "here" >>>;

diff --git a/tests/new/global_func0.gw b/tests/new/global_func0.gw
index ee373b2ef134d18efb7fecc2c769dc6d1e318e87..a7037abe4644e8449c434eb7f12f1e2e8973265d 100644 (file)
--- a/tests/new/global_func0.gw
+++ b/tests/new/global_func0.gw
@@ -1,11 +1,11 @@
-123 => global int g_i;
-class global C {
+123 => global int global_func_i;
+class global GlobalFuncClass {
   13 => int i;
 }
-<<< g_i >>>;
-global C g_c;
+<<< global_func_i >>>;
+global GlobalFuncClass g_c;
 <<< g_c, "->i => ", g_c.i >>>;
-fun global void g_test() { <<< g_i >>>; <<< g_c >>>; <<< g_c.i >>>; <<< "test" >>>; }
+fun global void g_test() { <<< global_func_i >>>; <<< g_c >>>; <<< g_c.i >>>; <<< "test" >>>; }
 #!fun global void g_test() { <<< "test" >>>; }
 <<< g_test >>>;
 <<< g_test() >>>;

diff --git a/tests/tree/global_func1.gw b/tests/new/global_func1.gw
similarity index 77%
rename from tests/tree/global_func1.gw
rename to tests/new/global_func1.gw
index c12ad16ddc5629c7403b31719a93973c0e153475..80801795612cd7f3b33f9c37b316640d612d7afe 100644 (file)
--- a/tests/tree/global_func1.gw
+++ b/tests/new/global_func1.gw
@@ -1,4 +1,4 @@
-<<< g_i >>>;
+<<< global_func_i >>>;
 <<< g_c >>>;
 <<< g_c.i >>>;
 <<< g_test >>>;

diff --git a/tests/new/global_var.gw b/tests/new/global_var.gw
index 072245a2850b7d5366f7dc16d86d2b2563bed2a4..85bdfc9c9971239a648d0eed418705057c5afa3b 100644 (file)
--- a/tests/new/global_var.gw
+++ b/tests/new/global_var.gw
@@ -1 +1 @@
-<<< global int g_i >>>;
+<<< global int global_var_i >>>;

diff --git a/tests/new/recursive_template.gw b/tests/new/recursive_template.gw
index dab026b9a3e6908b8c91b16d22c53bb69384e286..1b8b40740035dc9dcfd30156dbdd8b9f6de07215 100644 (file)
--- a/tests/new/recursive_template.gw
+++ b/tests/new/recursive_template.gw
@@ -3,7 +3,6 @@ fun void test<~A~>(int i, A a) {
   <<< __func__, " ", a >>>;
   <<< i, " ", a >>>;
   if(i)
-    test<~int~>((i-2, b));
-#!    test((i-2.0));
+    test<~int~>((i-2, b$int));
 }
 test<~float~>(2, 2);

diff --git a/tests/regression/invalid_template.gw b/tests/regression/invalid_template.gw
index c7b4f5f06014a75ef8a026b92f072e9f7932beb2..1e27c410e19b2ba014d6084f4c60c35576556655 100644 (file)
--- a/tests/regression/invalid_template.gw
+++ b/tests/regression/invalid_template.gw
@@ -3,7 +3,7 @@ class B {}
 class<~A~>C extends B{}
 
 class<~A,B~>D extends<~A~>C{
-  class<~A~>int{}
+  class<~A~> E{}
   class G extends ld
   {A0I:}
   <~A~>d d;

diff --git a/tests/struct/struct_global0.gw b/tests/struct/struct_global0.gw
index 57abb9ed2dde2bce7e90e58b01140acd082ece14..e60d17fb6b0581e646e0c10f8ad6240212a2b11b 100644 (file)
--- a/tests/struct/struct_global0.gw
+++ b/tests/struct/struct_global0.gw
@@ -10,5 +10,5 @@ struct global GlobalStructWithCtor {
   string s;
 }
 
-global GlobalStruct s;
+global GlobalStruct global_s;
 GlobalStructWithCtor sctor;

diff --git a/tests/tree/class_named_union.gw b/tests/tree/class_named_union.gw
index 7eabcb2a778099f241f61e78c893260429b35d53..b892a52328f0b2b06ec4a09ec7c4961649ce7c2b 100644 (file)
--- a/tests/tree/class_named_union.gw
+++ b/tests/tree/class_named_union.gw
@@ -1,5 +1,5 @@
 class C {
-  12 => int i;
+  12 => int _i;
   union {
     int i;
     float f;
@@ -26,5 +26,5 @@ C c;
 1.23 => c.U.f;
 <<< c.U.f >>>;
 <<< c.U.i >>>;
-<<< c.i >>>;
+<<< c._i >>>;
 

diff --git a/tests/tree/cpy_ast.gw b/tests/tree/cpy_ast.gw
index f721f246872f997b3d1565f576afe584fd5f29a3..c0d2c2f93838064aeed2b38067562e98d645bf6a 100644 (file)
--- a/tests/tree/cpy_ast.gw
+++ b/tests/tree/cpy_ast.gw
@@ -20,7 +20,7 @@ class <~A~>C {
   match i,2 {
     case 12 when 0:;
     case _,2 when 0:;
-  } where int i;
+  } where int b;
   enum { zero };
   typedef int Int;
   goto end;

diff --git a/tests/tree/fptr_class.gw b/tests/tree/fptr_class.gw
index cb798c5bca4a244241880e3fa8e4789995208df4..920569d10406cca1ae7157d66bc100647c6067a0 100644 (file)
--- a/tests/tree/fptr_class.gw
+++ b/tests/tree/fptr_class.gw
@@ -1,8 +1,8 @@
 class C {
   fun void test(int i) { <<<  "int arg"  >>>; }
-  typedef void Ptr(int i);
+  typedef void ptr_t(int i);
   test @=>
-  Ptr p;
+  ptr_t p;
   p(1);
   test @=> p;
   p(1);

diff --git a/tests/tree/global_named_union.gw b/tests/tree/global_named_union.gw
index a5e51c97218cb5ef2a63a5fd3d2c1971292d65af..5eb4c3aa36a552c1f6e47ccd6eb9ad17095cec1a 100644 (file)
--- a/tests/tree/global_named_union.gw
+++ b/tests/tree/global_named_union.gw
@@ -1,8 +1,8 @@
 union global {
-  int int_from_global_union;
-  float float_from_global_union;
+  int int_from_global_nanmed_union;
+  float float_from_global_named_union;
 } global_union;
 
 <<< "HERE", global_union >>>;
-<<< 123.456 => global_union.float_from_global_union >>>;
-<<< global_union.float_from_global_union >>>;
+<<< 123.456 => global_union.float_from_global_named_union >>>;
+<<< global_union.float_from_global_named_union >>>;

diff --git a/tests/tree/static_tmpl.gw b/tests/tree/static_tmpl.gw
index b024fdd2cf495aa923f4f4ace829c1b0ee6fa566..d44838875be0b964dd4d0893770d0728b22a87e3 100644 (file)
--- a/tests/tree/static_tmpl.gw
+++ b/tests/tree/static_tmpl.gw
@@ -1,12 +1,12 @@
-class global C {
+class global StaticTmpl {
   fun static void t<~A~>() { <<< __func__ >>>; }
 }
-class D extends C {
+class D extends StaticTmpl {
 
 }
 
-fun void test(C c) {
-  C.t<~int~>();
+fun void test(StaticTmpl c) {
+  StaticTmpl.t<~int~>();
 }
 
 #!D d;