diff options
Diffstat (limited to 'test/example')
-rw-r--r-- | test/example/c-api-kitchen-sink.c | 23 | ||||
-rw-r--r-- | test/example/c-api-kitchen-sink.txt | 8 | ||||
-rw-r--r-- | test/example/module-splitting.cpp | 8 | ||||
-rw-r--r-- | test/example/module-splitting.txt | 26 |
4 files changed, 32 insertions, 33 deletions
diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c index 9b9c7aa6e..cb2f29c77 100644 --- a/test/example/c-api-kitchen-sink.c +++ b/test/example/c-api-kitchen-sink.c @@ -316,9 +316,8 @@ void test_core() { BinaryenRefFunc(module, "kitchen()sinker", BinaryenTypeFuncref()); BinaryenExpressionRef i31refExpr = BinaryenI31New(module, makeInt32(module, 1)); - // Events - BinaryenAddEvent( - module, "a-event", 0, BinaryenTypeInt32(), BinaryenTypeNone()); + // Tags + BinaryenAddTag(module, "a-tag", 0, BinaryenTypeInt32(), BinaryenTypeNone()); BinaryenAddTable(module, "tab", 0, 100); @@ -326,21 +325,21 @@ void test_core() { // (try // (do - // (throw $a-event (i32.const 0)) + // (throw $a-tag (i32.const 0)) // ) - // (catch $a-event + // (catch $a-tag // (drop (i32 pop)) // ) // (catch_all) // ) BinaryenExpressionRef tryBody = BinaryenThrow( - module, "a-event", (BinaryenExpressionRef[]){makeInt32(module, 0)}, 1); + module, "a-tag", (BinaryenExpressionRef[]){makeInt32(module, 0)}, 1); BinaryenExpressionRef catchBody = BinaryenDrop(module, BinaryenPop(module, BinaryenTypeInt32())); BinaryenExpressionRef catchAllBody = BinaryenNop(module); - const char* catchEvents[] = {"a-event"}; + const char* catchTags[] = {"a-tag"}; BinaryenExpressionRef catchBodies[] = {catchBody, catchAllBody}; - const char* emptyCatchEvents[] = {}; + const char* emptyCatchTags[] = {}; BinaryenExpressionRef emptyCatchBodies[] = {}; BinaryenExpressionRef nopCatchBody[] = {BinaryenNop(module)}; @@ -829,12 +828,12 @@ void test_core() { BinaryenRefAsI31(), BinaryenRefNull(module, BinaryenTypeAnyref())), // Exception handling - BinaryenTry(module, NULL, tryBody, catchEvents, 1, catchBodies, 2, NULL), + BinaryenTry(module, NULL, tryBody, catchTags, 1, catchBodies, 2, NULL), // (try $try_outer // (do // (try // (do - // (throw $a-event (i32.const 0)) + // (throw $a-tag (i32.const 0)) // ) // (delegate $try_outer) // ) @@ -846,12 +845,12 @@ void test_core() { BinaryenTry(module, NULL, tryBody, - emptyCatchEvents, + emptyCatchTags, 0, emptyCatchBodies, 0, "try_outer"), - emptyCatchEvents, + emptyCatchTags, 0, nopCatchBody, 1, diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt index eb83ffb33..77c433472 100644 --- a/test/example/c-api-kitchen-sink.txt +++ b/test/example/c-api-kitchen-sink.txt @@ -45,7 +45,7 @@ BinaryenFeatureAll: 16383 (table $0 1 1 funcref) (elem $0 (table $0) (i32.const 0) func "$kitchen()sinker") (elem $passive func "$kitchen()sinker") - (event $a-event (attr 0) (param i32)) + (tag $a-tag (attr 0) (param i32)) (export "kitchen_sinker" (func "$kitchen()sinker")) (export "mem" (memory $0)) (start $starter) @@ -1990,11 +1990,11 @@ BinaryenFeatureAll: 16383 ) (try (do - (throw $a-event + (throw $a-tag (i32.const 0) ) ) - (catch $a-event + (catch $a-tag (drop (pop i32) ) @@ -2007,7 +2007,7 @@ BinaryenFeatureAll: 16383 (do (try (do - (throw $a-event + (throw $a-tag (i32.const 0) ) ) diff --git a/test/example/module-splitting.cpp b/test/example/module-splitting.cpp index 9ff2818be..a379717f1 100644 --- a/test/example/module-splitting.cpp +++ b/test/example/module-splitting.cpp @@ -76,7 +76,7 @@ int main() { (memory $mem (shared 3 42)) (table $tab 3 42 funcref) (global $glob (mut i32) (i32.const 7)) - (event $e (attr 0) (param i32)) + (tag $e (attr 0) (param i32)) ))"); // Imported global stuff @@ -85,7 +85,7 @@ int main() { (import "env" "mem" (memory $mem (shared 3 42))) (import "env" "tab" (table $tab 3 42 funcref)) (import "env" "glob" (global $glob (mut i32))) - (import "env" "e" (event $e (attr 0) (param i32))) + (import "env" "e" (tag $e (attr 0) (param i32))) ))"); // Exported global stuff @@ -94,11 +94,11 @@ int main() { (memory $mem (shared 3 42)) (table $tab 3 42 funcref) (global $glob (mut i32) (i32.const 7)) - (event $e (attr 0) (param i32)) + (tag $e (attr 0) (param i32)) (export "mem" (memory $mem)) (export "tab" (table $tab)) (export "glob" (global $glob)) - (export "e" (event $e)) + (export "e" (tag $e)) ))"); // Non-deferred function diff --git a/test/example/module-splitting.txt b/test/example/module-splitting.txt index 2b92e9dd6..61529e9ad 100644 --- a/test/example/module-splitting.txt +++ b/test/example/module-splitting.txt @@ -16,7 +16,7 @@ Before: (global $glob (mut i32) (i32.const 7)) (memory $mem (shared 3 42)) (table $tab 3 42 funcref) - (event $e (attr 0) (param i32)) + (tag $e (attr 0) (param i32)) ) Keeping: <none> After: @@ -25,11 +25,11 @@ After: (global $glob (mut i32) (i32.const 7)) (memory $mem (shared 3 42)) (table $tab 3 42 funcref) - (event $e (attr 0) (param i32)) + (tag $e (attr 0) (param i32)) (export "%memory" (memory $mem)) (export "%table" (table $tab)) (export "%global" (global $glob)) - (export "%event" (event $e)) + (export "%tag" (tag $e)) ) Secondary: (module @@ -37,7 +37,7 @@ Secondary: (import "primary" "%memory" (memory $mem (shared 3 42))) (import "primary" "%table" (table $tab 3 42 funcref)) (import "primary" "%global" (global $glob (mut i32))) - (import "primary" "%event" (event $e (attr 0) (param i32))) + (import "primary" "%tag" (tag $e (attr 0) (param i32))) ) @@ -47,7 +47,7 @@ Before: (import "env" "mem" (memory $mem (shared 3 42))) (import "env" "tab" (table $tab 3 42 funcref)) (import "env" "glob" (global $glob (mut i32))) - (import "env" "e" (event $e (attr 0) (param i32))) + (import "env" "e" (tag $e (attr 0) (param i32))) ) Keeping: <none> After: @@ -56,11 +56,11 @@ After: (import "env" "mem" (memory $mem (shared 3 42))) (import "env" "tab" (table $tab 3 42 funcref)) (import "env" "glob" (global $glob (mut i32))) - (import "env" "e" (event $e (attr 0) (param i32))) + (import "env" "e" (tag $e (attr 0) (param i32))) (export "%memory" (memory $mem)) (export "%table" (table $tab)) (export "%global" (global $glob)) - (export "%event" (event $e)) + (export "%tag" (tag $e)) ) Secondary: (module @@ -68,7 +68,7 @@ Secondary: (import "primary" "%memory" (memory $mem (shared 3 42))) (import "primary" "%table" (table $tab 3 42 funcref)) (import "primary" "%global" (global $glob (mut i32))) - (import "primary" "%event" (event $e (attr 0) (param i32))) + (import "primary" "%tag" (tag $e (attr 0) (param i32))) ) @@ -78,11 +78,11 @@ Before: (global $glob (mut i32) (i32.const 7)) (memory $mem (shared 3 42)) (table $tab 3 42 funcref) - (event $e (attr 0) (param i32)) + (tag $e (attr 0) (param i32)) (export "mem" (memory $mem)) (export "tab" (table $tab)) (export "glob" (global $glob)) - (export "e" (event $e)) + (export "e" (tag $e)) ) Keeping: <none> After: @@ -91,11 +91,11 @@ After: (global $glob (mut i32) (i32.const 7)) (memory $mem (shared 3 42)) (table $tab 3 42 funcref) - (event $e (attr 0) (param i32)) + (tag $e (attr 0) (param i32)) (export "mem" (memory $mem)) (export "tab" (table $tab)) (export "glob" (global $glob)) - (export "e" (event $e)) + (export "e" (tag $e)) ) Secondary: (module @@ -103,7 +103,7 @@ Secondary: (import "primary" "mem" (memory $mem (shared 3 42))) (import "primary" "tab" (table $tab 3 42 funcref)) (import "primary" "glob" (global $glob (mut i32))) - (import "primary" "e" (event $e (attr 0) (param i32))) + (import "primary" "e" (tag $e (attr 0) (param i32))) ) |