Updates per Rossberg's feedback

Author: bvisness

document/core/text/modules.rst

@@ -344,6 +344,7 @@ $${grammar: Tstart_}
 .. index:: import, name, tag type, global type, memory type, table type, function type
    pair: text format; import
 .. _text-import:
+.. _text-imports:
 
 Imports
 ~~~~~~~
@@ -356,7 +357,11 @@ $${grammar: Timport_/plain}
 Abbreviations
 .............
 
-As an abbreviation, imports may also be specified inline with
+Multiple imports with the same ${:nm_1} may be declared together:
+
+$${grammar: Timports_/abbrev}
+
+Imports may also be specified inline with
 :ref:`tag <text-tag>`,
 :ref:`global <text-global>`,
 :ref:`memory <text-mem>`,

document/core/util/macros.def

@@ -1072,6 +1072,7 @@
 .. |Tglobal| mathdef:: \xref{text/modules}{text-global}{\T{global}}
 .. |Ttag| mathdef:: \xref{text/modules}{text-tag}{\T{tag}}
 .. |Timport| mathdef:: \xref{text/modules}{text-import}{\T{import}}
+.. |Timports| mathdef:: \xref{text/modules}{text-imports}{\T{imports}}
 .. |Texport| mathdef:: \xref{text/modules}{text-export}{\T{export}}
 .. |Texternidx| mathdef:: \xref{text/modules}{text-externidx}{\T{externidx}}
 .. |Telem| mathdef:: \xref{text/modules}{text-elem}{\T{elem}}

specification/wasm-3.0/5.4-binary.modules.spectec

@@ -36,10 +36,10 @@ grammar Bimport : (name, externtype) =
 
 grammar Bimports : import* =
   | nm_1:Bname (nm_2, xt):Bimport => IMPORT nm_1 nm_2 xt
-  | 0x01 0xFF nm_1:Bname (nm_2, xt)*:Blist(Bimport) => $concat_(import, IMPORT nm_1 nm_2 xt)
+  | 0x01 0xFF nm_1:Bname (nm_2, xt)*:Blist(Bimport) => (IMPORT nm_1 nm_2 xt)*
 
 grammar Bimportsec : import* hint(desc "import section") =
-  | im*:Bsection_(2, Blist(Bimports)) => im*
+  | im**:Bsection_(2, Blist(Bimports)) => $concat_(import, im**)
 
 
 ;; Function section

specification/wasm-3.0/6.3-text.modules.spectec

@@ -130,37 +130,37 @@ grammar Tstart_(I) : (start, idctxt) =
 
 ;; Imports
 
-grammar Timport_(I)/plain : (name, externtype, idctxt) =
-  | "(" "item" nm_2:Tname (xt,I'):Texterntype_(I) ")" => (nm_2, xt, I')
-
-grammar Timports_(I)/plain : (import*, idctxt) =
-  | "(" "import" nm_1:Tname (nm_2,xt,I')*:Timport_(I)* ")" => ($concat_(import, IMPORT nm_1 nm_2 xt), I')
+grammar Timport_(I)/plain : (import, idctxt) =
+  | "(" "import" nm_1:Tname nm_2:Tname (xt,I'):Texterntype_(I) ")" => (IMPORT nm_1 nm_2 xt, I')
   | ...
 
-grammar Timports_(I)/abbrev-tag : (import*, idctxt) = ...
+grammar Timports_(I)/abbrev : (import*, idctxt) =
+  | "(" "import" nm_1:Tname ("(" "item" nm_2:Tname Texterntype_(I) ")")* ")" ==
+    ("(" "import" nm_1:Tname nm_2:Tname Texterntype_(I) ")")*
+
+grammar Timport_(I)/abbrev-tag : (import, idctxt) = ...
   | "(" "tag" Tid? "(" "import" Tname^2 ")" Ttagtype_(I) ")" ==
-    "(" "import" Tname "(" "item" Tname "(" "tag" Tid? Ttagtype_(I) ")" ")" ")"
+    "(" "import" Tname^2 "(" "tag" Tid? Ttagtype_(I) ")" ")"
   | ...
 
-grammar Timports_(I)/abbrev-global : (import*, idctxt) = ...
+grammar Timport_(I)/abbrev-global : (import, idctxt) = ...
   | "(" "global" Tid? "(" "import" Tname^2 ")" Tglobaltype_(I) ")" ==
-    "(" "import" Tname "(" "item" Tname "(" "global" Tid? Tglobaltype_(I) ")" ")" ")"
+    "(" "import" Tname^2 "(" "global" Tid? Tglobaltype_(I) ")" ")"
   | ...
 
-grammar Timports_(I)/abbrev-mem : (import*, idctxt) = ...
+grammar Timport_(I)/abbrev-mem : (import, idctxt) = ...
   | "(" "memory" Tid? "(" "import" Tname^2 ")" Tmemtype_(I) ")" ==
-    "(" "import" Tname "(" "item" Tname "(" "memory" Tid? Tmemtype_(I) ")" ")" ")"
+    "(" "import" Tname^2 "(" "memory" Tid? Tmemtype_(I) ")" ")"
   | ...
 
-grammar Timports_(I)/abbrev-table : (import*, idctxt) = ...
+grammar Timport_(I)/abbrev-table : (import, idctxt) = ...
   | "(" "table" Tid? "(" "import" Tname^2 ")" Ttabletype_(I) ")" ==
-    "(" "import" Tname "(" "item" Tname "(" "table" Tid? Ttabletype_(I) ")" ")" ")"
+    "(" "import" Tname^2 "(" "table" Tid? Ttabletype_(I) ")" ")"
   | ...
 
-grammar Timports_(I)/abbrev-func : (import*, idctxt) = ...
+grammar Timport_(I)/abbrev-func : (import, idctxt) = ...
   | "(" "func" Tid? "(" "import" Tname^2 ")" Ttypeuse_(I) ")" ==
-    "(" "import" Tname "(" "item" Tname "(" "func" Tid? Ttypeuse_(I) ")" ")" ")"
-
+    "(" "import" Tname^2 "(" "func" Tid? Ttypeuse_(I) ")" ")"
 
 ;; Exports
 
@@ -256,7 +256,7 @@ grammar Telemtable_(I)/abbrev : () hint(show Ttable_(%)) =
 ;; Modules
 
 syntax decl hint(name "declaration") =
-  type | import* | tag | global | mem | table | func | data | elem | start | export
+  type | import | tag | global | mem | table | func | data | elem | start | export
 
 def $typesd(decl*) : type*      hint(show $types(%))   hint(macro "typesd")
 def $importsd(decl*) : import*  hint(show $imports(%)) hint(macro "importsd")
@@ -323,7 +323,7 @@ def $ordered(decl_1* import decl_2*) =
 
 
 grammar Tdecl_(I) : (decl, idctxt) =
-  | Ttype_(I) | Timports_(I) | Ttag_(I) | Tglobal_(I) | Tmem_(I) | Ttable_(I)
+  | Ttype_(I) | Timport_(I) | Ttag_(I) | Tglobal_(I) | Tmem_(I) | Ttable_(I)
   | Tfunc_(I) | Tdata_(I) | Telem_(I) | Tstart_(I) | Texport_(I)