diff options
-rw-r--r-- | test/regress/regress-2.txt | 12 | ||||
-rw-r--r-- | test/regress/regress-5.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-brtable-type-mismatch.txt | 4 | ||||
-rw-r--r-- | test/typecheck/bad-call-type-mismatch.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-callindirect-func-type-mismatch.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-callindirect-type-mismatch.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-function-result-type-mismatch.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-global-getglobal-type-mismatch.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-global-type-mismatch.txt | 2 | ||||
-rw-r--r-- | test/typecheck/bad-setlocal-type-mismatch.txt | 2 | ||||
-rw-r--r-- | test/typecheck/if-value.txt | 3 | ||||
-rw-r--r-- | test/typecheck/label-redefinition.txt | 11 |
12 files changed, 24 insertions, 22 deletions
diff --git a/test/regress/regress-2.txt b/test/regress/regress-2.txt index 384786ae..342ea9ca 100644 --- a/test/regress/regress-2.txt +++ b/test/regress/regress-2.txt @@ -12,25 +12,25 @@ (;; STDERR ;;; regress/regress-2.txt:3:9: type stack size too small at call. got 0, expected at least 1 (func(call 2 )) - ^^^^ + ^^^^^^ regress/regress-2.txt:4:16: type stack size too small at call. got 0, expected at least 1 (func $memor(call 2 )) - ^^^^ + ^^^^^^ regress/regress-2.txt:5:33: function variable out of range (max 9) (func $memory(param f32)(call 332 )) ^^^ regress/regress-2.txt:6:16: type stack size too small at call. got 0, expected at least 1 (func $memor(call 2 )) - ^^^^ + ^^^^^^ regress/regress-2.txt:7:18: type stack size too small at call. got 0, expected at least 1 (func $memornc(call 2 )) - ^^^^ + ^^^^^^ regress/regress-2.txt:8:16: type stack size too small at call. got 0, expected at least 1 (func $mYmor(call 2 )) - ^^^^ + ^^^^^^ regress/regress-2.txt:9:155: type stack size too small at call. got 0, expected at least 1 ...``````````````````````````````````````````````````````````````````r(call 2 )) - ^^^^ + ^^^^^^ regress/regress-2.txt:10:33: function variable out of range (max 9) (func $memory(param f32)(call 332 )) ^^^ diff --git a/test/regress/regress-5.txt b/test/regress/regress-5.txt index 9b377079..77071753 100644 --- a/test/regress/regress-5.txt +++ b/test/regress/regress-5.txt @@ -117,7 +117,7 @@ (i64.const 0)) ;; deliberate type-check error ) (;; STDERR ;;; -regress/regress-5.txt:116:3: unable to join type i64 (type of last operation) with type i32 (function signature result type). +regress/regress-5.txt:116:3: type mismatch at function. got i64, expected i32 (func (result i32) ^^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-brtable-type-mismatch.txt b/test/typecheck/bad-brtable-type-mismatch.txt index 94aeb889..cbf05c75 100644 --- a/test/typecheck/bad-brtable-type-mismatch.txt +++ b/test/typecheck/bad-brtable-type-mismatch.txt @@ -8,7 +8,7 @@ ;; case 1 (i32.const 2))) (;; STDERR ;;; -typecheck/bad-brtable-type-mismatch.txt:5:15: type mismatch at br_table. got f32, expected i32 +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))) - ^^^^^^^^ + ^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-call-type-mismatch.txt b/test/typecheck/bad-call-type-mismatch.txt index 5e97b851..9df52ded 100644 --- a/test/typecheck/bad-call-type-mismatch.txt +++ b/test/typecheck/bad-call-type-mismatch.txt @@ -5,5 +5,5 @@ (;; 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)))) - ^^^^ + ^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-callindirect-func-type-mismatch.txt b/test/typecheck/bad-callindirect-func-type-mismatch.txt index 9f6cbd58..e2a2ee9b 100644 --- a/test/typecheck/bad-callindirect-func-type-mismatch.txt +++ b/test/typecheck/bad-callindirect-func-type-mismatch.txt @@ -6,5 +6,5 @@ (;; 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)))) - ^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-callindirect-type-mismatch.txt b/test/typecheck/bad-callindirect-type-mismatch.txt index 132e7e03..edc6b238 100644 --- a/test/typecheck/bad-callindirect-type-mismatch.txt +++ b/test/typecheck/bad-callindirect-type-mismatch.txt @@ -8,5 +8,5 @@ (;; 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))))) - ^^^^^^^^^^^^^ + ^^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-function-result-type-mismatch.txt b/test/typecheck/bad-function-result-type-mismatch.txt index 559049f2..101454bb 100644 --- a/test/typecheck/bad-function-result-type-mismatch.txt +++ b/test/typecheck/bad-function-result-type-mismatch.txt @@ -3,7 +3,7 @@ (func (result i32) (f32.const 0))) (;; STDERR ;;; -typecheck/bad-function-result-type-mismatch.txt:3:3: unable to join type f32 (type of last operation) with type i32 (function signature result type). +typecheck/bad-function-result-type-mismatch.txt:3:3: type mismatch at function. got f32, expected i32 (func (result i32) ^^^^^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-global-getglobal-type-mismatch.txt b/test/typecheck/bad-global-getglobal-type-mismatch.txt index 5dccddef..08814f8b 100644 --- a/test/typecheck/bad-global-getglobal-type-mismatch.txt +++ b/test/typecheck/bad-global-getglobal-type-mismatch.txt @@ -5,5 +5,5 @@ (;; STDERR ;;; typecheck/bad-global-getglobal-type-mismatch.txt:4:16: type mismatch at global initializer expression. got i32, expected f32 (global f32 (get_global 0))) - ^^^^^^^^^^ + ^^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-global-type-mismatch.txt b/test/typecheck/bad-global-type-mismatch.txt index 11534bb2..c821f073 100644 --- a/test/typecheck/bad-global-type-mismatch.txt +++ b/test/typecheck/bad-global-type-mismatch.txt @@ -4,5 +4,5 @@ (;; STDERR ;;; typecheck/bad-global-type-mismatch.txt:3:16: type mismatch at global initializer expression. got f32, expected i32 (global i32 (f32.const 1))) - ^^^^^^^^^ + ^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/bad-setlocal-type-mismatch.txt b/test/typecheck/bad-setlocal-type-mismatch.txt index 4d0f8c13..0544242a 100644 --- a/test/typecheck/bad-setlocal-type-mismatch.txt +++ b/test/typecheck/bad-setlocal-type-mismatch.txt @@ -5,5 +5,5 @@ (;; STDERR ;;; typecheck/bad-setlocal-type-mismatch.txt:4:6: type mismatch at set_local. got f32, expected i32 (set_local 0 (f32.const 0)))) - ^^^^^^^^^ + ^^^^^^^^^^^ ;;; STDERR ;;) diff --git a/test/typecheck/if-value.txt b/test/typecheck/if-value.txt index 132bf4e9..3c390e82 100644 --- a/test/typecheck/if-value.txt +++ b/test/typecheck/if-value.txt @@ -1,5 +1,6 @@ (module (func (result i32) - (if (i32.const 0) + (if i32 + (i32.const 0) (i32.const 1) (i32.const 2)))) diff --git a/test/typecheck/label-redefinition.txt b/test/typecheck/label-redefinition.txt index 6931529f..be5efb0f 100644 --- a/test/typecheck/label-redefinition.txt +++ b/test/typecheck/label-redefinition.txt @@ -1,7 +1,8 @@ (module (func (result i32) - (block $l1 - (i32.add (block $l1 - (i32.const 2)) - (block $l1 - (br $l1 (i32.const 3))))))) + (block $l1 i32 + (i32.add + (block $l1 i32 + (i32.const 2)) + (block $l1 i32 + (br $l1 (i32.const 3))))))) |