Change `current_memory` to `memory.size` and `grow_memory` to `memory.grow`

lib/wabt/wabt.vcxproj

@@ -134,6 +134,9 @@
     <ClInclude Include="src\wast-parser.h" />
     <ClInclude Include="src\wat-writer.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="src\token.def" />
+  </ItemGroup>
   <Import Project="$(BuildConfigPropsPath)Chakra.Build.targets" Condition="exists('$(BuildConfigPropsPath)Chakra.Build.targets')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

test/WasmSpec/testsuite/core/memory.wast

@@ -19,11 +19,11 @@
 (assert_invalid (module (memory 0) (memory 0)) "multiple memories")
 (assert_invalid (module (memory (import "spectest" "memory") 0) (memory 0)) "multiple memories")
 
-(module (memory (data)) (func (export "memsize") (result i32) (current_memory)))
+(module (memory (data)) (func (export "memsize") (result i32) (memory.size)))
 (assert_return (invoke "memsize") (i32.const 0))
-(module (memory (data "")) (func (export "memsize") (result i32) (current_memory)))
+(module (memory (data "")) (func (export "memsize") (result i32) (memory.size)))
 (assert_return (invoke "memsize") (i32.const 0))
-(module (memory (data "x")) (func (export "memsize") (result i32) (current_memory)))
+(module (memory (data "x")) (func (export "memsize") (result i32) (memory.size)))
 (assert_return (invoke "memsize") (i32.const 1))
 
 (assert_invalid (module (data (i32.const 0))) "unknown memory")
@@ -47,7 +47,7 @@
   "unknown memory"
 )
 (assert_invalid
-  (module (func (drop (current_memory))))
+  (module (func (drop (memory.size))))
   "unknown memory"
 )
 (assert_invalid

test/WasmSpec/testsuite/core/memory_trap.wast

@@ -2,7 +2,7 @@
     (memory 1)
 
     (func $addr_limit (result i32)
-      (i32.mul (current_memory) (i32.const 0x10000))
+      (i32.mul (memory.size) (i32.const 0x10000))
     )
 
     (func (export "store") (param $i i32) (param $v i32)

test/WasmSpec/testsuite/core/resizing.wast

@@ -8,7 +8,7 @@
     (func (export "store_at_page_size") (i32.store (i32.const 0x10000) (i32.const 3)))
 
     (func (export "grow") (param $sz i32) (result i32) (grow_memory (get_local $sz)))
-    (func (export "size") (result i32) (current_memory))
+    (func (export "size") (result i32) (memory.size))
 )
 
 (assert_return (invoke "size") (i32.const 0))

test/wasm/binary.js

@@ -29,8 +29,8 @@ function makeReservedTest(name, body, msg) {
 }
 
 const tests = [
-  makeReservedTest("current_memory reserved", [kExprMemorySize, 1], "current_memory reserved value must be 0"),
-  makeReservedTest("grow_memory reserved", [kExprGrowMemory, 1], "grow_memory reserved value must be 0"),
+  makeReservedTest("memory.size reserved", [kExprMemorySize, 1], "memory.size reserved value must be 0"),
+  makeReservedTest("memory.grow reserved", [kExprGrowMemory, 1], "memory.grow reserved value must be 0"),
   makeReservedTest("call_indirect reserved", [kExprCallIndirect, 1], "call_indirect reserved value must be 0"),
 ];
 

test/wasm/memory.js

@@ -32,8 +32,6 @@ function testDetach(buffer) {
   }
 }
 
-
-
 function test({init, max, checkOOM} = {}) {
   if (verbose) {
     print(`Testing memory {init: ${init|0}, max: ${max}}`);
@@ -41,8 +39,8 @@ function test({init, max, checkOOM} = {}) {
   const moduleTxt = `
   (module
     (memory (export "mem") ${init|0} ${max !== undefined ? max|0 : ""})
-    (func (export "grow") (param i32) (result i32) (grow_memory (get_local 0)))
-    (func (export "current") (result i32) (current_memory))
+    (func (export "grow") (param i32) (result i32) (memory.grow (get_local 0)))
+    (func (export "current") (result i32) (memory.size))
     (func (export "load") (param i32) (result i32) (i32.load (get_local 0)))
     (func (export "store") (param i32 i32) (i32.store (get_local 0) (get_local 1)))
   )`;

test/wasm/oom.wast

@@ -4,6 +4,6 @@
 ;;-------------------------------------------------------------------------------------------------------
 (module
     (import "dummy" "memory" (memory 0 16384))
-    (func (export "grow") (param $sz i32) (result i32) (grow_memory (get_local $sz)))
-    (func (export "size") (result i32) (current_memory))
+    (func (export "grow") (param $sz i32) (result i32) (memory.grow (get_local $sz)))
+    (func (export "size") (result i32) (memory.size))
 )

test/wasm/reload.js

@@ -12,7 +12,7 @@ function test(shared) {
   (module
     (import "test" "grow" (func $grow_import))
     (memory (export "mem") 1 100 ${shared ? "shared" : ""})
-    (func $grow (grow_memory (i32.const 1)) drop)
+    (func $grow (memory.grow (i32.const 1)) drop)
     (func $empty)
     (func (export "test") (param $i i32) (result i32)
       (local $v i32)