Update call_indirect text syntax to match spec update (#1281)

Function type gets its own element rather than being a part of the call_indirect
(see WebAssembly/spec#599)

7 files changed, 7 insertions, 7 deletions

diff --git a/test/ctor-eval/bad-indirect-call.wast b/test/ctor-eval/bad-indirect-call.wast
index bed3112c3..cbc48427a 100644
--- a/test/ctor-eval/bad-indirect-call.wast
+++ b/test/ctor-eval/bad-indirect-call.wast
@@ -6,7 +6,7 @@
   (elem (i32.const 0) $call-indirect)
   (export "test1" $test1)
   (func $test1
-    (call_indirect $v (i32.const 1)) ;; unsafe to call, out of range
+    (call_indirect (type $v) (i32.const 1)) ;; unsafe to call, out of range
     (i32.store8 (i32.const 20) (i32.const 120))
   )
   (func $call-indirect
diff --git a/test/ctor-eval/bad-indirect-call.wast.out b/test/ctor-eval/bad-indirect-call.wast.out
index 5cd7830f9..9c9897731 100644
--- a/test/ctor-eval/bad-indirect-call.wast.out
+++ b/test/ctor-eval/bad-indirect-call.wast.out
@@ -6,7 +6,7 @@
  (data (i32.const 10) "waka waka waka waka waka")
  (export "test1" (func $test1))
  (func $test1 (; 0 ;) (type $v)
-  (call_indirect $v
+  (call_indirect (type $v)
    (i32.const 1)
   )
   (i32.store8
diff --git a/test/ctor-eval/bad-indirect-call2.wast b/test/ctor-eval/bad-indirect-call2.wast
index 52eaab67c..a19d02be7 100644
--- a/test/ctor-eval/bad-indirect-call2.wast
+++ b/test/ctor-eval/bad-indirect-call2.wast
@@ -7,7 +7,7 @@
   (elem (i32.const 0) $_abort $call-indirect)
   (export "test1" $test1)
   (func $test1
-    (call_indirect $v (i32.const 0)) ;; unsafe to call, imported
+    (call_indirect (type $v) (i32.const 0)) ;; unsafe to call, imported
     (i32.store8 (i32.const 20) (i32.const 120))
   )
   (func $call-indirect
diff --git a/test/ctor-eval/bad-indirect-call2.wast.out b/test/ctor-eval/bad-indirect-call2.wast.out
index dd3800a84..b6a50c2f5 100644
--- a/test/ctor-eval/bad-indirect-call2.wast.out
+++ b/test/ctor-eval/bad-indirect-call2.wast.out
@@ -8,7 +8,7 @@
  (data (i32.const 10) "waka waka waka waka waka")
  (export "test1" (func $test1))
  (func $test1 (; 1 ;) (type $v)
-  (call_indirect $v
+  (call_indirect (type $v)
    (i32.const 0)
   )
   (i32.store8
diff --git a/test/ctor-eval/basics-flatten.wast b/test/ctor-eval/basics-flatten.wast
index 3bbd27a6b..da8b76163 100644
--- a/test/ctor-eval/basics-flatten.wast
+++ b/test/ctor-eval/basics-flatten.wast
@@ -13,7 +13,7 @@
   (func $test1
     (drop (i32.const 0)) ;; no work at all, really
     (call $safe-to-call) ;; safe to call
-    (call_indirect $v (i32.const 0)) ;; safe to call
+    (call_indirect (type $v) (i32.const 0)) ;; safe to call
   )
   (func $test2
     (drop (i32.load (i32.const 12))) ;; a safe load
diff --git a/test/ctor-eval/basics.wast b/test/ctor-eval/basics.wast
index a81b2de2f..997e2cd11 100644
--- a/test/ctor-eval/basics.wast
+++ b/test/ctor-eval/basics.wast
@@ -10,7 +10,7 @@
   (func $test1
     (drop (i32.const 0)) ;; no work at all, really
     (call $safe-to-call) ;; safe to call
-    (call_indirect $v (i32.const 0)) ;; safe to call
+    (call_indirect (type $v) (i32.const 0)) ;; safe to call
   )
   (func $test2
     (drop (i32.load (i32.const 12))) ;; a safe load
diff --git a/test/ctor-eval/indirect-call3.wast b/test/ctor-eval/indirect-call3.wast
index 9eaa90821..6695fc5b8 100644
--- a/test/ctor-eval/indirect-call3.wast
+++ b/test/ctor-eval/indirect-call3.wast
@@ -8,7 +8,7 @@
   (elem (get_global $tableBase) $_abort $call-indirect)
   (export "test1" $test1)
   (func $test1
-    (call_indirect $v (i32.const 1)) ;; safe to call
+    (call_indirect (type $v) (i32.const 1)) ;; safe to call
     (i32.store8 (i32.const 20) (i32.const 120))
   )
   (func $call-indirect