Massive renaming (#1855)

Automated renaming according to
https://github.com/WebAssembly/spec/issues/884#issuecomment-426433329.

1 files changed, 13 insertions, 13 deletions

diff --git a/test/merge/basics.wast.toMerge b/test/merge/basics.wast.toMerge
index 352aae888..7230332cb 100644
--- a/test/merge/basics.wast.toMerge
+++ b/test/merge/basics.wast.toMerge
@@ -3,15 +3,15 @@
   (import "env" "memoryBase" (global $memoryBase i32))
   (import "env" "tableBase" (global $tableBase i32))
   (import "env" "memory" (memory $0 256))
-  (import "env" "table" (table 0 anyfunc))
+  (import "env" "table" (table 0 funcref))
   (import "env" "some-func-b" (func $some-func-b))
   (import "env" "some-collide" (func $some-collide))
-  (data (get_global $memoryBase) "hello, B!\n")
+  (data (global.get $memoryBase) "hello, B!\n")
   (global $global-collide i32 (i32.const 0))
   (global $global-collide-mut (mut i32) (i32.const 0))
   (global $global-b i32 (i32.const 1))
   (global $global-b-mut (mut i32) (i32.const 1))
-  (elem (get_global $tableBase) $only-b $willCollide $some-func-b $some-collide)
+  (elem (global.get $tableBase) $only-b $willCollide $some-func-b $some-collide)
   (export "exp-b" (func $only-b))
   (export "exp-collide" (func $only-b))
   (export "exp-collide2" (func $willCollide))
@@ -26,36 +26,36 @@
       (i32.const 34)
       (i32.const 56)
     )
-    (drop (get_global $global-collide))
-    (drop (get_global $global-b))
-    (drop (get_global $global-b-mut))
-    (drop (get_global $memoryBase))
-    (drop (get_global $tableBase))
+    (drop (global.get $global-collide))
+    (drop (global.get $global-b))
+    (drop (global.get $global-b-mut))
+    (drop (global.get $memoryBase))
+    (drop (global.get $tableBase))
     (drop
       (i32.add
-        (get_global $memoryBase)
+        (global.get $memoryBase)
         (i32.const 1000)
       )
     )
     (drop
       (i32.add
-        (get_global $tableBase)
+        (global.get $tableBase)
         (i32.const 1000)
       )
     )
     (drop
       (i32.add
-        (get_global $tableBase)
+        (global.get $tableBase)
         (unreachable) ;; bad!
       )
     )
     (drop
       (i32.sub ;; bad!
-        (get_global $tableBase)
+        (global.get $tableBase)
         (i32.const 1000)
       )
     )
-    (set_global $global-collide-mut (i32.const 5678))
+    (global.set $global-collide-mut (i32.const 5678))
   )
   (func $willCollide
     (drop (i32.const 222))