Update spec tests; rename {grow,current}_memory (#849)

`grow_memory` -> `memory.grow`
`current_memory` -> `memory.size`

This could have been a smaller change, but I took the opportunity to
rename the Token types, Expr types, and callback functions too. Many of
these are sorted alphabetically, so I resorted based on their new names.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/wast-parser.cc b/src/wast-parser.cc
index ae793bf8..e0713b0b 100644
--- a/src/wast-parser.cc
+++ b/src/wast-parser.cc
@@ -165,8 +165,8 @@ bool IsPlainInstr(TokenType token_type) {
     case TokenType::Binary:
     case TokenType::Compare:
     case TokenType::Convert:
-    case TokenType::CurrentMemory:
-    case TokenType::GrowMemory:
+    case TokenType::MemorySize:
+    case TokenType::MemoryGrow:
     case TokenType::Throw:
     case TokenType::Rethrow:
     case TokenType::AtomicLoad:
@@ -1426,14 +1426,14 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) {
       break;
     }
 
-    case TokenType::CurrentMemory:
+    case TokenType::MemorySize:
       Consume();
-      out_expr->reset(new CurrentMemoryExpr(loc));
+      out_expr->reset(new MemorySizeExpr(loc));
       break;
 
-    case TokenType::GrowMemory:
+    case TokenType::MemoryGrow:
       Consume();
-      out_expr->reset(new GrowMemoryExpr(loc));
+      out_expr->reset(new MemoryGrowExpr(loc));
       break;
 
     case TokenType::Throw: