summaryrefslogtreecommitdiff
path: root/test/parse/module
diff options
context:
space:
mode:
authorHeejin Ahn <aheejin@gmail.com>2021-12-20 19:36:05 -0800
committerGitHub <noreply@github.com>2021-12-20 19:36:05 -0800
commit1f3a1d5fae0296fdf503968131905be9e8f40cf4 (patch)
tree09ecfc4a4e193296cbf27014564e959f12010b89 /test/parse/module
parente59cf9369004a521814222afbc05ae6b59446cd5 (diff)
downloadwabt-1f3a1d5fae0296fdf503968131905be9e8f40cf4.tar.gz
wabt-1f3a1d5fae0296fdf503968131905be9e8f40cf4.tar.bz2
wabt-1f3a1d5fae0296fdf503968131905be9e8f40cf4.zip
Finish instruction renaming (#1792)
This finishes #985. This - replaces the old names in the tests with the new names - drops support for the deprecated names - renames test files to match new instruction names I don't think dropping support for the old names will be a problem at this point. #985 says the old names are supported for convenience but we should remove those too at some point; that "some point" may have well arrived given that three years have passed. The lists of names updated are in #933, #1564, WebAssembly/spec#720.
Diffstat (limited to 'test/parse/module')
-rw-r--r--test/parse/module/bad-global-invalid-globalget.txt (renamed from test/parse/module/bad-global-invalid-getglobal.txt)6
-rw-r--r--test/parse/module/bad-import-table-redefinition.txt6
-rw-r--r--test/parse/module/bad-import-table-shared.txt4
-rw-r--r--test/parse/module/bad-table-invalid-function.txt2
-rw-r--r--test/parse/module/bad-table-no-offset.txt2
-rw-r--r--test/parse/module/bad-table-too-many.txt6
-rw-r--r--test/parse/module/data-offset.txt2
-rw-r--r--test/parse/module/elem-offset.txt4
-rw-r--r--test/parse/module/export-table.txt2
-rw-r--r--test/parse/module/global.txt8
-rw-r--r--test/parse/module/import-global-globalget.txt (renamed from test/parse/module/import-global-getglobal.txt)2
-rw-r--r--test/parse/module/import-table.txt2
-rw-r--r--test/parse/module/table-named.txt2
-rw-r--r--test/parse/module/table.txt2
14 files changed, 25 insertions, 25 deletions
diff --git a/test/parse/module/bad-global-invalid-getglobal.txt b/test/parse/module/bad-global-invalid-globalget.txt
index afc9284e..935d2b40 100644
--- a/test/parse/module/bad-global-invalid-getglobal.txt
+++ b/test/parse/module/bad-global-invalid-globalget.txt
@@ -1,9 +1,9 @@
;;; TOOL: wat2wasm
;;; ERROR: 1
(module
- (global i32 (get_global 1)))
+ (global i32 (global.get 1)))
(;; STDERR ;;;
-out/test/parse/module/bad-global-invalid-getglobal.txt:4:27: error: global variable out of range: 1 (max 1)
- (global i32 (get_global 1)))
+out/test/parse/module/bad-global-invalid-globalget.txt:4:27: error: global variable out of range: 1 (max 1)
+ (global i32 (global.get 1)))
^
;;; STDERR ;;)
diff --git a/test/parse/module/bad-import-table-redefinition.txt b/test/parse/module/bad-import-table-redefinition.txt
index 997f0c57..ced5fa8c 100644
--- a/test/parse/module/bad-import-table-redefinition.txt
+++ b/test/parse/module/bad-import-table-redefinition.txt
@@ -1,10 +1,10 @@
;;; TOOL: wat2wasm
;;; ERROR: 1
(module
- (import "foo" "bar" (table $baz 0 anyfunc))
- (import "foo" "blah" (table $baz 0 anyfunc)))
+ (import "foo" "bar" (table $baz 0 funcref))
+ (import "foo" "blah" (table $baz 0 funcref)))
(;; STDERR ;;;
out/test/parse/module/bad-import-table-redefinition.txt:5:4: error: redefinition of table "$baz"
- (import "foo" "blah" (table $baz 0 anyfunc)))
+ (import "foo" "blah" (table $baz 0 funcref)))
^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/module/bad-import-table-shared.txt b/test/parse/module/bad-import-table-shared.txt
index d0a0f3d8..7a91f43f 100644
--- a/test/parse/module/bad-import-table-shared.txt
+++ b/test/parse/module/bad-import-table-shared.txt
@@ -1,10 +1,10 @@
;;; TOOL: wat2wasm
;;; ERROR: 1
(module
- (import "foo" "bar" (table 0 3 shared anyfunc))
+ (import "foo" "bar" (table 0 3 shared funcref))
)
(;; STDERR ;;;
out/test/parse/module/bad-import-table-shared.txt:4:4: error: tables may not be shared
- (import "foo" "bar" (table 0 3 shared anyfunc))
+ (import "foo" "bar" (table 0 3 shared funcref))
^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/module/bad-table-invalid-function.txt b/test/parse/module/bad-table-invalid-function.txt
index 19480106..07383518 100644
--- a/test/parse/module/bad-table-invalid-function.txt
+++ b/test/parse/module/bad-table-invalid-function.txt
@@ -1,7 +1,7 @@
;;; TOOL: wat2wasm
;;; ERROR: 1
(module
- (table 1 anyfunc)
+ (table 1 funcref)
(func $f)
(elem (i32.const 0) $f 1))
(;; STDERR ;;;
diff --git a/test/parse/module/bad-table-no-offset.txt b/test/parse/module/bad-table-no-offset.txt
index 2f7e6340..93a6b76e 100644
--- a/test/parse/module/bad-table-no-offset.txt
+++ b/test/parse/module/bad-table-no-offset.txt
@@ -2,7 +2,7 @@
;;; ARGS: --disable-reference-types --disable-bulk-memory
;;; ERROR: 1
(module
- (table 1 anyfunc)
+ (table 1 funcref)
(func)
(elem 0))
(;; STDERR ;;;
diff --git a/test/parse/module/bad-table-too-many.txt b/test/parse/module/bad-table-too-many.txt
index b1ff2409..74836053 100644
--- a/test/parse/module/bad-table-too-many.txt
+++ b/test/parse/module/bad-table-too-many.txt
@@ -3,10 +3,10 @@
;;; ERROR: 1
(module
(func (param i32))
- (table anyfunc (elem 0))
- (table anyfunc (elem 0)))
+ (table funcref (elem 0))
+ (table funcref (elem 0)))
(;; STDERR ;;;
out/test/parse/module/bad-table-too-many.txt:7:4: error: only one table allowed
- (table anyfunc (elem 0)))
+ (table funcref (elem 0)))
^^^^^
;;; STDERR ;;)
diff --git a/test/parse/module/data-offset.txt b/test/parse/module/data-offset.txt
index f30118b3..9b207e3e 100644
--- a/test/parse/module/data-offset.txt
+++ b/test/parse/module/data-offset.txt
@@ -3,4 +3,4 @@
(import "foo" "bar" (global i32))
(memory 1)
(global i32 i32.const 1)
- (data (get_global 0) "hi"))
+ (data (global.get 0) "hi"))
diff --git a/test/parse/module/elem-offset.txt b/test/parse/module/elem-offset.txt
index 9d9f68d0..10fba665 100644
--- a/test/parse/module/elem-offset.txt
+++ b/test/parse/module/elem-offset.txt
@@ -3,5 +3,5 @@
(import "foo" "bar" (global i32))
(global i32 i32.const 1)
(func)
- (table 2 anyfunc)
- (elem (get_global 0) 0))
+ (table 2 funcref)
+ (elem (global.get 0) 0))
diff --git a/test/parse/module/export-table.txt b/test/parse/module/export-table.txt
index 62e85ff6..1755ccf1 100644
--- a/test/parse/module/export-table.txt
+++ b/test/parse/module/export-table.txt
@@ -1,4 +1,4 @@
;;; TOOL: wat2wasm
(module
- (table 0 anyfunc)
+ (table 0 funcref)
(export "my_table" (table 0)))
diff --git a/test/parse/module/global.txt b/test/parse/module/global.txt
index 021824eb..506ead31 100644
--- a/test/parse/module/global.txt
+++ b/test/parse/module/global.txt
@@ -12,10 +12,10 @@
(global f32 (f32.const 3))
(global f64 (f64.const 4))
- (global i32 (get_global 0))
- (global i64 (get_global 1))
- (global f32 (get_global 2))
- (global f64 (get_global 3))
+ (global i32 (global.get 0))
+ (global i64 (global.get 1))
+ (global f32 (global.get 2))
+ (global f64 (global.get 3))
(func $foo)
(global externref (ref.null extern))
diff --git a/test/parse/module/import-global-getglobal.txt b/test/parse/module/import-global-globalget.txt
index f2cc8bdf..37388840 100644
--- a/test/parse/module/import-global-getglobal.txt
+++ b/test/parse/module/import-global-globalget.txt
@@ -1,4 +1,4 @@
;;; TOOL: wat2wasm
(module
(import "a" "global" (global i32))
- (global i32 (get_global 0)))
+ (global i32 (global.get 0)))
diff --git a/test/parse/module/import-table.txt b/test/parse/module/import-table.txt
index 5976dfef..b43b71e3 100644
--- a/test/parse/module/import-table.txt
+++ b/test/parse/module/import-table.txt
@@ -1,3 +1,3 @@
;;; TOOL: wat2wasm
(module
- (import "foo" "2" (table 0 10 anyfunc)))
+ (import "foo" "2" (table 0 10 funcref)))
diff --git a/test/parse/module/table-named.txt b/test/parse/module/table-named.txt
index 381ef1c0..8cd56159 100644
--- a/test/parse/module/table-named.txt
+++ b/test/parse/module/table-named.txt
@@ -3,4 +3,4 @@
(func $f (param i32))
(func $g (param i32 i64))
(func $h (result i64) (i64.const 0))
- (table anyfunc (elem $f $f $g $h)))
+ (table funcref (elem $f $f $g $h)))
diff --git a/test/parse/module/table.txt b/test/parse/module/table.txt
index a9d029cd..a8ca62e7 100644
--- a/test/parse/module/table.txt
+++ b/test/parse/module/table.txt
@@ -3,4 +3,4 @@
(func (param i32))
(func (param i32 i64))
(func (result i64) i64.const 0)
- (table anyfunc (elem 0 0 1 2)))
+ (table funcref (elem 0 0 1 2)))