[spec] Fix memarg text format

Author: rossberg

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

@@ -175,7 +175,7 @@ grammar Tplaininstr_(I)/elem : instr = ...
 ;; Memory instructions
 
 grammar Tmemarg_(N) : memarg =
-  | n:Talign_(N) m:Toffset => {ALIGN n, OFFSET m}
+  | m:Toffset n:Talign_(N) => {ALIGN n, OFFSET m}
 
 grammar Toffset : u64 =
   | "offset=" m:Tu64 => m

specification/wasm-latest/6.3-text.instructions.spectec

@@ -175,7 +175,7 @@ grammar Tplaininstr_(I)/elem : instr = ...
 ;; Memory instructions
 
 grammar Tmemarg_(N) : memarg =
-  | n:Talign_(N) m:Toffset => {ALIGN n, OFFSET m}
+  | m:Toffset n:Talign_(N) => {ALIGN n, OFFSET m}
 
 grammar Toffset : u64 =
   | "offset=" m:Tu64 => m

spectec/test-frontend/TEST.md

@@ -11044,7 +11044,7 @@ grammar Toffset : u64
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tmemarg_(N : N) : memarg
   ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
-  prod{n : n, m : m} {{`%`_u32(n,):Talign_(N)} {`%`_u64(m,):Toffset}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
+  prod{n : n, m : m} {{`%`_u64(m,):Toffset} {`%`_u32(n,):Talign_(N)}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
 
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tplaininstr_(I : I) : instr

spectec/test-latex/TEST.md

@@ -13019,7 +13019,7 @@ $$
 
 $$
 \begin{array}[t]{@{}lrrl@{}l@{}l@{}l@{}}
-& {{\mathtt{memarg}}}_{N} & ::= & n{:}{{\mathtt{align}}}_{N}~~m{:}{\mathtt{offset}} & \quad\Rightarrow\quad{} & \{ \mathsf{align}~n,\;\allowbreak \mathsf{offset}~m \} \\
+& {{\mathtt{memarg}}}_{N} & ::= & m{:}{\mathtt{offset}}~~n{:}{{\mathtt{align}}}_{N} & \quad\Rightarrow\quad{} & \{ \mathsf{align}~n,\;\allowbreak \mathsf{offset}~m \} \\
 & {\mathtt{offset}} & ::= & \mbox{‘\texttt{offset{=}}’}~~m{:}{\mathtt{u64}} & \quad\Rightarrow\quad{} & m \\
 & & | & \epsilon & \quad\Rightarrow\quad{} & 0 \\
 & {{\mathtt{align}}}_{N} & ::= & \mbox{‘\texttt{align{=}}’}~~m{:}{\mathtt{u64}} & \quad\Rightarrow\quad{} & n & \quad \mbox{if}~ m = {2^{n}} \\

spectec/test-middlend/TEST.md

@@ -10567,7 +10567,7 @@ grammar Toffset : u64
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tmemarg_(N : N) : memarg
   ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
-  prod{n : n, m : m} {{`%`_u32(n,):Talign_(N)} {`%`_u64(m,):Toffset}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
+  prod{n : n, m : m} {{`%`_u64(m,):Toffset} {`%`_u32(n,):Talign_(N)}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
 
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tplaininstr_(I : I) : instr
@@ -22436,7 +22436,7 @@ grammar Toffset : u64
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tmemarg_(N : N) : memarg
   ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
-  prod{n : n, m : m} {{`%`_u32(n,):Talign_(N)} {`%`_u64(m,):Toffset}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
+  prod{n : n, m : m} {{`%`_u64(m,):Toffset} {`%`_u32(n,):Talign_(N)}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
 
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tplaininstr_(I : I) : instr
@@ -34543,7 +34543,7 @@ grammar Toffset : u64
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tmemarg_(N : N) : memarg
   ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
-  prod{n : n, m : m} {{`%`_u32(n,):Talign_(N)} {`%`_u64(m,):Toffset}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
+  prod{n : n, m : m} {{`%`_u64(m,):Toffset} {`%`_u32(n,):Talign_(N)}} => {ALIGN `%`_u32(n,), OFFSET `%`_u64(m,)}
 
 ;; ../../../../specification/wasm-latest/6.3-text.instructions.spectec
 grammar Tplaininstr_(I : I) : instr