1 files changed, 19 insertions, 19 deletions

diff --git a/src/asmjs/asm_v_wasm.cpp b/src/asmjs/asm_v_wasm.cpp
index bfb04a9fd..bda1c3080 100644
--- a/src/asmjs/asm_v_wasm.cpp
+++ b/src/asmjs/asm_v_wasm.cpp
@@ -20,31 +20,31 @@
 
 namespace wasm {
 
-WasmType asmToWasmType(AsmType asmType) {
+Type asmToWasmType(AsmType asmType) {
   switch (asmType) {
-    case ASM_INT: return WasmType::i32;
-    case ASM_DOUBLE: return WasmType::f64;
-    case ASM_FLOAT: return WasmType::f32;
-    case ASM_INT64: return WasmType::i64;
-    case ASM_NONE: return WasmType::none;
+    case ASM_INT: return Type::i32;
+    case ASM_DOUBLE: return Type::f64;
+    case ASM_FLOAT: return Type::f32;
+    case ASM_INT64: return Type::i64;
+    case ASM_NONE: return Type::none;
     default: {}
   }
   abort();
 }
 
-AsmType wasmToAsmType(WasmType type) {
+AsmType wasmToAsmType(Type type) {
   switch (type) {
-    case WasmType::i32: return ASM_INT;
-    case WasmType::f32: return ASM_FLOAT;
-    case WasmType::f64: return ASM_DOUBLE;
-    case WasmType::i64: return ASM_INT64;
-    case WasmType::none: return ASM_NONE;
+    case Type::i32: return ASM_INT;
+    case Type::f32: return ASM_FLOAT;
+    case Type::f64: return ASM_DOUBLE;
+    case Type::i64: return ASM_INT64;
+    case Type::none: return ASM_NONE;
     default: {}
   }
   abort();
 }
 
-char getSig(WasmType type) {
+char getSig(Type type) {
   switch (type) {
     case i32:  return 'i';
     case i64:  return 'j';
@@ -73,7 +73,7 @@ std::string getSig(Function *func) {
   return ret;
 }
 
-WasmType sigToWasmType(char sig) {
+Type sigToType(char sig) {
   switch (sig) {
     case 'i': return i32;
     case 'j': return i64;
@@ -86,9 +86,9 @@ WasmType sigToWasmType(char sig) {
 
 FunctionType* sigToFunctionType(std::string sig) {
   auto ret = new FunctionType;
-  ret->result = sigToWasmType(sig[0]);
+  ret->result = sigToType(sig[0]);
   for (size_t i = 1; i < sig.size(); i++) {
-    ret->params.push_back(sigToWasmType(sig[i]));
+    ret->params.push_back(sigToType(sig[i]));
   }
   return ret;
 }
@@ -101,9 +101,9 @@ FunctionType* ensureFunctionType(std::string sig, Module* wasm) {
   // add new type
   auto type = new FunctionType;
   type->name = name;
-  type->result = sigToWasmType(sig[0]);
+  type->result = sigToType(sig[0]);
   for (size_t i = 1; i < sig.size(); i++) {
-    type->params.push_back(sigToWasmType(sig[i]));
+    type->params.push_back(sigToType(sig[i]));
   }
   wasm->addFunctionType(type);
   return type;
@@ -114,7 +114,7 @@ Expression* ensureDouble(Expression* expr, MixedArena& allocator) {
     auto conv = allocator.alloc<Unary>();
     conv->op = PromoteFloat32;
     conv->value = expr;
-    conv->type = WasmType::f64;
+    conv->type = Type::f64;
     return conv;
   }
   assert(expr->type == f64);