.

document/core/exec/instructions.rst

@@ -975,7 +975,7 @@ See :ref:`above <exec-atomic-store>`.
 .. math::
    \begin{array}{l}
    \begin{array}{lcl@{\qquad}l}
-   F; (\I64.\CONST~k)~(\K{i}{N}.\CONST~c)~(\I32.\CONST~i)~\MEMORYATOMICWAIT{N}
+   F; (\I64.\CONST~k)~(\iN.\CONST~c)~(\I32.\CONST~i)~\MEMORYATOMICWAIT{N}
      &\stepto^{(\ARD~a.\LLEN~n)~(\ARD~a.\LDATA[i]~b^{N})}&
      F; (\WAITX~a.\LDATA[i])
    \end{array}
@@ -987,7 +987,7 @@ See :ref:`above <exec-atomic-store>`.
      \end{array}
    \\[1ex]
    \begin{array}{lcl@{\qquad}l}
-   F; (\I64.\CONST~k)~(\K{i}{N}.\CONST~c)~(\I32.\CONST~i)~\MEMORYATOMICWAIT{N}
+   F; (\I64.\CONST~k)~(\iN.\CONST~c)~(\I32.\CONST~i)~\MEMORYATOMICWAIT{N}
      &\stepto^{(\ARD~a.\LLEN~n)~(\ARD~a.\LDATA[i]~b^{N})}&
      F; (\I32.\CONST~1)
    \end{array}
@@ -999,7 +999,7 @@ See :ref:`above <exec-atomic-store>`.
      \end{array}
    \\[1ex]
    \begin{array}{lcl@{\qquad}l}
-   F; (\I64.\CONST~k)~(\K{i}{N}.\CONST~c)~(\I32.\CONST~i)~\MEMORYATOMICWAIT{N}
+   F; (\I64.\CONST~k)~(\iN.\CONST~c)~(\I32.\CONST~i)~\MEMORYATOMICWAIT{N}
      &\stepto^{(\ARD~a.\LLEN~n)}&
      F; \TRAP
    \end{array}

interpreter/text/lexer.mll

@@ -154,12 +154,12 @@ let string = '"' character* '"'
 let name = '$' (letter | digit | '_' | symbol)+
 let reserved = ([^'\"''('')'';'] # space)+  (* hack for table size *)
 
-let nn = ("32" | "64")
-let ixx = "i" ("32" | "64")
-let fxx = "f" ("32" | "64")
+let xx = "32" | "64"
+let ixx = "i" xx
+let fxx = "f" xx
 let nxx = ixx | fxx
 let mixx = "i" ("8" | "16" | "32" | "64")
-let mfxx = "f" ("32" | "64")
+let mfxx = "f" xx
 let sign = "s" | "u"
 let mem_size = "8" | "16" | "32"
 let rmw = "add" | "sub" | "and" | "or" | "xor" | "xchg"
@@ -254,7 +254,7 @@ rule token = parse
 
   | "memory.atomic.notify"
     { MEMORY_ATOMIC_NOTIFY (fun a o -> (memory_atomic_notify (opt a 2)) o) }
-  | "memory.atomic.wait"(nn as sz)
+  | "memory.atomic.wait"(xx as sz)
     { MEMORY_ATOMIC_WAIT (fun a o ->
         intop ("i" ^ sz)
           (memory_atomic_wait32 (opt a 2))