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)

Author: dschuff

src/passes/Print.cpp

@@ -264,7 +264,7 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
     printCallBody(curr);
   }
   void visitCallIndirect(CallIndirect *curr) {
-    printOpening(o, "call_indirect ") << curr->fullType;
+    printOpening(o, "call_indirect (type ") << curr->fullType << ')';
     incIndent();
     for (auto operand : curr->operands) {
       printFullLine(operand);

src/wasm/wasm-s-parser.cpp

@@ -1387,7 +1387,9 @@ Expression* SExpressionWasmBuilder::makeCallImport(Element& s) {
 Expression* SExpressionWasmBuilder::makeCallIndirect(Element& s) {
   if (!wasm.table.exists) throw ParseException("no table");
   auto ret = allocator.alloc<CallIndirect>();
-  IString type = s[1]->str();
+  Element& typeElement = *s[1];
+  if (typeElement[0]->str() != "type") throw ParseException("expected 'type' in call_indirect", s.line, s.col);
+  IString type = typeElement[1]->str();
   auto* fullType = wasm.getFunctionTypeOrNull(type);
   if (!fullType) throw ParseException("invalid call_indirect type", s.line, s.col);
   ret->fullType = fullType->name;

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

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

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

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

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

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

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

test/dot_s/alias.wast

@@ -62,7 +62,7 @@
   (unreachable)
  )
  (func $dynCall_v (; 6 ;) (param $fptr i32)
-  (call_indirect $FUNCSIG$v
+  (call_indirect (type $FUNCSIG$v)
    (get_local $fptr)
   )
  )