12 files changed, 82 insertions, 47 deletions
diff --git a/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt b/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt
index 7fdfa84b..696f6f0e 100644
--- a/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt
+++ b/test/typecheck/bad-assertreturn-invoke-type-mismatch.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 ;;; FLAGS: --spec
 (module
-  (func (param i32) (result i32) (get_local 0))
+  (func (param i32) (result i32) get_local 0)
   (export "foo" 0))
 (assert_return (invoke "foo" (f32.const 0)) (i32.const 0))
 (;; STDERR ;;;
diff --git a/test/typecheck/bad-assertreturn-type-mismatch.txt b/test/typecheck/bad-assertreturn-type-mismatch.txt
index a20e258a..7f58695a 100644
--- a/test/typecheck/bad-assertreturn-type-mismatch.txt
+++ b/test/typecheck/bad-assertreturn-type-mismatch.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 ;;; FLAGS: --spec
 (module
-  (func (param i32) (result i32) (get_local 0))
+  (func (param i32) (result i32) get_local 0)
   (export "foo" 0))
 (assert_return (invoke "foo" (i32.const 0)) (f32.const 0))
 (;; STDERR ;;;
diff --git a/test/typecheck/bad-binary-type-mismatch-1.txt b/test/typecheck/bad-binary-type-mismatch-1.txt
index 7db3fb9c..3e8e3689 100644
--- a/test/typecheck/bad-binary-type-mismatch-1.txt
+++ b/test/typecheck/bad-binary-type-mismatch-1.txt
@@ -1,9 +1,12 @@
 ;;; ERROR: 1
 (module
   (func
-    (drop (i32.add (f32.const 0) (i32.const 0)))))
+    f32.const 0
+    i32.const 0
+    i32.add  
+    drop))
 (;; STDERR ;;;
-typecheck/bad-binary-type-mismatch-1.txt:4:12: type mismatch at i32.add. got f32, expected i32
-    (drop (i32.add (f32.const 0) (i32.const 0)))))
-           ^^^^^^^
+typecheck/bad-binary-type-mismatch-1.txt:6:5: type mismatch at i32.add. got f32, expected i32
+    i32.add  
+    ^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-binary-type-mismatch-2.txt b/test/typecheck/bad-binary-type-mismatch-2.txt
index 2f12f267..8edf24e7 100644
--- a/test/typecheck/bad-binary-type-mismatch-2.txt
+++ b/test/typecheck/bad-binary-type-mismatch-2.txt
@@ -1,9 +1,12 @@
 ;;; ERROR: 1
 (module
   (func
-    (drop (i32.add (i32.const 0) (f32.const 0)))))
+    i32.const 0
+    f32.const 0
+    i32.add 
+    drop))
 (;; STDERR ;;;
-typecheck/bad-binary-type-mismatch-2.txt:4:12: type mismatch at i32.add. got f32, expected i32
-    (drop (i32.add (i32.const 0) (f32.const 0)))))
-           ^^^^^^^
+typecheck/bad-binary-type-mismatch-2.txt:6:5: type mismatch at i32.add. got f32, expected i32
+    i32.add 
+    ^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-br-multi-type.txt b/test/typecheck/bad-br-multi-type.txt
index f907543f..d107724d 100644
--- a/test/typecheck/bad-br-multi-type.txt
+++ b/test/typecheck/bad-br-multi-type.txt
@@ -1,14 +1,16 @@
 ;;; ERROR: 1
 (module
   (func (result f32)
-    (block $exit
-      (br 0 (i32.const 1))
-      (f32.const 2))))
+    block $exit
+      i32.const 1
+      br 0
+      f32.const 2
+    end))
 (;; STDERR ;;;
 typecheck/bad-br-multi-type.txt:3:3: type stack size too small at function. got 0, expected at least 1
   (func (result f32)
-  ^^^^^^^^^^^^^^^^^^
+  ^^^^^^
 typecheck/bad-br-multi-type.txt:3:3: type stack at end of function is 0. expected 1
   (func (result f32)
-  ^^^^^^^^^^^^^^^^^^
+  ^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-brtable-type-mismatch.txt b/test/typecheck/bad-brtable-type-mismatch.txt
index cbf05c75..e9109b00 100644
--- a/test/typecheck/bad-brtable-type-mismatch.txt
+++ b/test/typecheck/bad-brtable-type-mismatch.txt
@@ -1,14 +1,17 @@
 ;;; ERROR: 1
 (module
   (func (result i32)
-    (block
-      (block (br_table 0 1 (f32.const 0)))
-      ;; case 0
-      (return (i32.const 1)))
-    ;; case 1
-    (i32.const 2)))
+    block
+      block
+        f32.const 0
+        br_table 0 1 
+      end
+      i32.const 1
+      return
+    end
+    i32.const 2))
 (;; STDERR ;;;
-typecheck/bad-brtable-type-mismatch.txt:5:15: type mismatch at br_table key. got f32, expected i32
-      (block (br_table 0 1 (f32.const 0)))
-              ^^^^^^^^^^^^
+typecheck/bad-brtable-type-mismatch.txt:7:9: type mismatch at br_table key. got f32, expected i32
+        br_table 0 1 
+        ^^^^^^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-call-result-mismatch.txt b/test/typecheck/bad-call-result-mismatch.txt
index c6a20579..de931bec 100644
--- a/test/typecheck/bad-call-result-mismatch.txt
+++ b/test/typecheck/bad-call-result-mismatch.txt
@@ -6,9 +6,22 @@
   (table anyfunc (elem $direct))
 
   (func
-    (if (call $direct) (nop))
-    (if (call_import $import) (nop))
-    (if (call_indirect $indirect (i32.const 0)) (nop))))
+    if 
+      call $direct
+    else
+      nop
+    end
+    if 
+      call_import $import 
+    else 
+      nop 
+    end
+    if
+      i32.const 0 
+      call_indirect $indirect 
+    else 
+      nop
+    end))
 (;; STDERR ;;;
 typecheck/bad-call-result-mismatch.txt:3:11: syntax error, unexpected VAR, expecting TEXT
   (import $import "foo" "bar" (result f32))
diff --git a/test/typecheck/bad-call-type-mismatch.txt b/test/typecheck/bad-call-type-mismatch.txt
index 9df52ded..23564f59 100644
--- a/test/typecheck/bad-call-type-mismatch.txt
+++ b/test/typecheck/bad-call-type-mismatch.txt
@@ -1,9 +1,11 @@
 ;;; ERROR: 1
 (module
   (func (param i32 i64)
-    (call 0 (i64.const 0) (i64.const 0))))
+    i64.const 0
+    i64.const 0
+    call 0))
 (;; STDERR ;;;
-typecheck/bad-call-type-mismatch.txt:4:6: type mismatch for argument 0 of call. got i64, expected i32
-    (call 0 (i64.const 0) (i64.const 0))))
-     ^^^^^^
+typecheck/bad-call-type-mismatch.txt:6:5: type mismatch for argument 0 of call. got i64, expected i32
+    call 0))
+    ^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-callimport-type-mismatch.txt b/test/typecheck/bad-callimport-type-mismatch.txt
index e165207c..0e49b7ed 100644
--- a/test/typecheck/bad-callimport-type-mismatch.txt
+++ b/test/typecheck/bad-callimport-type-mismatch.txt
@@ -1,9 +1,11 @@
 ;;; ERROR: 1
 (module
   (import "foo" "bar" (func (param i32)))
-  (func (call 0 (f32.const 0))))
+  (func
+    f32.const 0
+    call 0))
 (;; STDERR ;;;
-typecheck/bad-callimport-type-mismatch.txt:4:10: type mismatch for argument 0 of call. got f32, expected i32
-  (func (call 0 (f32.const 0))))
-         ^^^^^^
+typecheck/bad-callimport-type-mismatch.txt:6:5: type mismatch for argument 0 of call. got f32, expected i32
+    call 0))
+    ^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-callindirect-func-type-mismatch.txt b/test/typecheck/bad-callindirect-func-type-mismatch.txt
index e2a2ee9b..5509212e 100644
--- a/test/typecheck/bad-callindirect-func-type-mismatch.txt
+++ b/test/typecheck/bad-callindirect-func-type-mismatch.txt
@@ -2,9 +2,11 @@
 (module
   (table anyfunc (elem 0))
   (type $t (func))
-  (func (call_indirect $t (f32.const 0))))
+  (func 
+    f32.const 0
+    call_indirect $t))
 (;; STDERR ;;;
-typecheck/bad-callindirect-func-type-mismatch.txt:5:10: type mismatch at call_indirect function index. got f32, expected i32
-  (func (call_indirect $t (f32.const 0))))
-         ^^^^^^^^^^^^^^^^
+typecheck/bad-callindirect-func-type-mismatch.txt:7:5: type mismatch at call_indirect function index. got f32, expected i32
+    call_indirect $t))
+    ^^^^^^^^^^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-callindirect-type-mismatch.txt b/test/typecheck/bad-callindirect-type-mismatch.txt
index edc6b238..f84ea930 100644
--- a/test/typecheck/bad-callindirect-type-mismatch.txt
+++ b/test/typecheck/bad-callindirect-type-mismatch.txt
@@ -4,9 +4,12 @@
   (func $f (type $t) (i32.const 0))
   (table anyfunc (elem $f))
   (func
-    (drop (call_indirect $t (f32.const 0) (i32.const 0)))))
+    f32.const 0
+    i32.const 0
+    call_indirect $t
+    drop))
 (;; STDERR ;;;
-typecheck/bad-callindirect-type-mismatch.txt:7:12: type mismatch for argument 0 of call_indirect. got f32, expected i32
-    (drop (call_indirect $t (f32.const 0) (i32.const 0)))))
-           ^^^^^^^^^^^^^^^^
+typecheck/bad-callindirect-type-mismatch.txt:9:5: type mismatch for argument 0 of call_indirect. got f32, expected i32
+    call_indirect $t
+    ^^^^^^^^^^^^^^^^
 ;;; STDERR ;;)
diff --git a/test/typecheck/bad-cast-type-mismatch.txt b/test/typecheck/bad-cast-type-mismatch.txt
index c8907f0f..ac2c0470 100644
--- a/test/typecheck/bad-cast-type-mismatch.txt
+++ b/test/typecheck/bad-cast-type-mismatch.txt
@@ -1,9 +1,11 @@
 ;;; ERROR: 1
 (module
   (func
-    (drop (f32.reinterpret/i32 (f32.const 0)))))
+    f32.const 0
+    f32.reinterpret/i32
+    drop))
 (;; STDERR ;;;
-typecheck/bad-cast-type-mismatch.txt:4:12: type mismatch at f32.reinterpret/i32. got f32, expected i32
-    (drop (f32.reinterpret/i32 (f32.const 0)))))
-           ^^^^^^^^^^^^^^^^^^^
+typecheck/bad-cast-type-mismatch.txt:5:5: type mismatch at f32.reinterpret/i32. got f32, expected i32
+    f32.reinterpret/i32
+    ^^^^^^^^^^^^^^^^^^^
 ;;; STDERR ;;)