:bug: Fix macro arguments

diff --git a/ast b/ast
index 2a9afe545081756266000246a32193648f9b9618..bd7f714f19c2c2e237cbe4cd6a74aa2cb2dd7206 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 2a9afe545081756266000246a32193648f9b9618
+Subproject commit bd7f714f19c2c2e237cbe4cd6a74aa2cb2dd7206

diff --git a/tests/error/fail_assign.gw b/tests/error/fail_assign.gw
index 1384a540f73fa6dbb840d57c186aca864f972b3e..3fd3131b1e61df1cdb5bf2ba7cdaf3bc3bd00b06 100644 (file)
--- a/tests/error/fail_assign.gw
+++ b/tests/error/fail_assign.gw
@@ -1,3 +1,3 @@
-#! [contains] not allowed
+#! [contains] can't assign
 class C extends Event{}
 Event e @=> C o;

diff --git a/tests/error/invalid_cast.gw b/tests/error/invalid_cast.gw
index 0770d9cb524142b2aa6709e3e9c6085da0376490..fb8b3eca8c149c306077a2c22e2bf12a9a5f7ca8 100644 (file)
--- a/tests/error/invalid_cast.gw
+++ b/tests/error/invalid_cast.gw
@@ -1,4 +1,4 @@
-#! [contains] no match found for operator
+#! [contains] can't cast
 class C {}
 class D {}
 D d;

diff --git a/tests/error/no_cast.gw b/tests/error/no_cast.gw
index c05a98b22fc8110348fdbb32774cd41e85fd6778..40b5cda637d640f5b3ecb8487a0ef7b753ac8b16 100644 (file)
--- a/tests/error/no_cast.gw
+++ b/tests/error/no_cast.gw
@@ -1,4 +1,4 @@
-#! [contains] no match found for operator
+#! [contains] can't cast
 class C{}
 class D{}
 

diff --git a/tests/fptr/class_ptr01.gw b/tests/fptr/class_ptr01.gw
index 0bc054955bc716de1a19ba8be2eb860d268e79da..a0f286a66eeebb0f06c11ecc41eaae5e62c6e40a 100644 (file)
--- a/tests/fptr/class_ptr01.gw
+++ b/tests/fptr/class_ptr01.gw
@@ -1,4 +1,4 @@
-#![contains] cant't assign
+#! [contains] can't assign
 class C {
   fun static void test(int i) { <<<  "int arg"  >>>; }
   typedef void PtrType(int i);

diff --git a/tests/pp/already_defined.gw b/tests/pp/already_defined.gw
index a7de5d3444b3bd704389db7cb28c97deb7924965..6af0964da67ebe150070cb529c45f170861ff4aa 100644 (file)
--- a/tests/pp/already_defined.gw
+++ b/tests/pp/already_defined.gw
@@ -1,3 +1,3 @@
-#![contains] macro already defined
+#! [contains] macro already defined
 #define macro
 #define macro

diff --git a/tests/pp/call_not_enough.gw b/tests/pp/call_not_enough.gw
index 404c3e5c3b339e81eb87ddb288b6aa1e8f32eb08..59e2c3c76f24f1426d367256f3bfc638d25b9730 100644 (file)
--- a/tests/pp/call_not_enough.gw
+++ b/tests/pp/call_not_enough.gw
@@ -1,3 +1,3 @@
-#![contains] not enough arguments
+#! [contains] not enough arguments
 #define macro(a, b) a, b
 <<< macro(1) >>>;

diff --git a/tests/pp/call_too_many.gw b/tests/pp/call_too_many.gw
index 72753f9e21f880a327e3d725c58a8f79fcc5dd06..b133de5a4107d5cdfabb6afec054a876a54a47a4 100644 (file)
--- a/tests/pp/call_too_many.gw
+++ b/tests/pp/call_too_many.gw
@@ -1,3 +1,3 @@
-#![contains] too many arguments
+#! [contains] too many arguments
 #define macro(a) a
 <<< macro(1,2) >>>;

diff --git a/tests/pp/conditional.gw b/tests/pp/conditional.gw
index 8ba5dcc5a8bb87b44d203e51a30465e6f5beb805..7b9330c4c45874f88d0a70d08b39533f1b21449b 100644 (file)
--- a/tests/pp/conditional.gw
+++ b/tests/pp/conditional.gw
@@ -1,5 +1,4 @@
-#![contains] 'macro' defined"
-#![contains] 'macro' undefined (after undefining)"
+#! [contains] 'macro' defined
 #define macro
 #ifdef macro
 <<< "'macro' defined" >>>;

diff --git a/tests/pp/define_empty.gw b/tests/pp/define_empty.gw
index 4bce1e1056a1734e4d807b60a4f40a746570af79..13a6313c494be4411c8990af43362057b02f8906 100644 (file)
--- a/tests/pp/define_empty.gw
+++ b/tests/pp/define_empty.gw
@@ -1,4 +1,4 @@
-#![contains] end of text
+#! [contains] end of test
 #define macro
 macro
 

diff --git a/tests/pp/define_empty_args.gw b/tests/pp/define_empty_args.gw
index 81e39aefd6c603798aec48cd850dcebc2667b570..ddbd5cb06599cf6ed68cfe05bc47aedacc4688ba 100644 (file)
--- a/tests/pp/define_empty_args.gw
+++ b/tests/pp/define_empty_args.gw
@@ -1,4 +1,4 @@
-#![contains] end of test
+#! [contains] end of test
 #define macro(a,b)
 macro(1,2);
 

diff --git a/tests/pp/define_empty_vararg.gw b/tests/pp/define_empty_vararg.gw
index ae6fd2b30bc6c6e8634a79f399df6e46e267202e..8bc239a6e906063d00b11ceaac6666df358b4368 100644 (file)
--- a/tests/pp/define_empty_vararg.gw
+++ b/tests/pp/define_empty_vararg.gw
@@ -1,3 +1,3 @@
-#![contains] 123
+#! [contains] 123
 #define macro(...) __VA_ARGS__
 <<< macro(1,2,3) >>>;

diff --git a/tests/pp/define_text.gw b/tests/pp/define_text.gw
index e7431071e59b64fd0d23467b524490210f457631..479402d96ce6fac473750a9c1f98c34681903945 100644 (file)
--- a/tests/pp/define_text.gw
+++ b/tests/pp/define_text.gw
@@ -1,3 +1,3 @@
-#![contains] test
+#! [contains] test
 #define macro "test"
 <<< macro >>>;

diff --git a/tests/pp/define_text_args.gw b/tests/pp/define_text_args.gw
index eac94955f0efea7b4ca0ee95cb84e559de7f0620..0a540d63356433b608581ffab1b69f952280a7c5 100644 (file)
--- a/tests/pp/define_text_args.gw
+++ b/tests/pp/define_text_args.gw
@@ -1,3 +1,3 @@
-#![contains] test12
+#! [contains] test12
 #define macro(a,b) "test", a, b
 <<< macro(1,2) >>>;

diff --git a/tests/pp/file_not_found.gw b/tests/pp/file_not_found.gw
index b1814a2273b07e7b0bbc7b70bb6967f55fe99591..bced98904d7f57b9f4ba47871ee6473f3d26fa27 100644 (file)
--- a/tests/pp/file_not_found.gw
+++ b/tests/pp/file_not_found.gw
@@ -1,2 +1,2 @@
-#![contains] file not found
+#! [contains] file not found
 #include <non_existant_file>

diff --git a/tests/pp/include.gw b/tests/pp/include.gw
index 608ce297d394f916899b8d53795dfb956ad94278..591527136f9c7580854714be66f688f3bba424b5 100644 (file)
--- a/tests/pp/include.gw
+++ b/tests/pp/include.gw
@@ -1,2 +1,2 @@
-#![contains] tests/pp/header.gw
+#! [contains] tests/pp/header.gw
 #include <tests/pp/header.gw>

diff --git a/tests/pp/undefined_macro.gw b/tests/pp/undefined_macro.gw
index f6d764a3f17c76388dd441e95329d970c4745b56..5efd75d3fbe16558194bfa51c1facc85b60e201b 100644 (file)
--- a/tests/pp/undefined_macro.gw
+++ b/tests/pp/undefined_macro.gw
@@ -1,2 +1,2 @@
-#![contains] undefined macro
+#! [contains] undefined macro
 #undef macro

diff --git a/tests/sh/test.sh b/tests/sh/test.sh
index 69545c0ab0ab34fdd0f3f0b540efac2445bbf074..58f409f0d68236b1590acef928002c30f018980a 100644 (file)
--- a/tests/sh/test.sh
+++ b/tests/sh/test.sh
@@ -31,7 +31,7 @@ assert_returns() {
 
 assert_contain() {
   local contains
-  contains=$(grep '// \[contains\]' "$1" | cut -d "]" -f2)
+  contains=$(grep '#! \[contains\]' "$1" | cut -d "]" -f2)
   contains=${contains:1}
   [ -z "$contains" ] && return 0
   grep "$contains" "$2.err.log" > /dev/null && return 0