new import syntax in spec repo

45 files changed, 515 insertions, 506 deletions

diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index 0071ede38..d25b64886 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -514,11 +514,9 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
     printMinorOpening(o, "unreachable") << ')';
   }
   // Module-level visitors
-  void visitFunctionType(FunctionType *curr, bool full=false) {
-    if (full) {
-      printOpening(o, "type") << ' ';
-      printName(curr->name) << " (func";
-    }
+  void visitFunctionType(FunctionType *curr, Name* internalName = nullptr) {
+    o << "(func";
+    if (internalName) o << ' ' << *internalName;
     if (curr->params.size() > 0) {
       o << maybeSpace;
       printMinorOpening(o, "param");
@@ -531,27 +529,17 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
       o << maybeSpace;
       printMinorOpening(o, "result ") << printWasmType(curr->result) << ')';
     }
-    if (full) {
-      o << "))";
-    }
+    o << ")";
   }
   void visitImport(Import *curr) {
     printOpening(o, "import ");
-    printName(curr->name) << ' ';
-    switch (curr->kind) {
-      case Export::Function: break;
-      case Export::Table: o << "table "; break;
-      case Export::Memory: o << "memory "; break;
-      case Export::Global: o << "global "; break;
-      default: WASM_UNREACHABLE();
-    }
     printText(o, curr->module.str) << ' ';
-    printText(o, curr->base.str);
+    printText(o, curr->base.str) << ' ';
     switch (curr->kind) {
-      case Export::Function: if (curr->functionType) visitFunctionType(curr->functionType); break;
-      case Export::Table: break;
-      case Export::Memory: break;
-      case Export::Global: o << ' ' << printWasmType(curr->globalType); break;
+      case Export::Function: if (curr->functionType) visitFunctionType(curr->functionType, &curr->name); break;
+      case Export::Table:    o << "(table "  << curr->name << ")"; break;
+      case Export::Memory:   o << "(memory " << curr->name << ")"; break;
+      case Export::Global:   o << "(global " << curr->name << ' ' << printWasmType(curr->globalType) << ")"; break;
       default: WASM_UNREACHABLE();
     }
     o << ')';
@@ -666,8 +654,10 @@ struct PrintSExpression : public Visitor<PrintSExpression> {
     }
     for (auto& child : curr->functionTypes) {
       doIndent(o, indent);
-      visitFunctionType(child.get(), true);
-      o << maybeNewLine;
+      printOpening(o, "type") << ' ';
+      printName(child->name) << ' ';
+      visitFunctionType(child.get());
+      o << ")" << maybeNewLine;
     }
     for (auto& child : curr->imports) {
       doIndent(o, indent);
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index 65335c1be..3ac900213 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -1429,8 +1429,24 @@ private:
   void parseImport(Element& s) {
     std::unique_ptr<Import> im = make_unique<Import>();
     size_t i = 1;
+    bool newStyle = s.size() == 4 && s[3]->isList(); // (import "env" "STACKTOP" (global $stackTop i32))
+    if (newStyle) {
+      if ((*s[3])[0]->str() == FUNC) {
+        im->kind = Import::Function;
+      } else if ((*s[3])[0]->str() == MEMORY) {
+        im->kind = Import::Memory;
+      } else if ((*s[3])[0]->str() == TABLE) {
+        im->kind = Import::Table;
+      } else if ((*s[3])[0]->str() == GLOBAL) {
+        im->kind = Import::Global;
+      } else {
+        newStyle = false; // either (param..) or (result..)
+      }
+    }
     if (s.size() > 3 && s[3]->isStr()) {
       im->name = s[i++]->str();
+    } else if (newStyle) {
+      im->name = (*s[3])[1]->str();
     } else {
       im->name = Name::fromInt(importCounter);
     }
@@ -1438,24 +1454,27 @@ private:
     if (!s[i]->quoted()) {
       if (s[i]->str() == MEMORY) {
         im->kind = Import::Memory;
-      } else if (s[2]->str() == TABLE) {
+      } else if (s[i]->str() == TABLE) {
         im->kind = Import::Table;
-      } else if (s[2]->str() == GLOBAL) {
+      } else if (s[i]->str() == GLOBAL) {
         im->kind = Import::Global;
       } else {
         WASM_UNREACHABLE();
       }
       i++;
-    } else {
+    } else if (!newStyle) {
       im->kind = Import::Function;
     }
     im->module = s[i++]->str();
     if (!s[i]->isStr()) throw ParseException("no name for import");
     im->base = s[i++]->str();
+    // parse internals
+    Element& inner = newStyle ? *s[3] : s;
+    Index j = newStyle ? 2 : i;
     if (im->kind == Import::Function) {
       std::unique_ptr<FunctionType> type = make_unique<FunctionType>();
-      if (s.size() > i) {
-        Element& params = *s[i];
+      if (inner.size() > j) {
+        Element& params = *inner[j];
         IString id = params[0]->str();
         if (id == PARAM) {
           for (size_t i = 1; i < params.size(); i++) {
@@ -1470,15 +1489,15 @@ private:
         } else {
           throw ParseException("bad import element");
         }
-        if (s.size() > i+1) {
-          Element& result = *s[i+1];
+        if (inner.size() > j+1) {
+          Element& result = *inner[j+1];
           assert(result[0]->str() == RESULT);
           type->result = stringToWasmType(result[1]->str());
         }
       }
       im->functionType = ensureFunctionType(getSig(type.get()), &wasm);
     } else if (im->kind == Import::Global) {
-      im->globalType = stringToWasmType(s[i]->str());
+      im->globalType = stringToWasmType(inner[j]->str());
     }
     wasm.addImport(im.release());
   }
diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm
index 72023d55c..853b1c229 100644
--- a/test/emcc_O2_hello_world.fromasm
+++ b/test/emcc_O2_hello_world.fromasm
@@ -8,32 +8,32 @@
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_abort "env" "_abort")
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $_free)
   (export "_main" $_main)
   (export "_memset" $_memset)
diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise
index 691e60f0a..07ca5226e 100644
--- a/test/emcc_O2_hello_world.fromasm.imprecise
+++ b/test/emcc_O2_hello_world.fromasm.imprecise
@@ -7,31 +7,31 @@
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_abort "env" "_abort")
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $_free)
   (export "_main" $_main)
   (export "_memset" $_memset)
diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
index 6eaa96fd7..a57637426 100644
--- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
@@ -7,31 +7,31 @@
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_abort "env" "_abort")
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $_free)
   (export "_main" $_main)
   (export "_memset" $_memset)
diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts
index 189de5e62..47aee9101 100644
--- a/test/emcc_O2_hello_world.fromasm.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.no-opts
@@ -7,32 +7,32 @@
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_abort "env" "_abort")
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $_free)
   (export "_main" $_main)
   (export "_memset" $_memset)
diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index 49f2c0080..f9f94a67c 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -9,40 +9,40 @@
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $cttz_i8 global "env" "cttz_i8" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort")
-  (import $nullFunc_ii "env" "nullFunc_ii" (param i32))
-  (import $nullFunc_iiii "env" "nullFunc_iiii" (param i32))
-  (import $nullFunc_vi "env" "nullFunc_vi" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_abort "env" "_abort")
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $i32s-div "asm2wasm" "i32s-div" (param i32 i32) (result i32))
-  (import $i32s-rem "asm2wasm" "i32s-rem" (param i32 i32) (result i32))
-  (import $i32u-rem "asm2wasm" "i32u-rem" (param i32 i32) (result i32))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "env" "cttz_i8" (global $cttz_i8 i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort))
+  (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32)))
+  (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32)))
+  (import "env" "nullFunc_vi" (func $nullFunc_vi (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "asm2wasm" "i32s-div" (func $i32s-div (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32s-rem" (func $i32s-rem (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-rem" (func $i32u-rem (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_i64Subtract" $_i64Subtract)
   (export "_free" $_free)
   (export "_main" $_main)
diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise
index 0cf544e09..9a76257c6 100644
--- a/test/emcc_hello_world.fromasm.imprecise
+++ b/test/emcc_hello_world.fromasm.imprecise
@@ -7,35 +7,35 @@
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $cttz_i8 global "env" "cttz_i8" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort")
-  (import $nullFunc_ii "env" "nullFunc_ii" (param i32))
-  (import $nullFunc_iiii "env" "nullFunc_iiii" (param i32))
-  (import $nullFunc_vi "env" "nullFunc_vi" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_abort "env" "_abort")
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "env" "cttz_i8" (global $cttz_i8 i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort))
+  (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32)))
+  (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32)))
+  (import "env" "nullFunc_vi" (func $nullFunc_vi (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_i64Subtract" $_i64Subtract)
   (export "_free" $_free)
   (export "_main" $_main)
diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts
index 339580ad7..4fa91d0de 100644
--- a/test/emcc_hello_world.fromasm.imprecise.no-opts
+++ b/test/emcc_hello_world.fromasm.imprecise.no-opts
@@ -7,35 +7,35 @@
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $cttz_i8 global "env" "cttz_i8" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort")
-  (import $nullFunc_ii "env" "nullFunc_ii" (param i32))
-  (import $nullFunc_iiii "env" "nullFunc_iiii" (param i32))
-  (import $nullFunc_vi "env" "nullFunc_vi" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_abort "env" "_abort")
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "env" "cttz_i8" (global $cttz_i8 i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort))
+  (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32)))
+  (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32)))
+  (import "env" "nullFunc_vi" (func $nullFunc_vi (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_i64Subtract" $_i64Subtract)
   (export "_free" $_free)
   (export "_main" $_main)
diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts
index 98f57b812..7cde2410e 100644
--- a/test/emcc_hello_world.fromasm.no-opts
+++ b/test/emcc_hello_world.fromasm.no-opts
@@ -8,40 +8,40 @@
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $STACKTOP global "env" "STACKTOP" i32)
-  (import $STACK_MAX global "env" "STACK_MAX" i32)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $ABORT global "env" "ABORT" i32)
-  (import $cttz_i8 global "env" "cttz_i8" i32)
-  (import $nan global "global" "NaN" f64)
-  (import $inf global "global" "Infinity" f64)
-  (import $abort "env" "abort")
-  (import $nullFunc_ii "env" "nullFunc_ii" (param i32))
-  (import $nullFunc_iiii "env" "nullFunc_iiii" (param i32))
-  (import $nullFunc_vi "env" "nullFunc_vi" (param i32))
-  (import $_pthread_cleanup_pop "env" "_pthread_cleanup_pop" (param i32))
-  (import $___lock "env" "___lock" (param i32))
-  (import $_pthread_self "env" "_pthread_self" (result i32))
-  (import $_abort "env" "_abort")
-  (import $___syscall6 "env" "___syscall6" (param i32 i32) (result i32))
-  (import $_sbrk "env" "_sbrk" (param i32) (result i32))
-  (import $_time "env" "_time" (param i32) (result i32))
-  (import $_emscripten_memcpy_big "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $___syscall54 "env" "___syscall54" (param i32 i32) (result i32))
-  (import $___unlock "env" "___unlock" (param i32))
-  (import $___syscall140 "env" "___syscall140" (param i32 i32) (result i32))
-  (import $_pthread_cleanup_push "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $_sysconf "env" "_sysconf" (param i32) (result i32))
-  (import $___syscall146 "env" "___syscall146" (param i32 i32) (result i32))
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $i32s-div "asm2wasm" "i32s-div" (param i32 i32) (result i32))
-  (import $i32s-rem "asm2wasm" "i32s-rem" (param i32 i32) (result i32))
-  (import $i32u-rem "asm2wasm" "i32u-rem" (param i32 i32) (result i32))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $STACKTOP i32))
+  (import "env" "STACK_MAX" (global $STACK_MAX i32))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "ABORT" (global $ABORT i32))
+  (import "env" "cttz_i8" (global $cttz_i8 i32))
+  (import "global" "NaN" (global $nan f64))
+  (import "global" "Infinity" (global $inf f64))
+  (import "env" "abort" (func $abort))
+  (import "env" "nullFunc_ii" (func $nullFunc_ii (param i32)))
+  (import "env" "nullFunc_iiii" (func $nullFunc_iiii (param i32)))
+  (import "env" "nullFunc_vi" (func $nullFunc_vi (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $_pthread_cleanup_pop (param i32)))
+  (import "env" "___lock" (func $___lock (param i32)))
+  (import "env" "_pthread_self" (func $_pthread_self (result i32)))
+  (import "env" "_abort" (func $_abort))
+  (import "env" "___syscall6" (func $___syscall6 (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $_sbrk (param i32) (result i32)))
+  (import "env" "_time" (func $_time (param i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $_emscripten_memcpy_big (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $___syscall54 (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $___unlock (param i32)))
+  (import "env" "___syscall140" (func $___syscall140 (param i32 i32) (result i32)))
+  (import "env" "_pthread_cleanup_push" (func $_pthread_cleanup_push (param i32 i32)))
+  (import "env" "_sysconf" (func $_sysconf (param i32) (result i32)))
+  (import "env" "___syscall146" (func $___syscall146 (param i32 i32) (result i32)))
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "asm2wasm" "i32s-div" (func $i32s-div (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32s-rem" (func $i32s-rem (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-rem" (func $i32u-rem (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_i64Subtract" $_i64Subtract)
   (export "_free" $_free)
   (export "_main" $_main)
diff --git a/test/empty.fromasm b/test/empty.fromasm
index b68429ccf..67c1135d4 100644
--- a/test/empty.fromasm
+++ b/test/empty.fromasm
@@ -1,8 +1,8 @@
 (module
   (memory 256 256)
   (data (get_global $memoryBase) "empty.asm.js")
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty.fromasm.imprecise b/test/empty.fromasm.imprecise
index 2042278ee..5fbd4b5f8 100644
--- a/test/empty.fromasm.imprecise
+++ b/test/empty.fromasm.imprecise
@@ -1,7 +1,7 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty.fromasm.imprecise.no-opts b/test/empty.fromasm.imprecise.no-opts
index 2042278ee..5fbd4b5f8 100644
--- a/test/empty.fromasm.imprecise.no-opts
+++ b/test/empty.fromasm.imprecise.no-opts
@@ -1,7 +1,7 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/empty.fromasm.no-opts b/test/empty.fromasm.no-opts
index 2042278ee..5fbd4b5f8 100644
--- a/test/empty.fromasm.no-opts
+++ b/test/empty.fromasm.no-opts
@@ -1,7 +1,7 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
 )
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index a49a8abcc..d272301a9 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -14,7 +14,7 @@ BinaryenFloat64: 4
   (type $fiF (func (param i32 f64) (result f32)))
   (type $v (func))
   (type $3 (func))
-  (import $an-imported "module" "base" (param i32 f64) (result f32))
+  (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
   (export "kitchen_sinker" "$kitchen()sinker")
   (export "mem" memory)
   (table 1 1 anyfunc)
@@ -536,7 +536,7 @@ raw:
   (type $v (func))
   (type $vi (func (param i32)))
   (type $i (func (result i32)))
-  (import $check "module" "check" (param i32))
+  (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (local $0 i32)
     (call_import $check
@@ -1023,7 +1023,7 @@ optimized:
   (type $v (func))
   (type $vi (func (param i32)))
   (type $i (func (result i32)))
-  (import $check "module" "check" (param i32))
+  (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (call_import $check
       (i32.const 1337)
@@ -1244,7 +1244,7 @@ module loaded from binary form:
   (start $starter)
   (type $vi (func (param i32)))
   (type $v (func))
-  (import $print-i32 "spectest" "print" (param i32))
+  (import "spectest" "print" (func $print-i32 (param i32)))
   (func $starter (type $v)
     (call_import $print-i32
       (i32.const 1234)
@@ -1605,7 +1605,7 @@ int main() {
   (type $fiF (func (param i32 f64) (result f32)))
   (type $v (func))
   (type $3 (func))
-  (import $an-imported "module" "base" (param i32 f64) (result f32))
+  (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
   (export "kitchen_sinker" "$kitchen()sinker")
   (export "mem" memory)
   (table 1 1 anyfunc)
@@ -2587,7 +2587,7 @@ raw:
   (type $v (func))
   (type $vi (func (param i32)))
   (type $i (func (result i32)))
-  (import $check "module" "check" (param i32))
+  (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (local $0 i32)
     (call_import $check
@@ -3078,7 +3078,7 @@ optimized:
   (type $v (func))
   (type $vi (func (param i32)))
   (type $i (func (result i32)))
-  (import $check "module" "check" (param i32))
+  (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (call_import $check
       (i32.const 1337)
diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt
index cf9177060..5acac8e51 100644
--- a/test/example/c-api-kitchen-sink.txt.txt
+++ b/test/example/c-api-kitchen-sink.txt.txt
@@ -9,7 +9,7 @@
   (type $fiF (func (param i32 f64) (result f32)))
   (type $v (func))
   (type $3 (func))
-  (import $an-imported "module" "base" (param i32 f64) (result f32))
+  (import "module" "base" (func $an-imported (param i32 f64) (result f32)))
   (export "kitchen_sinker" "$kitchen()sinker")
   (export "mem" memory)
   (table 1 1 anyfunc)
@@ -530,7 +530,7 @@
   (type $v (func))
   (type $vi (func (param i32)))
   (type $i (func (result i32)))
-  (import $check "module" "check" (param i32))
+  (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (local $0 i32)
     (call_import $check
@@ -1016,7 +1016,7 @@
   (type $v (func))
   (type $vi (func (param i32)))
   (type $i (func (result i32)))
-  (import $check "module" "check" (param i32))
+  (import "module" "check" (func $check (param i32)))
   (func $just-one-block (type $v)
     (call_import $check
       (i32.const 1337)
diff --git a/test/example/relooper-fuzz.txt b/test/example/relooper-fuzz.txt
index 730106cf9..09b6ef8cb 100644
--- a/test/example/relooper-fuzz.txt
+++ b/test/example/relooper-fuzz.txt
@@ -4,7 +4,7 @@
   (type $i (func (result i32)))
   (type $v (func))
   (type $vi (func (param i32)))
-  (import $print "spectest" "print" (param i32))
+  (import "spectest" "print" (func $print (param i32)))
   (export "mem" memory)
   (func $check (type $i) (result i32)
     (if
@@ -297,7 +297,7 @@
   (type $i (func (result i32)))
   (type $v (func))
   (type $vi (func (param i32)))
-  (import $print "spectest" "print" (param i32))
+  (import "spectest" "print" (func $print (param i32)))
   (export "mem" memory)
   (func $check (type $i) (result i32)
     (if
diff --git a/test/example/relooper-fuzz1.txt b/test/example/relooper-fuzz1.txt
index f219e9f96..9fbaae5f0 100644
--- a/test/example/relooper-fuzz1.txt
+++ b/test/example/relooper-fuzz1.txt
@@ -4,7 +4,7 @@
   (type $i (func (result i32)))
   (type $v (func))
   (type $vi (func (param i32)))
-  (import $print "spectest" "print" (param i32))
+  (import "spectest" "print" (func $print (param i32)))
   (export "mem" memory)
   (func $check (type $i) (result i32)
     (if
@@ -273,7 +273,7 @@
   (type $i (func (result i32)))
   (type $v (func))
   (type $vi (func (param i32)))
-  (import $print "spectest" "print" (param i32))
+  (import "spectest" "print" (func $print (param i32)))
   (export "mem" memory)
   (func $check (type $i) (result i32)
     (if
diff --git a/test/hello_world.fromasm b/test/hello_world.fromasm
index 1706d2a2b..9c3c21bd6 100644
--- a/test/hello_world.fromasm
+++ b/test/hello_world.fromasm
@@ -1,10 +1,10 @@
 (module
   (memory 256 256)
   (data (get_global $memoryBase) "hello_world.asm.js")
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "add" $add)
   (func $add (param $0 i32) (param $1 i32) (result i32)
     (i32.add
diff --git a/test/hello_world.fromasm.imprecise b/test/hello_world.fromasm.imprecise
index c69686d27..8c81998c0 100644
--- a/test/hello_world.fromasm.imprecise
+++ b/test/hello_world.fromasm.imprecise
@@ -1,9 +1,9 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "add" $add)
   (func $add (param $0 i32) (param $1 i32) (result i32)
     (i32.add
diff --git a/test/hello_world.fromasm.imprecise.no-opts b/test/hello_world.fromasm.imprecise.no-opts
index 1bd263d54..8ee9fb664 100644
--- a/test/hello_world.fromasm.imprecise.no-opts
+++ b/test/hello_world.fromasm.imprecise.no-opts
@@ -1,9 +1,9 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "add" $add)
   (func $add (param $x i32) (param $y i32) (result i32)
     (return
diff --git a/test/hello_world.fromasm.no-opts b/test/hello_world.fromasm.no-opts
index 1bd263d54..8ee9fb664 100644
--- a/test/hello_world.fromasm.no-opts
+++ b/test/hello_world.fromasm.no-opts
@@ -1,9 +1,9 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "add" $add)
   (func $add (param $x i32) (param $y i32) (result i32)
     (return
diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm
index eaec42b73..eedace359 100644
--- a/test/memorygrowth.fromasm
+++ b/test/memorygrowth.fromasm
@@ -7,29 +7,29 @@
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $r global "env" "STACKTOP" i32)
-  (import $s global "env" "STACK_MAX" i32)
-  (import $t global "env" "tempDoublePtr" i32)
-  (import $u global "env" "ABORT" i32)
-  (import $z global "global" "NaN" f64)
-  (import $A global "global" "Infinity" f64)
-  (import $ja "env" "abort" (param i32))
-  (import $oa "env" "_pthread_cleanup_pop" (param i32))
-  (import $pa "env" "___lock" (param i32))
-  (import $qa "env" "_abort")
-  (import $ra "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $sa "env" "___syscall6" (param i32 i32) (result i32))
-  (import $ta "env" "_sbrk" (param i32) (result i32))
-  (import $ua "env" "___syscall140" (param i32 i32) (result i32))
-  (import $va "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $wa "env" "___syscall54" (param i32 i32) (result i32))
-  (import $xa "env" "___unlock" (param i32))
-  (import $ya "env" "___syscall146" (param i32 i32) (result i32))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $r i32))
+  (import "env" "STACK_MAX" (global $s i32))
+  (import "env" "tempDoublePtr" (global $t i32))
+  (import "env" "ABORT" (global $u i32))
+  (import "global" "NaN" (global $z f64))
+  (import "global" "Infinity" (global $A f64))
+  (import "env" "abort" (func $ja (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $oa (param i32)))
+  (import "env" "___lock" (func $pa (param i32)))
+  (import "env" "_abort" (func $qa))
+  (import "env" "_pthread_cleanup_push" (func $ra (param i32 i32)))
+  (import "env" "___syscall6" (func $sa (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $ta (param i32) (result i32)))
+  (import "env" "___syscall140" (func $ua (param i32 i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $va (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $wa (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $xa (param i32)))
+  (import "env" "___syscall146" (func $ya (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $fb)
   (export "_main" $Na)
   (export "_pthread_self" $ib)
diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise
index 68912b28b..14911b9c2 100644
--- a/test/memorygrowth.fromasm.imprecise
+++ b/test/memorygrowth.fromasm.imprecise
@@ -6,28 +6,28 @@
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
-  (import $r global "env" "STACKTOP" i32)
-  (import $s global "env" "STACK_MAX" i32)
-  (import $t global "env" "tempDoublePtr" i32)
-  (import $u global "env" "ABORT" i32)
-  (import $z global "global" "NaN" f64)
-  (import $A global "global" "Infinity" f64)
-  (import $ja "env" "abort" (param i32))
-  (import $oa "env" "_pthread_cleanup_pop" (param i32))
-  (import $pa "env" "___lock" (param i32))
-  (import $qa "env" "_abort")
-  (import $ra "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $sa "env" "___syscall6" (param i32 i32) (result i32))
-  (import $ta "env" "_sbrk" (param i32) (result i32))
-  (import $ua "env" "___syscall140" (param i32 i32) (result i32))
-  (import $va "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $wa "env" "___syscall54" (param i32 i32) (result i32))
-  (import $xa "env" "___unlock" (param i32))
-  (import $ya "env" "___syscall146" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $r i32))
+  (import "env" "STACK_MAX" (global $s i32))
+  (import "env" "tempDoublePtr" (global $t i32))
+  (import "env" "ABORT" (global $u i32))
+  (import "global" "NaN" (global $z f64))
+  (import "global" "Infinity" (global $A f64))
+  (import "env" "abort" (func $ja (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $oa (param i32)))
+  (import "env" "___lock" (func $pa (param i32)))
+  (import "env" "_abort" (func $qa))
+  (import "env" "_pthread_cleanup_push" (func $ra (param i32 i32)))
+  (import "env" "___syscall6" (func $sa (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $ta (param i32) (result i32)))
+  (import "env" "___syscall140" (func $ua (param i32 i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $va (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $wa (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $xa (param i32)))
+  (import "env" "___syscall146" (func $ya (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $fb)
   (export "_main" $Na)
   (export "_pthread_self" $ib)
diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts
index ac5e13f93..8ee5fc20d 100644
--- a/test/memorygrowth.fromasm.imprecise.no-opts
+++ b/test/memorygrowth.fromasm.imprecise.no-opts
@@ -6,28 +6,28 @@
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
-  (import $r global "env" "STACKTOP" i32)
-  (import $s global "env" "STACK_MAX" i32)
-  (import $t global "env" "tempDoublePtr" i32)
-  (import $u global "env" "ABORT" i32)
-  (import $z global "global" "NaN" f64)
-  (import $A global "global" "Infinity" f64)
-  (import $ja "env" "abort" (param i32))
-  (import $oa "env" "_pthread_cleanup_pop" (param i32))
-  (import $pa "env" "___lock" (param i32))
-  (import $qa "env" "_abort")
-  (import $ra "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $sa "env" "___syscall6" (param i32 i32) (result i32))
-  (import $ta "env" "_sbrk" (param i32) (result i32))
-  (import $ua "env" "___syscall140" (param i32 i32) (result i32))
-  (import $va "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $wa "env" "___syscall54" (param i32 i32) (result i32))
-  (import $xa "env" "___unlock" (param i32))
-  (import $ya "env" "___syscall146" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $r i32))
+  (import "env" "STACK_MAX" (global $s i32))
+  (import "env" "tempDoublePtr" (global $t i32))
+  (import "env" "ABORT" (global $u i32))
+  (import "global" "NaN" (global $z f64))
+  (import "global" "Infinity" (global $A f64))
+  (import "env" "abort" (func $ja (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $oa (param i32)))
+  (import "env" "___lock" (func $pa (param i32)))
+  (import "env" "_abort" (func $qa))
+  (import "env" "_pthread_cleanup_push" (func $ra (param i32 i32)))
+  (import "env" "___syscall6" (func $sa (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $ta (param i32) (result i32)))
+  (import "env" "___syscall140" (func $ua (param i32 i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $va (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $wa (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $xa (param i32)))
+  (import "env" "___syscall146" (func $ya (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $fb)
   (export "_main" $Na)
   (export "_pthread_self" $ib)
diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts
index 4c91ef8eb..91fae3ccf 100644
--- a/test/memorygrowth.fromasm.no-opts
+++ b/test/memorygrowth.fromasm.no-opts
@@ -6,29 +6,29 @@
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vii (func (param i32 i32)))
-  (import $r global "env" "STACKTOP" i32)
-  (import $s global "env" "STACK_MAX" i32)
-  (import $t global "env" "tempDoublePtr" i32)
-  (import $u global "env" "ABORT" i32)
-  (import $z global "global" "NaN" f64)
-  (import $A global "global" "Infinity" f64)
-  (import $ja "env" "abort" (param i32))
-  (import $oa "env" "_pthread_cleanup_pop" (param i32))
-  (import $pa "env" "___lock" (param i32))
-  (import $qa "env" "_abort")
-  (import $ra "env" "_pthread_cleanup_push" (param i32 i32))
-  (import $sa "env" "___syscall6" (param i32 i32) (result i32))
-  (import $ta "env" "_sbrk" (param i32) (result i32))
-  (import $ua "env" "___syscall140" (param i32 i32) (result i32))
-  (import $va "env" "_emscripten_memcpy_big" (param i32 i32 i32) (result i32))
-  (import $wa "env" "___syscall54" (param i32 i32) (result i32))
-  (import $xa "env" "___unlock" (param i32))
-  (import $ya "env" "___syscall146" (param i32 i32) (result i32))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "STACKTOP" (global $r i32))
+  (import "env" "STACK_MAX" (global $s i32))
+  (import "env" "tempDoublePtr" (global $t i32))
+  (import "env" "ABORT" (global $u i32))
+  (import "global" "NaN" (global $z f64))
+  (import "global" "Infinity" (global $A f64))
+  (import "env" "abort" (func $ja (param i32)))
+  (import "env" "_pthread_cleanup_pop" (func $oa (param i32)))
+  (import "env" "___lock" (func $pa (param i32)))
+  (import "env" "_abort" (func $qa))
+  (import "env" "_pthread_cleanup_push" (func $ra (param i32 i32)))
+  (import "env" "___syscall6" (func $sa (param i32 i32) (result i32)))
+  (import "env" "_sbrk" (func $ta (param i32) (result i32)))
+  (import "env" "___syscall140" (func $ua (param i32 i32) (result i32)))
+  (import "env" "_emscripten_memcpy_big" (func $va (param i32 i32 i32) (result i32)))
+  (import "env" "___syscall54" (func $wa (param i32 i32) (result i32)))
+  (import "env" "___unlock" (func $xa (param i32)))
+  (import "env" "___syscall146" (func $ya (param i32 i32) (result i32)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_free" $fb)
   (export "_main" $Na)
   (export "_pthread_self" $ib)
diff --git a/test/min.fromasm b/test/min.fromasm
index 9250c1693..1aa1e9405 100644
--- a/test/min.fromasm
+++ b/test/min.fromasm
@@ -1,11 +1,11 @@
 (module
   (memory 256 256)
   (data (get_global $memoryBase) "min.asm.js")
-  (import $tDP global "env" "tempDoublePtr" i32)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "tempDoublePtr" (global $tDP i32))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "floats" $floats)
   (func $floats (param $0 f32) (result f32)
     (local $1 f32)
diff --git a/test/min.fromasm.imprecise b/test/min.fromasm.imprecise
index 9d0edd356..094a713a7 100644
--- a/test/min.fromasm.imprecise
+++ b/test/min.fromasm.imprecise
@@ -1,10 +1,10 @@
 (module
   (memory 256 256)
-  (import $tDP global "env" "tempDoublePtr" i32)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "tempDoublePtr" (global $tDP i32))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "floats" $floats)
   (func $floats (param $0 f32) (result f32)
     (local $1 f32)
diff --git a/test/min.fromasm.imprecise.no-opts b/test/min.fromasm.imprecise.no-opts
index 31828a21a..2bc20abbb 100644
--- a/test/min.fromasm.imprecise.no-opts
+++ b/test/min.fromasm.imprecise.no-opts
@@ -1,10 +1,10 @@
 (module
   (memory 256 256)
-  (import $tDP global "env" "tempDoublePtr" i32)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "tempDoublePtr" (global $tDP i32))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "floats" $floats)
   (func $floats (param $f f32) (result f32)
     (local $t f32)
diff --git a/test/min.fromasm.no-opts b/test/min.fromasm.no-opts
index 31828a21a..2bc20abbb 100644
--- a/test/min.fromasm.no-opts
+++ b/test/min.fromasm.no-opts
@@ -1,10 +1,10 @@
 (module
   (memory 256 256)
-  (import $tDP global "env" "tempDoublePtr" i32)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "tempDoublePtr" (global $tDP i32))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "floats" $floats)
   (func $floats (param $f f32) (result f32)
     (local $t f32)
diff --git a/test/passes/coalesce-locals-learning.txt b/test/passes/coalesce-locals-learning.txt
index a9039e4d8..f5622d097 100644
--- a/test/passes/coalesce-locals-learning.txt
+++ b/test/passes/coalesce-locals-learning.txt
@@ -5,7 +5,7 @@
   (type $2 (func))
   (type $3 (func (param i32 f32)))
   (type $4 (func (param i32)))
-  (import $_emscripten_autodebug_i32 "env" "_emscripten_autodebug_i32" (param i32 i32) (result i32))
+  (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32)))
   (func $nothing-to-do (type $2)
     (local $0 i32)
     (nop)
diff --git a/test/passes/coalesce-locals.txt b/test/passes/coalesce-locals.txt
index 3a038ca27..3836cfadb 100644
--- a/test/passes/coalesce-locals.txt
+++ b/test/passes/coalesce-locals.txt
@@ -5,7 +5,7 @@
   (type $2 (func))
   (type $3 (func (param i32 f32)))
   (type $4 (func (param i32)))
-  (import $_emscripten_autodebug_i32 "env" "_emscripten_autodebug_i32" (param i32 i32) (result i32))
+  (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32)))
   (func $nothing-to-do (type $2)
     (local $0 i32)
     (nop)
diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt
index c37c41fe3..881a265e9 100644
--- a/test/passes/duplicate-function-elimination.txt
+++ b/test/passes/duplicate-function-elimination.txt
@@ -367,8 +367,8 @@
 (module
   (memory 0)
   (type $FUNCSIG$v (func))
-  (import $i "env" "i")
-  (import $i "env" "j")
+  (import "env" "i" (func $i))
+  (import "env" "j" (func $i))
   (func $erase (type $FUNCSIG$v)
     (call_import $i)
   )
@@ -376,8 +376,8 @@
 (module
   (memory 0)
   (type $FUNCSIG$v (func))
-  (import $i "env" "i")
-  (import $j "env" "j")
+  (import "env" "i" (func $i))
+  (import "env" "j" (func $j))
   (func $keep2 (type $FUNCSIG$v)
     (call_import $i)
   )
diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt
index ee4418953..72bd7aa12 100644
--- a/test/passes/simplify-locals.txt
+++ b/test/passes/simplify-locals.txt
@@ -8,10 +8,10 @@
   (type $5 (func (param i32) (result i32)))
   (type $6 (func (param i32 i32 i32 i32 i32 i32)))
   (type $7 (func (param i32 i32)))
-  (import $waka "env" "waka")
-  (import $waka_int "env" "waka_int" (result i32))
-  (import $_i64Subtract "env" "i64sub" (param i32 i32 i32 i32) (result i32))
-  (import $___udivmoddi4 "env" "moddi" (param i32 i32 i32 i32 i32) (result i32))
+  (import "env" "waka" (func $waka))
+  (import "env" "waka_int" (func $waka_int (result i32)))
+  (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32)))
+  (import "env" "moddi" (func $___udivmoddi4 (param i32 i32 i32 i32 i32) (result i32)))
   (func $b0-yes (type $4) (param $i1 i32)
     (local $x i32)
     (local $y i32)
diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt
index 678c18cfa..1adcc3e6f 100644
--- a/test/passes/vacuum.txt
+++ b/test/passes/vacuum.txt
@@ -6,7 +6,7 @@
   (type $3 (func (result i32)))
   (type $4 (func (param i32 f64 i32 i32)))
   (type $FUNCSIG$i (func (result i32)))
-  (import $int "env" "int" (result i32))
+  (import "env" "int" (func $int (result i32)))
   (func $b (type $0)
     (nop)
   )
diff --git a/test/two_sides.fromasm b/test/two_sides.fromasm
index c567116ae..d53021c11 100644
--- a/test/two_sides.fromasm
+++ b/test/two_sides.fromasm
@@ -2,11 +2,11 @@
   (memory 256 256)
   (data (get_global $memoryBase) "two_sides.asm.js")
   (type $FUNCSIG$id (func (param f64) (result i32)))
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_test" $_test)
   (func $_test (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
     (local $5 f64)
diff --git a/test/two_sides.fromasm.imprecise b/test/two_sides.fromasm.imprecise
index fbd3799c4..d664567b4 100644
--- a/test/two_sides.fromasm.imprecise
+++ b/test/two_sides.fromasm.imprecise
@@ -1,9 +1,9 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_test" $_test)
   (func $_test (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32)
     (local $5 f64)
diff --git a/test/two_sides.fromasm.imprecise.no-opts b/test/two_sides.fromasm.imprecise.no-opts
index 550d747dc..d6ada31f6 100644
--- a/test/two_sides.fromasm.imprecise.no-opts
+++ b/test/two_sides.fromasm.imprecise.no-opts
@@ -1,9 +1,9 @@
 (module
   (memory 256 256)
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_test" $_test)
   (func $_test (param $i1 i32) (param $i2 i32) (param $i3 i32) (param $i4 i32) (param $i5 i32) (result i32)
     (local $d6 f64)
diff --git a/test/two_sides.fromasm.no-opts b/test/two_sides.fromasm.no-opts
index 4123ec856..b10f96c69 100644
--- a/test/two_sides.fromasm.no-opts
+++ b/test/two_sides.fromasm.no-opts
@@ -1,11 +1,11 @@
 (module
   (memory 256 256)
   (type $FUNCSIG$id (func (param f64) (result i32)))
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "_test" $_test)
   (func $_test (param $i1 i32) (param $i2 i32) (param $i3 i32) (param $i4 i32) (param $i5 i32) (result i32)
     (local $d6 f64)
diff --git a/test/unit.fromasm b/test/unit.fromasm
index a3fbf0add..0a051cf5a 100644
--- a/test/unit.fromasm
+++ b/test/unit.fromasm
@@ -8,21 +8,21 @@
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (type $FUNCSIG$dd (func (param f64) (result f64)))
-  (import $t global "global" "NaN" f64)
-  (import $u global "global" "Infinity" f64)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $n global "env" "gb" i32)
-  (import $setTempRet0 "env" "setTempRet0" (param i32) (result i32))
-  (import $abort "env" "abort" (param f64) (result f64))
-  (import $print "env" "print" (param i32))
-  (import $h "env" "h" (param i32))
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "global" "NaN" (global $t f64))
+  (import "global" "Infinity" (global $u f64))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "gb" (global $n i32))
+  (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32)))
+  (import "env" "abort" (func $abort (param f64) (result f64)))
+  (import "env" "print" (func $print (param i32)))
+  (import "env" "h" (func $h (param i32)))
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "big_negative" $big_negative)
   (export "pick" $big_negative)
   (global $Int i32 (i32.const 0))
diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise
index 46de1092f..2240135c3 100644
--- a/test/unit.fromasm.imprecise
+++ b/test/unit.fromasm.imprecise
@@ -5,19 +5,19 @@
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (type $FUNCSIG$dd (func (param f64) (result f64)))
-  (import $t global "global" "NaN" f64)
-  (import $u global "global" "Infinity" f64)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $n global "env" "gb" i32)
-  (import $setTempRet0 "env" "setTempRet0" (param i32) (result i32))
-  (import $abort "env" "abort" (param f64) (result f64))
-  (import $print "env" "print" (param i32))
-  (import $h "env" "h" (param i32))
-  (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "global" "NaN" (global $t f64))
+  (import "global" "Infinity" (global $u f64))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "gb" (global $n i32))
+  (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32)))
+  (import "env" "abort" (func $abort (param f64) (result f64)))
+  (import "env" "print" (func $print (param i32)))
+  (import "env" "h" (func $h (param i32)))
+  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "big_negative" $big_negative)
   (export "pick" $big_negative)
   (global $Int i32 (i32.const 0))
diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts
index 3f82776e5..f78c96637 100644
--- a/test/unit.fromasm.imprecise.no-opts
+++ b/test/unit.fromasm.imprecise.no-opts
@@ -5,19 +5,19 @@
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (type $FUNCSIG$dd (func (param f64) (result f64)))
-  (import $t global "global" "NaN" f64)
-  (import $u global "global" "Infinity" f64)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $n global "env" "gb" i32)
-  (import $setTempRet0 "env" "setTempRet0" (param i32) (result i32))
-  (import $abort "env" "abort" (param f64) (result f64))
-  (import $print "env" "print" (param i32))
-  (import $h "env" "h" (param i32))
-  (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "global" "NaN" (global $t f64))
+  (import "global" "Infinity" (global $u f64))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "gb" (global $n i32))
+  (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32)))
+  (import "env" "abort" (func $abort (param f64) (result f64)))
+  (import "env" "print" (func $print (param i32)))
+  (import "env" "h" (func $h (param i32)))
+  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "big_negative" $big_negative)
   (export "pick" $exportMe)
   (global $Int i32 (i32.const 0))
diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts
index c55a309e6..e1e0c5e02 100644
--- a/test/unit.fromasm.no-opts
+++ b/test/unit.fromasm.no-opts
@@ -7,21 +7,21 @@
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (type $FUNCSIG$dd (func (param f64) (result f64)))
-  (import $t global "global" "NaN" f64)
-  (import $u global "global" "Infinity" f64)
-  (import $tempDoublePtr global "env" "tempDoublePtr" i32)
-  (import $n global "env" "gb" i32)
-  (import $setTempRet0 "env" "setTempRet0" (param i32) (result i32))
-  (import $abort "env" "abort" (param f64) (result f64))
-  (import $print "env" "print" (param i32))
-  (import $h "env" "h" (param i32))
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
-  (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
-  (import $memory memory "env" "memory")
-  (import $table table "env" "table")
-  (import $memoryBase global "env" "memoryBase" i32)
-  (import $tableBase global "env" "tableBase" i32)
+  (import "global" "NaN" (global $t f64))
+  (import "global" "Infinity" (global $u f64))
+  (import "env" "tempDoublePtr" (global $tempDoublePtr i32))
+  (import "env" "gb" (global $n i32))
+  (import "env" "setTempRet0" (func $setTempRet0 (param i32) (result i32)))
+  (import "env" "abort" (func $abort (param f64) (result f64)))
+  (import "env" "print" (func $print (param i32)))
+  (import "env" "h" (func $h (param i32)))
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
+  (import "asm2wasm" "i32u-div" (func $i32u-div (param i32 i32) (result i32)))
+  (import "env" "memory" (memory $memory))
+  (import "env" "table" (table $table))
+  (import "env" "memoryBase" (global $memoryBase i32))
+  (import "env" "tableBase" (global $tableBase i32))
   (export "big_negative" $big_negative)
   (export "pick" $exportMe)
   (global $Int i32 (i32.const 0))
diff --git a/test/unit.wast b/test/unit.wast
index ca0e811a9..748b62dab 100644
--- a/test/unit.wast
+++ b/test/unit.wast
@@ -9,9 +9,9 @@
   (type $5 (func (result i32)))
   (type $6 (func (param i32) (result i32)))
   (type $7 (func (param f64) (result f64)))
-  (import $_emscripten_asm_const_vi "env" "_emscripten_asm_const_vi")
-  (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
+  (import "env" "_emscripten_asm_const_vi" (func $_emscripten_asm_const_vi))
+  (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32)))
+  (import "asm2wasm" "f64-rem" (func $f64-rem (param f64 f64) (result f64)))
   (export "big_negative" $big_negative)
   (table 10 anyfunc)
   (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary
index 0e681de27..ad0f0786a 100644
--- a/test/unit.wast.fromBinary
+++ b/test/unit.wast.fromBinary
@@ -9,9 +9,9 @@
   (type $5 (func (result i32)))
   (type $6 (func (param i32) (result i32)))
   (type $7 (func (param f64) (result f64)))
-  (import $import$0 "env" "_emscripten_asm_const_vi")
-  (import $import$1 "asm2wasm" "f64-to-int" (param f64) (result i32))
-  (import $import$2 "asm2wasm" "f64-rem" (param f64 f64) (result f64))
+  (import "env" "_emscripten_asm_const_vi" (func $import$0))
+  (import "asm2wasm" "f64-to-int" (func $import$1 (param f64) (result i32)))
+  (import "asm2wasm" "f64-rem" (func $import$2 (param f64 f64) (result f64)))
   (export "big_negative" $big_negative)
   (table 10 anyfunc)
   (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)