Reflect instruction renaming in code (#2128)

- Reflected new renamed instruction names in code and tests:
  - `get_local` -> `local.get`
  - `set_local` -> `local.set`
  - `tee_local` -> `local.tee`
  - `get_global` -> `global.get`
  - `set_global` -> `global.set`
  - `current_memory` -> `memory.size`
  - `grow_memory` -> `memory.grow`

- Removed APIs related to old instruction names in Binaryen.js and added
  APIs with new names if they are missing.

- Renamed `typedef SortedVector LocalSet` to `SetsOfLocals` to prevent
  name clashes.

- Resolved several TODO renaming items in wasm-binary.h:
  - `TableSwitch` -> `BrTable`
  - `I32ConvertI64` -> `I32WrapI64`
  - `I64STruncI32` -> `I64SExtendI32`
  - `I64UTruncI32` -> `I64UExtendI32`
  - `F32ConvertF64` -> `F32DemoteI64`
  - `F64ConvertF32` -> `F64PromoteF32`

- Renamed `BinaryenGetFeatures` and `BinaryenSetFeatures` to
  `BinaryenModuleGetFeatures` and `BinaryenModuleSetFeatures` for
  consistency.

7 files changed, 35 insertions, 35 deletions

diff --git a/test/binaryen.js/emit_asmjs.js b/test/binaryen.js/emit_asmjs.js
index c7cd5c717..1faf58308 100644
--- a/test/binaryen.js/emit_asmjs.js
+++ b/test/binaryen.js/emit_asmjs.js
@@ -2,7 +2,7 @@ var module = new Binaryen.Module();
 
 var signature = module.addFunctionType("ii", Binaryen.i32, [ Binaryen.i32 ]);
 
-module.addFunction("main", signature, [], module.getLocal(0, Binaryen.i32));
+module.addFunction("main", signature, [], module.local.get(0, Binaryen.i32));
 
 module.addFunctionExport("main", "main");
 
diff --git a/test/binaryen.js/hello-world.js b/test/binaryen.js/hello-world.js
index 2a9a56ed0..03cfb4163 100644
--- a/test/binaryen.js/hello-world.js
+++ b/test/binaryen.js/hello-world.js
@@ -11,8 +11,8 @@ var iii = module.addFunctionType('iii', Binaryen.i32, [Binaryen.i32, Binaryen.i3
 
 // Start to create the function, starting with the contents: Get the 0 and
 // 1 arguments, and add them, then return them
-var left = module.getLocal(0, Binaryen.i32);
-var right = module.getLocal(1, Binaryen.i32);
+var left = module.local.get(0, Binaryen.i32);
+var right = module.local.get(1, Binaryen.i32);
 var add = module.i32.add(left, right);
 var ret = module.return(add);
 
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
index a798c4092..38ce32876 100644
--- a/test/binaryen.js/kitchen-sink.js
+++ b/test/binaryen.js/kitchen-sink.js
@@ -81,10 +81,10 @@ function test_ids() {
   console.log("BinaryenSwitchId: " + Binaryen.SwitchId);
   console.log("BinaryenCallId: " + Binaryen.CallId);
   console.log("BinaryenCallIndirectId: " + Binaryen.CallIndirectId);
-  console.log("BinaryenGetLocalId: " + Binaryen.GetLocalId);
-  console.log("BinaryenSetLocalId: " + Binaryen.SetLocalId);
-  console.log("BinaryenGetGlobalId: " + Binaryen.GetGlobalId);
-  console.log("BinaryenSetGlobalId: " + Binaryen.SetGlobalId);
+  console.log("BinaryenLocalGetId: " + Binaryen.LocalGetId);
+  console.log("BinaryenLocalSetId: " + Binaryen.LocalSetId);
+  console.log("BinaryenGlobalGetId: " + Binaryen.GlobalGetId);
+  console.log("BinaryenGlobalSetId: " + Binaryen.GlobalSetId);
   console.log("BinaryenLoadId: " + Binaryen.LoadId);
   console.log("BinaryenStoreId: " + Binaryen.StoreId);
   console.log("BinaryenConstId: " + Binaryen.ConstId);
@@ -383,9 +383,9 @@ function test_core() {
     module.i32.eqz( // check the output type of the call node
       module.callIndirect(makeInt32(2449), [ makeInt32(13), makeInt64(37, 0), makeFloat32(1.3), makeFloat64(3.7) ], "iiIfF")
     ),
-    module.drop(module.getLocal(0, Binaryen.i32)),
-    module.setLocal(0, makeInt32(101)),
-    module.drop(module.teeLocal(0, makeInt32(102))),
+    module.drop(module.local.get(0, Binaryen.i32)),
+    module.local.set(0, makeInt32(101)),
+    module.drop(module.local.tee(0, makeInt32(102))),
     module.i32.load(0, 0, makeInt32(1)),
     module.i64.load16_s(2, 1, makeInt32(8)),
     module.f32.load(0, 0, makeInt32(2)),
@@ -688,8 +688,8 @@ function test_binaries() {
   { // create a module and write it to binary
     module = new Binaryen.Module();
     var iii = module.addFunctionType("iii", Binaryen.i32, [ Binaryen.i32, Binaryen.i32 ]);
-    var x = module.getLocal(0, Binaryen.i32),
-        y = module.getLocal(1, Binaryen.i32);
+    var x = module.local.get(0, Binaryen.i32),
+        y = module.local.get(1, Binaryen.i32);
     var add = module.i32.add(x, y);
     var adder = module.addFunction("adder", iii, [], add);
     var initExpr = module.i32.const(3);
@@ -738,7 +738,7 @@ function test_nonvalid() {
 
   var v = module.addFunctionType("v", Binaryen.None, []);
   var func = module.addFunction("func", v, [ Binaryen.i32 ],
-    module.setLocal(0, makeInt64(1234, 0)) // wrong type!
+    module.local.set(0, makeInt64(1234, 0)) // wrong type!
   );
 
   console.log(module.emitText());
@@ -760,8 +760,8 @@ function test_parsing() {
   // create a module and write it to text
   module = new Binaryen.Module();
   var iii = module.addFunctionType("iii", Binaryen.i32, [ Binaryen.i32, Binaryen.i32 ]);
-  var x = module.getLocal(0, Binaryen.i32),
-      y = module.getLocal(1, Binaryen.i32);
+  var x = module.local.get(0, Binaryen.i32),
+      y = module.local.get(1, Binaryen.i32);
   var add = module.i32.add(x, y);
   var adder = module.addFunction("adder", iii, [], add);
   var initExpr = module.i32.const(3);
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
index fb937e39d..e68efda08 100644
--- a/test/binaryen.js/kitchen-sink.js.txt
+++ b/test/binaryen.js/kitchen-sink.js.txt
@@ -22,10 +22,10 @@ BinaryenBreakId: 4
 BinaryenSwitchId: 5
 BinaryenCallId: 6
 BinaryenCallIndirectId: 7
-BinaryenGetLocalId: 8
-BinaryenSetLocalId: 9
-BinaryenGetGlobalId: 10
-BinaryenSetGlobalId: 11
+BinaryenLocalGetId: 8
+BinaryenLocalSetId: 9
+BinaryenGlobalGetId: 10
+BinaryenGlobalSetId: 11
 BinaryenLoadId: 12
 BinaryenStoreId: 13
 BinaryenConstId: 14
@@ -3227,12 +3227,12 @@ int main() {
     expressions[623] = BinaryenCallIndirect(the_module, expressions[618], operands, 4, "iiIfF");
   }
   expressions[624] = BinaryenUnary(the_module, 20, expressions[623]);
-  expressions[625] = BinaryenGetLocal(the_module, 0, 1);
+  expressions[625] = BinaryenLocalGet(the_module, 0, 1);
   expressions[626] = BinaryenDrop(the_module, expressions[625]);
   expressions[627] = BinaryenConst(the_module, BinaryenLiteralInt32(101));
-  expressions[628] = BinaryenSetLocal(the_module, 0, expressions[627]);
+  expressions[628] = BinaryenLocalSet(the_module, 0, expressions[627]);
   expressions[629] = BinaryenConst(the_module, BinaryenLiteralInt32(102));
-  expressions[630] = BinaryenTeeLocal(the_module, 0, expressions[629]);
+  expressions[630] = BinaryenLocalTee(the_module, 0, expressions[629]);
   expressions[631] = BinaryenDrop(the_module, expressions[630]);
   expressions[632] = BinaryenConst(the_module, BinaryenLiteralInt32(1));
   expressions[633] = BinaryenLoad(the_module, 4, 1, 0, 0, 1, expressions[632]);
@@ -3390,8 +3390,8 @@ getExpressionInfo(f64.const)={"id":14,"type":4,"value":9.5}
     functionTypes[3] = BinaryenAddFunctionType(the_module, NULL, 0, paramTypes, 0);
   }
   BinaryenModuleAutoDrop(the_module);
-  BinaryenSetFeatures(the_module, 61);
-  BinaryenGetFeatures(the_module);
+  BinaryenModuleSetFeatures(the_module, 61);
+  BinaryenModuleGetFeatures(the_module);
   BinaryenModuleValidate(the_module);
   BinaryenModulePrint(the_module);
 (module
diff --git a/test/binaryen.js/sieve.js b/test/binaryen.js/sieve.js
index 8f31e9cd8..41dd0ddd3 100644
--- a/test/binaryen.js/sieve.js
+++ b/test/binaryen.js/sieve.js
@@ -14,13 +14,13 @@ var body = module.block(
     module.if(
       module.i32.lt_u(
         module.i32.mul(
-          module.current_memory(),
+          module.memory.size(),
           module.i32.const(65536)
         ),
         module.local.get(0, Binaryen.i32)
       ),
       module.drop(
-        module.grow_memory(
+        module.memory.grow(
           module.i32.sub(
             module.i32.div_u(
               module.i32.add(
@@ -29,7 +29,7 @@ var body = module.block(
               ),
               module.i32.const(65536)
             ),
-            module.current_memory()
+            module.memory.size()
           )
         )
       )
diff --git a/test/binaryen.js/sieve.js.txt b/test/binaryen.js/sieve.js.txt
index 2d9fc8ef2..888b6b06d 100644
--- a/test/binaryen.js/sieve.js.txt
+++ b/test/binaryen.js/sieve.js.txt
@@ -7,13 +7,13 @@
   (if
    (i32.lt_u
     (i32.mul
-     (current_memory)
+     (memory.size)
      (i32.const 65536)
     )
     (local.get $0)
    )
    (drop
-    (grow_memory
+    (memory.grow
      (i32.sub
       (i32.div_u
        (i32.add
@@ -22,7 +22,7 @@
        )
        (i32.const 65536)
       )
-      (current_memory)
+      (memory.size)
      )
     )
    )
@@ -65,13 +65,13 @@ optimized:
   (if
    (i32.lt_u
     (i32.shl
-     (current_memory)
+     (memory.size)
      (i32.const 16)
     )
     (local.get $0)
    )
    (drop
-    (grow_memory
+    (memory.grow
      (i32.sub
       (i32.div_u
        (i32.add
@@ -80,7 +80,7 @@ optimized:
        )
        (i32.const 65536)
       )
-      (current_memory)
+      (memory.size)
      )
     )
    )
diff --git a/test/binaryen.js/validation_errors.js b/test/binaryen.js/validation_errors.js
index 58eed0e08..e2ee01adb 100644
--- a/test/binaryen.js/validation_errors.js
+++ b/test/binaryen.js/validation_errors.js
@@ -4,7 +4,7 @@
   var func = mod.addFunction("test", funcType, [],
     mod.block("", [
       mod.drop(
-        mod.getGlobal("missing", Binaryen.i32)
+        mod.global.get("missing", Binaryen.i32)
       )
     ])
   );
@@ -18,7 +18,7 @@
   var func = mod.addFunction("test", funcType, [],
     mod.block("", [
       mod.drop(
-        mod.getLocal(0, Binaryen.i32)
+        mod.local.get(0, Binaryen.i32)
       )
     ])
   );