:art: Update tests

diff --git a/tests/import/class_template.c b/tests/import/class_template.c
index 2acbabee6adea0ed3268b49948954881220a965b..d48a3330e4d520b9cc36db70efab302a99824662 100644 (file)
--- a/tests/import/class_template.c
+++ b/tests/import/class_template.c
@@ -34,7 +34,7 @@ GWION_IMPORT(class_template) {
     GWI_BB((o_map_key = gwi_item_end(gwi, ae_flag_member | ae_flag_template, NULL)))
     GWI_BB(gwi_item_ini(gwi, "B[]", "value"))
     GWI_BB((o_map_value = gwi_item_end(gwi, ae_flag_member, NULL)))
-   GWI_BB(gwi_func_ini(gwi, "int", "<~C,D~>test"))
+   GWI_BB(gwi_func_ini(gwi, "int", "test<~C,D~>"))
    GWI_BB(gwi_func_end(gwi, (f_xfun)1, ae_flag_none))
 
   GWI_BB(gwi_class_end(gwi))

diff --git a/tests/import/class_template_invalid.c b/tests/import/class_template_invalid.c
index a6d967aad1a72732a1857fb54469c5c0960b34d6..677304c955f27c9e3d00fd0208ceb8799f0e8fbf 100644 (file)
--- a/tests/import/class_template_invalid.c
+++ b/tests/import/class_template_invalid.c
@@ -23,7 +23,7 @@ GWION_IMPORT(class_template) {
     GWI_BB((o_map_key = gwi_item_end(gwi, ae_flag_member | ae_flag_template, NULL)))
     GWI_BB(gwi_item_ini(gwi, "B[]", "value"))
     GWI_BB((o_map_value = gwi_item_end(gwi, ae_flag_member, NULL)))
-   GWI_BB(gwi_func_ini(gwi, "int", "<~C,D'~>test"))
+   GWI_BB(gwi_func_ini(gwi, "int", "test<~C,D'~>"))
    GWI_BB(gwi_func_end(gwi, (f_xfun)1, ae_flag_none))
 
   GWI_BB(gwi_class_end(gwi))

diff --git a/tests/import/fptr_tmpl.c b/tests/import/fptr_tmpl.c
index a86b5cee12e9e88cbe4774d1f5ee2502fd652c23..d142ebb7ea945eb5fc4a31fa0ff10e74652aeb95 100644 (file)
--- a/tests/import/fptr_tmpl.c
+++ b/tests/import/fptr_tmpl.c
@@ -14,7 +14,7 @@
 GWION_IMPORT(typedef_test) {
   Type t_func_typedef;
   GWI_OB((t_func_typedef = gwi_mk_type(gwi, "FuncTypedef", SZ_INT , NULL)))
-  GWI_BB(gwi_fptr_ini(gwi, "int", "<~A~>test"))
+  GWI_BB(gwi_fptr_ini(gwi, "int", "test<~A~>"))
   GWI_OB(gwi_fptr_end(gwi, 0))
   return GW_OK;
 }

diff --git a/tests/import/fptr_tmpl_fail.c b/tests/import/fptr_tmpl_fail.c
index 03a311bad08983d86f5da8817188f3c77a37c88f..13c195fc132bfb608a70811dd8ce20ab6afd7403 100644 (file)
--- a/tests/import/fptr_tmpl_fail.c
+++ b/tests/import/fptr_tmpl_fail.c
@@ -12,7 +12,7 @@
 #include "import.h"
 
 GWION_IMPORT(typedef_test) {
-  GWI_BB(gwi_fptr_ini(gwi, "int~", "<~A~>test"))
+  GWI_BB(gwi_fptr_ini(gwi, "int~", "test<~A~>"))
   GWI_OB(gwi_fptr_end(gwi, 0))
   return GW_OK;
 }

diff --git a/tests/import/func_tmpl.c b/tests/import/func_tmpl.c
index 2c1f3d885c6dee8f0d791e1e8ec2f68f382c4ca0..be22fbb6bb0fc864b09de38c7390ee6a08192850 100644 (file)
--- a/tests/import/func_tmpl.c
+++ b/tests/import/func_tmpl.c
@@ -17,7 +17,7 @@ static SFUN(func_tmpl_xfun) {
 }
 
 GWION_IMPORT(func_tmpl) {
-  GWI_BB(gwi_func_ini(gwi, "int[]", "<~A~>test"))
+  GWI_BB(gwi_func_ini(gwi, "int[]", "test<~A~>"))
   GWI_BB(gwi_func_arg(gwi, "A", "i"))
   GWI_BB(gwi_func_end(gwi, func_tmpl_xfun, ae_flag_none))
   return GW_OK;

diff --git a/tests/import/func_tmpl_fail.c b/tests/import/func_tmpl_fail.c
index fcb89601d6aa36a10192bfbe1acf0370199ee5de..5790b326e45240862ac9e0d4c334a2a3ce8b8ddd 100644 (file)
--- a/tests/import/func_tmpl_fail.c
+++ b/tests/import/func_tmpl_fail.c
@@ -17,7 +17,7 @@ static SFUN(func_tmpl_xfun) {
 }
 
 GWION_IMPORT(func_tmpl) {
-  GWI_BB(gwi_func_ini(gwi, "voit", "<~A~>test"))
+  GWI_BB(gwi_func_ini(gwi, "voit", "test<~A~>"))
   GWI_BB(gwi_func_end(gwi, func_tmpl_xfun, ae_flag_none))
   return GW_OK;
 }

diff --git a/tests/import/union_tmpl.c b/tests/import/union_tmpl.c
index 0de2647a79f89bdff7bff7e6f43e9bb066b9edf8..800cf5518ef128d047a813d0efce2d23b0d22edc 100644 (file)
--- a/tests/import/union_tmpl.c
+++ b/tests/import/union_tmpl.c
@@ -12,7 +12,7 @@
 #include "import.h"
 
 GWION_IMPORT(union_test) {
-  GWI_BB(gwi_union_ini(gwi, "<~A~>U", NULL))
+  GWI_BB(gwi_union_ini(gwi, "U<~A~>", NULL))
   GWI_BB(gwi_union_add(gwi,"float", "f"))
   GWI_BB(gwi_union_add(gwi,"int", "i"))
   GWI_BB(gwi_union_add(gwi,"A", "a"))

diff --git a/tests/import/union_tmpl_fail.c b/tests/import/union_tmpl_fail.c
index cebc664ed828219e38ec168b189dae67c6c6a14b..cf93e12bbf63127bc33631bb395a2a8c448744aa 100644 (file)
--- a/tests/import/union_tmpl_fail.c
+++ b/tests/import/union_tmpl_fail.c
@@ -12,7 +12,7 @@
 #include "import.h"
 
 GWION_IMPORT(union_test) {
-  GWI_BB(gwi_union_ini(gwi, "<~A~>U", "My"))
+  GWI_BB(gwi_union_ini(gwi, "U<~A~>", "My"))
   GWI_BB(gwi_union_add(gwi,"float", "f"))
   GWI_BB(gwi_union_add(gwi,"int", "i"))
   GWI_BB(gwi_union_add(gwi,"A", "a"))