Comments

WebAssembly · Jul 11, 2023 · dd2cf49 · dd2cf49
1 parent 6f6ff28
commit dd2cf49
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/document/core/syntax/types.rst b/document/core/syntax/types.rst
@@ -203,7 +203,7 @@ Convention
 .. note::
    This definition computes an approximation of the reference type that is inhabited by all values from :math:`\X{rt}_1` except those from :math:`\X{rt}_2`.
    Since the type system does not have general union types,
-   the defnition only affects the presence of null and cannot express the absence of other values.
+   the definition only affects the presence of null and cannot express the absence of other values.
 
 
 .. index:: ! value type, number type, vector type, reference type, ! bottom type

diff --git a/document/core/util/macros.def b/document/core/util/macros.def
@@ -226,7 +226,7 @@
 .. |TARRAY| mathdef:: \xref{syntax/types}{syntax-strtype}{\K{array}}
 .. |TSUB| mathdef:: \xref{syntax/types}{syntax-subtype}{\K{sub}}
 .. |TREC| mathdef:: \xref{syntax/types}{syntax-rectype}{\K{rec}}
-.. |TFINAL| mathdef:: \xref{syntax/types}{syntax-subtype}{\K{filan}}
+.. |TFINAL| mathdef:: \xref{syntax/types}{syntax-subtype}{\K{final}}
 
 .. |MVAR| mathdef:: \xref{syntax/types}{syntax-mut}{\K{var}}
 .. |MCONST| mathdef:: \xref{syntax/types}{syntax-mut}{\K{const}}

diff --git a/document/core/valid/instructions.rst b/document/core/valid/instructions.rst
@@ -252,7 +252,7 @@ Reference Instructions
 
 * The :ref:`reference type <syntax-reftype>` :math:`\X{rt}` must be :ref:`valid <valid-reftype>`.
 
-* Then the instruction is valid with type :math:`[\X{rt}'] \to [\I32]` for any :ref:`valid <valid-reftype>` :ref:`reference type <syntax-reftype>` :math:`\X{rt}'` that :ref:`matches <match-reftype>` :math:`\X{rt}`.
+* Then the instruction is valid with type :math:`[\X{rt}'] \to [\I32]` for any :ref:`valid <valid-reftype>` :ref:`reference type <syntax-reftype>` :math:`\X{rt}'` for which :math:`\X{rt}` :ref:`matches <match-reftype>` :math:`\X{rt}'`.
 
 .. math::
    \frac{
@@ -270,7 +270,7 @@ Reference Instructions
 
 * The :ref:`reference type <syntax-reftype>` :math:`\X{rt}` must be :ref:`valid <valid-reftype>`.
 
-* Then the instruction is valid with type :math:`[\X{rt}'] \to [\X{rt}]` for any :ref:`valid <valid-reftype>` :ref:`reference type <syntax-reftype>` :math:`\X{rt}'` that :ref:`matches <match-reftype>` :math:`\X{rt}`.
+* Then the instruction is valid with type :math:`[\X{rt}'] \to [\X{rt}]` for any :ref:`valid <valid-reftype>` :ref:`reference type <syntax-reftype>` :math:`\X{rt}'` for which :math:`\X{rt}` :ref:`matches <match-reftype>` :math:`\X{rt}'`.
 
 .. math::
    \frac{
@@ -579,7 +579,7 @@ Aggregate Reference Instructions
 
 .. math::
    \frac{
-     \expand(C.\CTYPES[x]) = \TSTRUCT~(\MVAR~\X{st})
+     \expand(C.\CTYPES[x]) = \TARRAY~(\MVAR~\X{st})
    }{
      C \vdashinstr \ARRAYSET~x : [(\REF~\NULL~x)~\I32~\unpacktype(\X{st})] \to []
    }

diff --git a/document/core/valid/modules.rst b/document/core/valid/modules.rst
@@ -515,7 +515,7 @@ Imports :math:`\import` and import descriptions :math:`\importdesc` are classifi
 
 .. math::
    \frac{
-     C.\CTYPES[x] = \TFUNC~\functype
+     \expand(C.\CTYPES[x]) = \TFUNC~\functype
    }{
      C \vdashimportdesc \IDFUNC~x : \ETFUNC~C.\CTYPES[x]
    }

diff --git a/document/core/valid/types.rst b/document/core/valid/types.rst
@@ -169,7 +169,7 @@ Block Types
 
 .. math::
    \frac{
-     C.\CTYPES[\typeidx] = \TFUNC~[t_1^\ast] \toF [t_2^\ast]
+     \expand(C.\CTYPES[\typeidx]) = \TFUNC~[t_1^\ast] \toF [t_2^\ast]
    }{
      C \vdashblocktype \typeidx : [t_1^\ast] \to [t_2^\ast]
    }