diff options
Diffstat (limited to 'test')
37 files changed, 119 insertions, 119 deletions
diff --git a/test/d8/break.txt b/test/d8/br.txt index 91a982ea..73dc6700 100644 --- a/test/d8/break.txt +++ b/test/d8/br.txt @@ -1,24 +1,24 @@ ;;; EXE: test/run-d8.py (module - ;; basic break test - (export "break0" $break0) - (func $break0 (result i32) + ;; basic br test + (export "br0" $br0) + (func $br0 (result i32) (local i32 i32) (block $exit - (if (i32.const 1) (break)) + (if (i32.const 1) (br)) (set_local 0 (i32.const 1))) ;; not executed (set_local 1 (i32.const 1)) (return (i32.add (i32.eq (get_local 0) (i32.const 0)) (i32.eq (get_local 1) (i32.const 1))))) - ;; test breaking with a depth > 0 - (export "break1" $break1) - (func $break1 (result i32) + ;; test bring with a depth > 0 + (export "br1" $br1) + (func $br1 (result i32) (local i32 i32 i32) (block $outer (block $inner - (if (i32.const 1) (break 1)) + (if (i32.const 1) (br 1)) (set_local 0 (i32.const 1))) ;; not executed (set_local 1 (i32.const 1))) ;; not executed (set_local 2 (i32.const 1)) @@ -27,33 +27,33 @@ (i32.eq (get_local 1) (i32.const 0))) (i32.eq (get_local 2) (i32.const 1))))) - ;; test breaking to a label - (export "break2" $break2) - (func $break2 (result i32) + ;; test bring to a label + (export "br2" $br2) + (func $br2 (result i32) (label $exit (block (if (i32.const 1) - (break $exit)) + (br $exit)) (return (i32.const 1)))) ;; not executed (return (i32.const 2))) - ;; test breaking in a loop with an exit and continue continuation - (export "break3" $break3) - (func $break3 (result i32) + ;; test bring in a loop with an exit and continue continuation + (export "br3" $br3) + (func $br3 (result i32) (local i32 i32) (loop $exit $cont (set_local 0 (i32.add (get_local 0) (i32.const 1))) (if (i32.ge_s (get_local 0) (i32.const 5)) - (break $exit)) + (br $exit)) (if (i32.eq (get_local 0) (i32.const 4)) - (break $cont)) + (br $cont)) (set_local 1 (get_local 0)) (br $cont)) (return (get_local 1))) ) (;; STDOUT ;;; -break0() = 2 -break1() = 3 -break2() = 2 -break3() = 3 +br0() = 2 +br1() = 3 +br2() = 2 +br3() = 3 ;;; STDOUT ;;) diff --git a/test/d8/expr-break.txt b/test/d8/expr-br.txt index 6912479e..967338bc 100644 --- a/test/d8/expr-break.txt +++ b/test/d8/expr-br.txt @@ -4,7 +4,7 @@ (label (block (if (i32.eq (get_local 0) (i32.const 0)) - (break (i32.const 1))) + (br (i32.const 1))) (i32.const 2)))) (func $test1 (result i32) diff --git a/test/dump/break-block-named.txt b/test/dump/br-block-named.txt index fc2016f9..3dc11df2 100644 --- a/test/dump/break-block-named.txt +++ b/test/dump/br-block-named.txt @@ -6,8 +6,8 @@ (block ;; 1 (i32.const 0) (block $inner ;; 0 - (break $inner) - (break $outer))))))) + (br $inner) + (br $outer))))))) (;; STDOUT ;;; 0000000: 01 ; WASM_SECTION_SIGNATURES 0000001: 01 ; num signatures diff --git a/test/dump/break-block.txt b/test/dump/br-block.txt index d38d004f..7141dbd9 100644 --- a/test/dump/break-block.txt +++ b/test/dump/br-block.txt @@ -6,10 +6,10 @@ (block ;; 1 (i32.const 0) (block $inner ;; 0 0 - (break) - (break 0) - (break 1) - (break 2))))))) + (br) + (br 0) + (br 1) + (br 2))))))) (;; STDOUT ;;; 0000000: 01 ; WASM_SECTION_SIGNATURES 0000001: 01 ; num signatures diff --git a/test/dump/break-label.txt b/test/dump/br-label.txt index e2ec939e..7c36650b 100644 --- a/test/dump/break-label.txt +++ b/test/dump/br-label.txt @@ -5,7 +5,7 @@ (block (nop) (if (i32.const 1) - (break $foo)))))) + (br $foo)))))) (;; STDOUT ;;; 0000000: 01 ; WASM_SECTION_SIGNATURES 0000001: 01 ; num signatures diff --git a/test/dump/break-loop-inner-expr.txt b/test/dump/br-loop-inner-expr.txt index 5b964583..d749a473 100644 --- a/test/dump/break-loop-inner-expr.txt +++ b/test/dump/br-loop-inner-expr.txt @@ -3,9 +3,9 @@ (func (result i32) (loop $exit $cont (if (i32.const 1) - (break $cont)) + (br $cont)) (if (i32.const 3) - (break $exit (i32.const 4))) + (br $exit (i32.const 4))) (i32.const 5)))) (;; STDOUT ;;; 0000000: 01 ; WASM_SECTION_SIGNATURES diff --git a/test/dump/break-loop-inner.txt b/test/dump/br-loop-inner.txt index e5c0cd5b..3d00b849 100644 --- a/test/dump/break-loop-inner.txt +++ b/test/dump/br-loop-inner.txt @@ -3,9 +3,9 @@ (func (loop $exit $cont (if (i32.const 1) - (break $exit)) + (br $exit)) (if (i32.const 2) - (break $cont))))) + (br $cont))))) (;; STDOUT ;;; 0000000: 01 ; WASM_SECTION_SIGNATURES 0000001: 01 ; num signatures diff --git a/test/dump/break-loop.txt b/test/dump/br-loop.txt index b8f40790..4df606a9 100644 --- a/test/dump/break-loop.txt +++ b/test/dump/br-loop.txt @@ -3,7 +3,7 @@ (func (loop $cont (if (i32.const 1) - (break $cont))))) + (br $cont))))) (;; STDOUT ;;; 0000000: 01 ; WASM_SECTION_SIGNATURES 0000001: 01 ; num signatures diff --git a/test/dump/expr-break.txt b/test/dump/expr-br.txt index a11b7b51..6db87e68 100644 --- a/test/dump/expr-break.txt +++ b/test/dump/expr-br.txt @@ -2,7 +2,7 @@ (module (func (result i32) (label - (break 0 (i32.const 1))))) + (br 0 (i32.const 1))))) (;; STDOUT ;;; 0000000: 01 ; WASM_SECTION_SIGNATURES 0000001: 01 ; num signatures diff --git a/test/parse/expr/bad-br-bad-depth.txt b/test/parse/expr/bad-br-bad-depth.txt new file mode 100644 index 00000000..3cbd6990 --- /dev/null +++ b/test/parse/expr/bad-br-bad-depth.txt @@ -0,0 +1,9 @@ +;;; ERROR: 1 +(module + (func + (label ;; 1 + (label ;; 0 + (br 2))))) +(;; STDERR ;;; +parse/expr/bad-br-bad-depth.txt:6:13: label variable out of range (max 2) +;;; STDERR ;;) diff --git a/test/parse/expr/bad-br-defined-later.txt b/test/parse/expr/bad-br-defined-later.txt new file mode 100644 index 00000000..194f52b7 --- /dev/null +++ b/test/parse/expr/bad-br-defined-later.txt @@ -0,0 +1,7 @@ +;;; ERROR: 1 +(module (func + (br 0) + (label (nop)))) +(;; STDERR ;;; +parse/expr/bad-br-defined-later.txt:3:7: label variable out of range (max 0) +;;; STDERR ;;) diff --git a/test/parse/expr/bad-br-name-undefined.txt b/test/parse/expr/bad-br-name-undefined.txt new file mode 100644 index 00000000..7641ad2a --- /dev/null +++ b/test/parse/expr/bad-br-name-undefined.txt @@ -0,0 +1,5 @@ +;;; ERROR: 1 +(module (func (br $n))) +(;; STDERR ;;; +parse/expr/bad-br-name-undefined.txt:2:19: undefined label variable "$n" +;;; STDERR ;;) diff --git a/test/parse/expr/bad-br-name.txt b/test/parse/expr/bad-br-name.txt new file mode 100644 index 00000000..92e8a203 --- /dev/null +++ b/test/parse/expr/bad-br-name.txt @@ -0,0 +1,5 @@ +;;; ERROR: 1 +(module (func (label $foo (br foo)))) +(;; STDERR ;;; +parse/expr/bad-br-name.txt:2:31: unexpected token "foo" +;;; STDERR ;;) diff --git a/test/parse/expr/bad-br-no-label.txt b/test/parse/expr/bad-br-no-label.txt new file mode 100644 index 00000000..b6bfe3a4 --- /dev/null +++ b/test/parse/expr/bad-br-no-label.txt @@ -0,0 +1,5 @@ +;;; ERROR: 1 +(module (func (br))) +(;; STDERR ;;; +parse/expr/bad-br-no-label.txt:2:16: label variable out of range (max 0) +;;; STDERR ;;) diff --git a/test/parse/expr/bad-br-undefined.txt b/test/parse/expr/bad-br-undefined.txt new file mode 100644 index 00000000..71729b52 --- /dev/null +++ b/test/parse/expr/bad-br-undefined.txt @@ -0,0 +1,5 @@ +;;; ERROR: 1 +(module (func (br 0))) +(;; STDERR ;;; +parse/expr/bad-br-undefined.txt:2:19: label variable out of range (max 0) +;;; STDERR ;;) diff --git a/test/parse/expr/bad-break-bad-depth.txt b/test/parse/expr/bad-break-bad-depth.txt deleted file mode 100644 index 1a666eb8..00000000 --- a/test/parse/expr/bad-break-bad-depth.txt +++ /dev/null @@ -1,9 +0,0 @@ -;;; ERROR: 1 -(module - (func - (label ;; 1 - (label ;; 0 - (break 2))))) -(;; STDERR ;;; -parse/expr/bad-break-bad-depth.txt:6:16: label variable out of range (max 2) -;;; STDERR ;;) diff --git a/test/parse/expr/bad-break-defined-later.txt b/test/parse/expr/bad-break-defined-later.txt deleted file mode 100644 index c1879bde..00000000 --- a/test/parse/expr/bad-break-defined-later.txt +++ /dev/null @@ -1,7 +0,0 @@ -;;; ERROR: 1 -(module (func - (break 0) - (label (nop)))) -(;; STDERR ;;; -parse/expr/bad-break-defined-later.txt:3:10: label variable out of range (max 0) -;;; STDERR ;;) diff --git a/test/parse/expr/bad-break-name-undefined.txt b/test/parse/expr/bad-break-name-undefined.txt deleted file mode 100644 index c02125ee..00000000 --- a/test/parse/expr/bad-break-name-undefined.txt +++ /dev/null @@ -1,5 +0,0 @@ -;;; ERROR: 1 -(module (func (break $n))) -(;; STDERR ;;; -parse/expr/bad-break-name-undefined.txt:2:22: undefined label variable "$n" -;;; STDERR ;;) diff --git a/test/parse/expr/bad-break-name.txt b/test/parse/expr/bad-break-name.txt deleted file mode 100644 index 1f8eed9e..00000000 --- a/test/parse/expr/bad-break-name.txt +++ /dev/null @@ -1,5 +0,0 @@ -;;; ERROR: 1 -(module (func (label $foo (break foo)))) -(;; STDERR ;;; -parse/expr/bad-break-name.txt:2:34: unexpected token "foo" -;;; STDERR ;;) diff --git a/test/parse/expr/bad-break-no-label.txt b/test/parse/expr/bad-break-no-label.txt deleted file mode 100644 index 52261560..00000000 --- a/test/parse/expr/bad-break-no-label.txt +++ /dev/null @@ -1,5 +0,0 @@ -;;; ERROR: 1 -(module (func (break))) -(;; STDERR ;;; -parse/expr/bad-break-no-label.txt:2:16: label variable out of range (max 0) -;;; STDERR ;;) diff --git a/test/parse/expr/bad-break-undefined.txt b/test/parse/expr/bad-break-undefined.txt deleted file mode 100644 index 7b9e61e2..00000000 --- a/test/parse/expr/bad-break-undefined.txt +++ /dev/null @@ -1,5 +0,0 @@ -;;; ERROR: 1 -(module (func (break 0))) -(;; STDERR ;;; -parse/expr/bad-break-undefined.txt:2:22: label variable out of range (max 0) -;;; STDERR ;;) diff --git a/test/parse/expr/break-block.txt b/test/parse/expr/br-block.txt index 40f9892b..013a78b6 100644 --- a/test/parse/expr/break-block.txt +++ b/test/parse/expr/br-block.txt @@ -1,6 +1,6 @@ (module (func (block $exit1 - (break 0)) + (br 0)) (block $exit2 - (break $exit2)))) + (br $exit2)))) diff --git a/test/parse/expr/br-loop.txt b/test/parse/expr/br-loop.txt new file mode 100644 index 00000000..72f92942 --- /dev/null +++ b/test/parse/expr/br-loop.txt @@ -0,0 +1,7 @@ +(module + (func + (loop $exit + (br $exit)) + (loop $outer $inner + (br $inner) + (br $outer)))) diff --git a/test/parse/expr/break-named.txt b/test/parse/expr/br-named.txt index 829f0ac2..2b3bb92b 100644 --- a/test/parse/expr/break-named.txt +++ b/test/parse/expr/br-named.txt @@ -1,3 +1,3 @@ (module (func (label $foo - (break $foo)))) + (br $foo)))) diff --git a/test/parse/expr/break-loop.txt b/test/parse/expr/break-loop.txt deleted file mode 100644 index 9bc1fc49..00000000 --- a/test/parse/expr/break-loop.txt +++ /dev/null @@ -1,7 +0,0 @@ -(module - (func - (loop $exit - (break $exit)) - (loop $outer $inner - (break $inner) - (break $outer)))) diff --git a/test/parse/expr/break.txt b/test/parse/expr/break.txt index 0b03258e..f1760455 100644 --- a/test/parse/expr/break.txt +++ b/test/parse/expr/break.txt @@ -1,3 +1,3 @@ (module (func (label - (break 0)))) + (br 0)))) diff --git a/test/parse/expr/expr-br.txt b/test/parse/expr/expr-br.txt new file mode 100644 index 00000000..f2f0d2b6 --- /dev/null +++ b/test/parse/expr/expr-br.txt @@ -0,0 +1,5 @@ +(module + (func (result i32) + (block $exit + (br (i32.const 0)) + (br 0 (i32.const 0))))) diff --git a/test/parse/expr/expr-break.txt b/test/parse/expr/expr-break.txt deleted file mode 100644 index 44d83ace..00000000 --- a/test/parse/expr/expr-break.txt +++ /dev/null @@ -1,5 +0,0 @@ -(module - (func (result i32) - (block $exit - (break (i32.const 0)) - (break 0 (i32.const 0))))) diff --git a/test/typecheck/bad-br-multi-type.txt b/test/typecheck/bad-br-multi-type.txt new file mode 100644 index 00000000..cc8901e5 --- /dev/null +++ b/test/typecheck/bad-br-multi-type.txt @@ -0,0 +1,9 @@ +;;; ERROR: 1 +(module + (func (result f32) + (block $exit + (br 0 (i32.const 1)) + (f32.const 2)))) +(;; STDERR ;;; +typecheck/bad-br-multi-type.txt:5:13: type mismatch of br value. got i32, expected f32 +;;; STDERR ;;) diff --git a/test/typecheck/bad-break-multi-type.txt b/test/typecheck/bad-break-multi-type.txt deleted file mode 100644 index 2702185b..00000000 --- a/test/typecheck/bad-break-multi-type.txt +++ /dev/null @@ -1,9 +0,0 @@ -;;; ERROR: 1 -(module - (func (result f32) - (block $exit - (break 0 (i32.const 1)) - (f32.const 2)))) -(;; STDERR ;;; -typecheck/bad-break-multi-type.txt:5:16: type mismatch of br value. got i32, expected f32 -;;; STDERR ;;) diff --git a/test/typecheck/bad-if-value-void.txt b/test/typecheck/bad-if-value-void.txt index 51a563d7..57e30a73 100644 --- a/test/typecheck/bad-if-value-void.txt +++ b/test/typecheck/bad-if-value-void.txt @@ -4,7 +4,7 @@ (set_local 0 (label (if_else (i32.const 0) - (break) + (br) (f32.const 0.0)))))) (;; STDERR ;;; typecheck/bad-if-value-void.txt:7:11: arity mismatch of br value. label expects non-void, but br value is empty diff --git a/test/typecheck/bad-label-multi-type.txt b/test/typecheck/bad-label-multi-type.txt index 6898801e..414ae64f 100644 --- a/test/typecheck/bad-label-multi-type.txt +++ b/test/typecheck/bad-label-multi-type.txt @@ -4,7 +4,7 @@ (label (block (if (i32.const 1) - (break (i32.const 2))) + (br (i32.const 2))) (f32.const 3))))) (;; STDERR ;;; typecheck/bad-label-multi-type.txt:8:9: type mismatch of block. got f32, expected i32 diff --git a/test/typecheck/bad-nested-br.txt b/test/typecheck/bad-nested-br.txt new file mode 100644 index 00000000..84d2f9ef --- /dev/null +++ b/test/typecheck/bad-nested-br.txt @@ -0,0 +1,17 @@ +;;; ERROR: 1 +(module + (func (result i32) + (label $outer + (block + (label $inner + (loop + (if (i32.const 1) + (br $outer)) + (br $inner))) + (return (i32.const 2)))) + ;; the existence of the (br $outer) statement requires there to be a + ;; return statement here, or a value returned from (br $outer). + )) +(;; STDERR ;;; +typecheck/bad-nested-br.txt:9:15: arity mismatch of br value. label expects non-void, but br value is empty +;;; STDERR ;;) diff --git a/test/typecheck/bad-nested-break.txt b/test/typecheck/bad-nested-break.txt deleted file mode 100644 index fa2de074..00000000 --- a/test/typecheck/bad-nested-break.txt +++ /dev/null @@ -1,17 +0,0 @@ -;;; ERROR: 1 -(module - (func (result i32) - (label $outer - (block - (label $inner - (loop - (if (i32.const 1) - (break $outer)) - (break $inner))) - (return (i32.const 2)))) - ;; the existence of the (break $outer) statement requires there to be a - ;; return statement here, or a value returned from (break $outer). - )) -(;; STDERR ;;; -typecheck/bad-nested-break.txt:9:15: arity mismatch of br value. label expects non-void, but br value is empty -;;; STDERR ;;) diff --git a/test/typecheck/if-then-break.txt b/test/typecheck/if-then-br.txt index 6576fc07..8d60a3ea 100644 --- a/test/typecheck/if-then-break.txt +++ b/test/typecheck/if-then-br.txt @@ -3,4 +3,4 @@ (label (if (i32.const 0) - (break))))) + (br))))) diff --git a/test/typecheck/if-then-else-break.txt b/test/typecheck/if-then-else-br.txt index e53ad752..d442d091 100644 --- a/test/typecheck/if-then-else-break.txt +++ b/test/typecheck/if-then-else-br.txt @@ -2,5 +2,5 @@ (func (label (if_else (i32.const 0) - (break) + (br) (i32.const 10))))) diff --git a/test/typecheck/nested-break.txt b/test/typecheck/nested-break.txt index 182cac99..71fc7408 100644 --- a/test/typecheck/nested-break.txt +++ b/test/typecheck/nested-break.txt @@ -5,7 +5,7 @@ (label $inner (loop (if (i32.const 1) - (break $outer)) - (break $inner))) + (br $outer)) + (br $inner))) (return (i32.const 2)))) (return (i32.const 3)))) |