:art: Use 'typeof(...)' instead of ''

diff --git a/ast b/ast
index 32ad70fb10178dbe20c2a587a200f7e9b83514c4..2f8b2cbef38f0680124647d6c707cebf0da9d9cf 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 32ad70fb10178dbe20c2a587a200f7e9b83514c4
+Subproject commit 2f8b2cbef38f0680124647d6c707cebf0da9d9cf

diff --git a/examples/typeof_decl.gw b/examples/typeof_decl.gw
index a71256448ef3ddff097eb8b53e9a94a9e97b5bef..7d5d8bf527612fdab929a62176986924496fb434 100644 (file)
--- a/examples/typeof_decl.gw
+++ b/examples/typeof_decl.gw
@@ -1,2 +1,2 @@
 int i;
-<<<`i` j>>>;
+<<<typeof(i) j>>>;

diff --git a/tests/error/typeof_error.gw b/tests/error/typeof_error.gw
index 7c727c8dce0525c24f0b0f4e17114ffd17c3771e..a621e38e3d1fc23cd167a964665efc9691dea0af 100644 (file)
--- a/tests/error/typeof_error.gw
+++ b/tests/error/typeof_error.gw
@@ -1 +1 @@
-` 1 + 2 ` i;
\ No newline at end of file
+typeof( 1 + 2 ) i;
\ No newline at end of file

diff --git a/tests/new/invalid_decl_exp.gw b/tests/new/invalid_decl_exp.gw
index 7f9438d798f2a000b7736fcdae6172f49ad5742d..2eb33ffc84afa344c5bc30122f4ece340b198917 100644 (file)
--- a/tests/new/invalid_decl_exp.gw
+++ b/tests/new/invalid_decl_exp.gw
@@ -1,2 +1,2 @@
-`1` i;
+typeof(1) i;
 <<< i >>>;

diff --git a/tests/new/lambda.gw b/tests/new/lambda.gw
index 8481c1c065fc873b624a8cf21b186e26c8b3bdec..4e1a697cd9790427b0212d735982d8fdb2f1ae38 100644 (file)
--- a/tests/new/lambda.gw
+++ b/tests/new/lambda.gw
@@ -1,7 +1,7 @@
 class C {
   typedef void ptr_t(int i,int j);
   \a b { <<< this, " ", a, " ", b, " test" >>>; } @=> ptr_t ptr;
-#!  `a,b` { <<< "test" >>>; } @=> 
+#!  typeof(a,b) { <<< "test" >>>; } @=> 
 #!  ptr_t ptr;
 #!  ptr(1,2);
   fun void test(int i, int j) { <<< this, " ", i, " ", j >>>; }
@@ -9,7 +9,7 @@ class C {
 #!<<< t >>>;
 #!    t(2,i);
 #!  }
-#!  test(`a,b` { <<< this, " lambda argument" >>>; }, 2);
+#!  test(typeof(a,b) { <<< this, " lambda argument" >>>; }, 2);
 }
 #!<<< C c >>>;
 C c;
@@ -26,7 +26,7 @@ c.ptr(1, 2);
 #!c.ptr(1, 2);
 #!c.ptr(1, 2);
 #!(1,2) => c.ptr;
-#!c.test(`a,b` { <<< this, "lambda argument" >>>; }, 2);
+#!c.test(typeof(a,b) { <<< this, "lambda argument" >>>; }, 2);
 #!c.test(c.ptr, 2);
 #!<<< c.ptr >>>;
 #!c.ptr;

diff --git a/tests/new/noxid.gw b/tests/new/noxid.gw
index 6470df6463c181a730b986576d16f84e54b208d3..7331f8a7906ab35aa4b802f4e3bfb231750e5177 100644 (file)
--- a/tests/new/noxid.gw
+++ b/tests/new/noxid.gw
@@ -1 +1 @@
-`1` i;
+typeof(1) i;

diff --git a/tests/tree/check_td_arg.gw b/tests/tree/check_td_arg.gw
index 139e39074d0cc846447aeac3c95b104109a6fc38..2fbc7d91045d56b5013ef5c7778aa34d24c1e83e 100644 (file)
--- a/tests/tree/check_td_arg.gw
+++ b/tests/tree/check_td_arg.gw
@@ -1 +1 @@
-fun void test(`1` i) {}
+fun void test(typeof(1) i) {}

diff --git a/tests/tree/check_td_array.gw b/tests/tree/check_td_array.gw
index 6638e2b230d37a0ff3e3c4f59ca51ee5732c7f75..7760721485bc4a8f9724d38832f030dc9c9485ce 100644 (file)
--- a/tests/tree/check_td_array.gw
+++ b/tests/tree/check_td_array.gw
@@ -1,3 +1,3 @@
 int array[][][];
-`array` other_array;
+typeof(array) other_array;
 <<< other_array >>>;

diff --git a/tests/tree/cpy_ast.gw b/tests/tree/cpy_ast.gw
index 94319435daab4715c6d1fb225d4e265f9b6f00dd..3e95ee8d593c1946de39d6b84ea5273091a05ed6 100644 (file)
--- a/tests/tree/cpy_ast.gw
+++ b/tests/tree/cpy_ast.gw
@@ -2,7 +2,7 @@ class <~A~>C {
   \a{};
   [ 1 ];
   int i,j;
-  `i` k;
+  typeof(i) k;
   @(0);
   'a';
   true $ int;

diff --git a/tests/tree/decl_exp_array.gw b/tests/tree/decl_exp_array.gw
index 5d0bd8691920a4043d2e117d99476486faa36257..26db0ea1f594d8ef84c47910ae7437b2bd351a4e 100644 (file)
--- a/tests/tree/decl_exp_array.gw
+++ b/tests/tree/decl_exp_array.gw
@@ -1,2 +1,2 @@
-<<< ` new int[2] ` i >>>;
+<<< typeof( new int[2] ) i >>>;
 <<< i >>>;
\ No newline at end of file

diff --git a/tests/tree/func_check_td.gw b/tests/tree/func_check_td.gw
index eaf9d0b2868ffedce1a4b4a403d18ac6232d3d6b..d96881dd85b66e272f1816598a99febf90da7e0c 100644 (file)
--- a/tests/tree/func_check_td.gw
+++ b/tests/tree/func_check_td.gw
@@ -1,2 +1,2 @@
-fun `1` test() {}
+fun typeof(1) test() {}
 

diff --git a/tests/tree/undefined.gw b/tests/tree/undefined.gw
index 64821e36e9823cd342db70e3abfb60935ef499be..cc4d5fc3d8e0bc416edd1a854ce3c979ce974612 100644 (file)
--- a/tests/tree/undefined.gw
+++ b/tests/tree/undefined.gw
@@ -1,2 +1,2 @@
 
-`typeof(1)` i;
+typeof(typeof(1)) i;