Skip to content

Commit 517034e

Browse files
committed
Fix typos in catch validation
1 parent 5c7c1d3 commit 517034e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

document/core/valid/instructions.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,7 +1972,7 @@ Control Instructions
19721972

19731973
* The tag :math:`C.\CTAGS[x]` must be defined in the context.
19741974

1975-
* Let :math:`[t^\ast] \to [{t'}^\ast]` be the :ref:`tag type <syntax-tagtype>` :math:`C.\CTAGS[x]`.
1975+
* Let :math:`[t^\ast] \to [{t'}^\ast]` be the :ref:`expansion <aux-expand-deftype>` of the :ref:`tag type <syntax-tagtype>` :math:`C.\CTAGS[x]`.
19761976

19771977
* The :ref:`result type <syntax-resulttype>` :math:`[{t'}^\ast]` must be empty.
19781978

@@ -1984,7 +1984,7 @@ Control Instructions
19841984

19851985
.. math::
19861986
\frac{
1987-
C.\CTAGS[x] = [t^\ast] \toF []
1987+
\expanddt(C.\CTAGS[x]) = [t^\ast] \toF []
19881988
\qquad
19891989
C.\CLABELS[l] = [t^\ast]
19901990
}{
@@ -1996,21 +1996,21 @@ Control Instructions
19961996

19971997
* The tag :math:`C.\CTAGS[x]` must be defined in the context.
19981998

1999-
* Let :math:`[t^\ast] \to [{t'}^\ast]` be the :ref:`tag type <syntax-tagtype>` :math:`C.\CTAGS[x]`.
1999+
* Let :math:`[t^\ast] \to [{t'}^\ast]` be the :ref:`expansion <aux-expand-deftype>` of the :ref:`tag type <syntax-tagtype>` :math:`C.\CTAGS[x]`.
20002000

20012001
* The :ref:`result type <syntax-resulttype>` :math:`[{t'}^\ast]` must be empty.
20022002

20032003
* The label :math:`C.\CLABELS[l]` must be defined in the context.
20042004

2005-
* The :ref:`result type <syntax-resulttype>` :math:`[t^\ast]` must be the same as :math:`C.\CLABELS[l]` with |EXNREF| appended.
2005+
* The :ref:`result type <syntax-resulttype>` :math:`[t^\ast~(\REF~\EXN)]` must :ref:`match <match-resulttype>` :math:`C.\CLABELS[l]`.
20062006

20072007
* Then the catch clause is valid.
20082008

20092009
.. math::
20102010
\frac{
2011-
C.\CTAGS[x] = [t^\ast] \toF []
2011+
\expanddt(C.\CTAGS[x]) = [t^\ast] \toF []
20122012
\qquad
2013-
C.\CLABELS[l] = [t^\ast~\EXNREF]
2013+
C \vdashresulttypematch [t^\ast~(\REF~\EXN)] \matchesresulttype C.\CLABELS[l]
20142014
}{
20152015
C \vdashcatch \CATCHREF~x~l \ok
20162016
}
@@ -2036,13 +2036,13 @@ Control Instructions
20362036

20372037
* The label :math:`C.\CLABELS[l]` must be defined in the context.
20382038

2039-
* The :ref:`result type <syntax-resulttype>` :math:`C.\CLABELS[l] must be :math:`[\EXNREF]`.
2039+
* The :ref:`result type <syntax-resulttype>` :math:`[(\REF~\EXN)]` must :ref:`match <match-resulttype>` :math:`C.\CLABELS[l]`.
20402040

20412041
* Then the catch clause is valid.
20422042

20432043
.. math::
20442044
\frac{
2045-
C.\CLABELS[l] = [\EXNREF]
2045+
C \vdashresulttypematch [(\REF~\EXN)] \matchesresulttype C.\CLABELS[l]
20462046
}{
20472047
C \vdashcatch \CATCHALLREF~l \ok
20482048
}

0 commit comments

Comments
 (0)