summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/desugar/try.txt4
-rw-r--r--test/dump/except.txt20
-rw-r--r--test/dump/import.txt16
-rw-r--r--test/dump/rethrow.txt6
-rw-r--r--test/dump/throw.txt8
-rw-r--r--test/parse/expr/rethrow.txt2
-rw-r--r--test/parse/expr/throw.txt2
-rw-r--r--test/parse/module/except.txt6
-rw-r--r--test/parse/module/export-except.txt4
-rw-r--r--test/parse/module/import-except.txt2
-rw-r--r--test/roundtrip/fold-rethrow.txt4
-rw-r--r--test/roundtrip/fold-throw.txt8
12 files changed, 41 insertions, 41 deletions
diff --git a/test/desugar/try.txt b/test/desugar/try.txt
index b750355d..6eef5269 100644
--- a/test/desugar/try.txt
+++ b/test/desugar/try.txt
@@ -1,7 +1,7 @@
;;; TOOL: wat-desugar
;;; ARGS: --enable-exceptions
(module
- (except $ex i32)
+ (event $ex i32)
(func (result i32)
try $try1 (result i32)
nop
@@ -13,7 +13,7 @@
)
(;; STDOUT ;;;
(module
- (except $ex i32)
+ (event $ex i32)
(func (;0;) (result i32)
try $try1 (result i32)
nop
diff --git a/test/dump/except.txt b/test/dump/except.txt
index 047eb9a5..88044153 100644
--- a/test/dump/except.txt
+++ b/test/dump/except.txt
@@ -2,20 +2,20 @@
;;; ARGS0: -v
;;; ARGS1: -x
(module
- (except)
- (except i32)
- (except f32 f64))
+ (event)
+ (event i32)
+ (event f32 f64))
(;; STDOUT ;;;
0000000: 0061 736d ; WASM_BINARY_MAGIC
0000004: 0100 0000 ; WASM_BINARY_VERSION
; section "Event" (13)
0000008: 0d ; section code
0000009: 00 ; section size (guess)
-000000a: 03 ; exception count
-000000b: 00 ; exception type count
-000000c: 01 ; exception type count
+000000a: 03 ; event count
+000000b: 00 ; event type count
+000000c: 01 ; event type count
000000d: 7f ; i32
-000000e: 02 ; exception type count
+000000e: 02 ; event type count
000000f: 7d ; f32
0000010: 7c ; f64
0000009: 07 ; FIXUP section size
@@ -25,9 +25,9 @@ except.wasm: file format wasm 0x1
Section Details:
Event[3]:
- - except[0] ()
- - except[1] (i32)
- - except[2] (f32, f64)
+ - event[0] ()
+ - event[1] (i32)
+ - event[2] (f32, f64)
Code Disassembly:
diff --git a/test/dump/import.txt b/test/dump/import.txt
index 4b9ea09f..acdb6213 100644
--- a/test/dump/import.txt
+++ b/test/dump/import.txt
@@ -6,7 +6,7 @@
(import "ignored" "test2" (func (param i32) (result i32)))
(import "ignored" "testmem" (memory 0))
(import "ignored" "testtable" (table 0 anyfunc))
- (import "ignored" "testexcept" (except i32))
+ (import "ignored" "testevent" (event i32))
)
(;; STDOUT ;;;
0000000: 0061 736d ; WASM_BINARY_MAGIC
@@ -68,12 +68,12 @@
; import header 4
0000062: 07 ; string length
0000063: 6967 6e6f 7265 64 ignored ; import module name
-000006a: 0a ; string length
-000006b: 7465 7374 6578 6365 7074 testexcept ; import field name
-0000075: 04 ; import kind
-0000076: 01 ; exception type count
-0000077: 7f ; i32
-0000018: 5f ; FIXUP section size
+000006a: 09 ; string length
+000006b: 7465 7374 6576 656e 74 testevent ; import field name
+0000074: 04 ; import kind
+0000075: 01 ; event type count
+0000076: 7f ; i32
+0000018: 5e ; FIXUP section size
import.wasm: file format wasm 0x1
@@ -87,7 +87,7 @@ Import[5]:
- func[1] sig=1 <test2> <- ignored.test2
- memory[0] pages: initial=0 <- ignored.testmem
- table[0] elem_type=anyfunc init=0 max=0 <- ignored.testtable
- - except[0] (i32) <- ignored.testexcept
+ - event[0] (i32) <- ignored.testevent
Code Disassembly:
diff --git a/test/dump/rethrow.txt b/test/dump/rethrow.txt
index d83ce52c..f0dfc39b 100644
--- a/test/dump/rethrow.txt
+++ b/test/dump/rethrow.txt
@@ -1,7 +1,7 @@
;;; TOOL: run-objdump
;;; ARGS0: -v --enable-exceptions
(module
- (except $e1)
+ (event $e1)
(func
try
catch
@@ -28,8 +28,8 @@
; section "Event" (13)
0000012: 0d ; section code
0000013: 00 ; section size (guess)
-0000014: 01 ; exception count
-0000015: 00 ; exception type count
+0000014: 01 ; event count
+0000015: 00 ; event type count
0000013: 02 ; FIXUP section size
; section "Code" (10)
0000016: 0a ; section code
diff --git a/test/dump/throw.txt b/test/dump/throw.txt
index 0832644c..1d2cdc3e 100644
--- a/test/dump/throw.txt
+++ b/test/dump/throw.txt
@@ -1,7 +1,7 @@
;;; TOOL: run-objdump
;;; ARGS0: -v --enable-exceptions
(module
- (except $e i32)
+ (event $e i32)
(func
i32.const 1
throw $e))
@@ -26,8 +26,8 @@
; section "Event" (13)
0000012: 0d ; section code
0000013: 00 ; section size (guess)
-0000014: 01 ; exception count
-0000015: 01 ; exception type count
+0000014: 01 ; event count
+0000015: 01 ; event type count
0000016: 7f ; i32
0000013: 03 ; FIXUP section size
; section "Code" (10)
@@ -40,7 +40,7 @@
000001c: 41 ; i32.const
000001d: 01 ; i32 literal
000001e: 08 ; throw
-000001f: 00 ; throw exception
+000001f: 00 ; throw event
0000020: 0b ; end
000001a: 06 ; FIXUP func body size
0000018: 08 ; FIXUP section size
diff --git a/test/parse/expr/rethrow.txt b/test/parse/expr/rethrow.txt
index 227745e9..b3c034e2 100644
--- a/test/parse/expr/rethrow.txt
+++ b/test/parse/expr/rethrow.txt
@@ -1,7 +1,7 @@
;;; TOOL: wat2wasm
;;; ARGS: --enable-exceptions
(module
- (except $e1)
+ (event $e1)
(func
try
catch
diff --git a/test/parse/expr/throw.txt b/test/parse/expr/throw.txt
index 126f3929..b5209817 100644
--- a/test/parse/expr/throw.txt
+++ b/test/parse/expr/throw.txt
@@ -1,5 +1,5 @@
;;; TOOL: wat2wasm
;;; ARGS: --enable-exceptions
(module
- (except $e1)
+ (event $e1)
(func throw $e1))
diff --git a/test/parse/module/except.txt b/test/parse/module/except.txt
index 6626b0e2..f734e2be 100644
--- a/test/parse/module/except.txt
+++ b/test/parse/module/except.txt
@@ -1,6 +1,6 @@
;;; TOOL: wat2wasm
;;; ARGS: --enable-exceptions
(module
- (except)
- (except $e1 i32)
- (except $e2 f32 f32 f32))
+ (event)
+ (event $e1 i32)
+ (event $e2 f32 f32 f32))
diff --git a/test/parse/module/export-except.txt b/test/parse/module/export-except.txt
index 187b2f24..d8b82460 100644
--- a/test/parse/module/export-except.txt
+++ b/test/parse/module/export-except.txt
@@ -1,5 +1,5 @@
;;; TOOL: wat2wasm
;;; ARGS: --enable-exceptions
(module
- (except i32 i32)
- (export "my_except" (except 0)))
+ (event i32 i32)
+ (export "my_event" (event 0)))
diff --git a/test/parse/module/import-except.txt b/test/parse/module/import-except.txt
index a80ec4b2..28846523 100644
--- a/test/parse/module/import-except.txt
+++ b/test/parse/module/import-except.txt
@@ -1,4 +1,4 @@
;;; TOOL: wat2wasm
;;; ARGS: --enable-exceptions
(module
- (import "foo" "1" (except f64 f32)))
+ (import "foo" "1" (event f64 f32)))
diff --git a/test/roundtrip/fold-rethrow.txt b/test/roundtrip/fold-rethrow.txt
index 5d5c31f5..bdd92f2c 100644
--- a/test/roundtrip/fold-rethrow.txt
+++ b/test/roundtrip/fold-rethrow.txt
@@ -1,7 +1,7 @@
;;; TOOL: run-roundtrip
;;; ARGS: --stdout --fold-exprs --enable-exceptions
(module
- (except $e0 i32)
+ (event $e0 i32)
(func
try
@@ -17,5 +17,5 @@
(try ;; label = @1
(catch
(rethrow))))
- (except (;0;) i32))
+ (event (;0;) i32))
;;; STDOUT ;;)
diff --git a/test/roundtrip/fold-throw.txt b/test/roundtrip/fold-throw.txt
index 832cba89..5b72dd33 100644
--- a/test/roundtrip/fold-throw.txt
+++ b/test/roundtrip/fold-throw.txt
@@ -1,8 +1,8 @@
;;; TOOL: run-roundtrip
;;; ARGS: --stdout --fold-exprs --enable-exceptions
(module
- (except $e0 i32)
- (except $e1 f32 i32)
+ (event $e0 i32)
+ (event $e1 f32 i32)
(func i32.const 1 throw $e0)
(func f32.const 2 i32.const 1 throw $e1))
@@ -16,6 +16,6 @@
(throw 1
(f32.const 0x1p+1 (;=2;))
(i32.const 1)))
- (except (;0;) i32)
- (except (;1;) f32 i32))
+ (event (;0;) i32)
+ (event (;1;) f32 i32))
;;; STDOUT ;;)