Apply suggestions from code review and email communication.

In particular:
- Switched to
    handler ::= (tagaddr? instr*)* | labelidx
    exn ::= tagaddr val*
    instr ::= … | handler_n{handler} instr* end | caught_n{exn} instr* end
  removing DELEGATEadm
- Changed prose to just push and pop handlers and exceptions, in the runtime,
  in the execution steps of the instructions, in the formal overview,
  and partly in appendix/properties.

Not done:
- Did not change the notation and prose for CAUGHTadm
  in appendix/properties.rst, this will be done in PR WebAssembly#244.

Author: ioannad

document/core/appendix/properties.rst

@@ -606,65 +606,65 @@ To that end, all previous typing judgements :math:`C \vdash \X{prop}` are genera
    }
 
 
-.. index:: catch, throw context
+.. index:: handler, throw context
 
-:math:`\CATCHadm\{\tagaddr^?~\instr_1^\ast\}^\ast~\instr_2^\ast~\END`
-.....................................................................
+:math:`\HANDLERadm_n\{(\tagaddr^?~\instr_1^\ast)^\ast\}~\instr_2^\ast~\END`
+...........................................................................
 
 * Let :math:`C'` be the same :ref:`context <context>` as :math:`C`, but with the :ref:`label type <syntax-labeltype>` :math:`[t_2^\ast]` prepended to the |CLABELS| vector.
 
 * Under context :math:`C'`,
-  the instruction sequence :math:`\instr_2^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[] \to [t_2^\ast]`.
+  the instruction sequence :math:`\instr_2^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[] \to [t_2^n]`.
 
-* Let :math:`C''` be the same :ref:`context <context>` as :math:`C`, but with the :ref:`label type <syntax-labeltype>` :math:`(\LCATCH~[t_2^\ast])` prepended to the |CLABELS| vector.
+* Let :math:`C''` be the same :ref:`context <context>` as :math:`C`, but with the :ref:`label type <syntax-labeltype>` :math:`(\LCATCH~[t_2^n])` prepended to the |CLABELS| vector.
 
 * Under context :math:`C''`,
   for every :math:`\tagaddr^?` and associated instruction sequence :math:`\instr_1^\ast`:
 
-  * If :math:`\tagaddr^? = \epsilon`, then :math:`\instr_1^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[] \to [t_2^\ast]`.
+  * If :math:`\tagaddr^? = \epsilon`, then :math:`\instr_1^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[] \to [t_2^n]`.
 
   * Else:
 
     * The :ref:`external tag value <syntax-externval>` :math:`\EVTAG~\tagaddr` must be :ref:`valid <valid-externval-tag>` with some :ref:`external tag type <syntax-externtype>` :math:`\ETTAG~[t_1^\ast] \to []`.
 
-    * The instruction sequence :math:`\instr_1^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[t_1^\ast] \to [t_2^\ast]`.
+    * The instruction sequence :math:`\instr_1^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[t_1^\ast] \to [t_2^n]`.
 
-* Then the compound instruction is valid under context :math:`C'` with type :math:`[] \to [t_2^\ast]`.
+* Then the compound instruction is valid under context :math:`C'` with type :math:`[] \to [t_2^n]`.
 
 .. math::
    \frac{
      \begin{array}{@{}c@{}}
      ((S \vdashexternval \EVTAG~\tagaddr : \ETTAG~[t_1^\ast]\to[])^? \\
-     ~~S; C,\CLABELS\,(\LCATCH~[t_2^\ast]) \vdashinstrseq \instr_1^\ast : [(t_1^\ast)^?] \to [t_2^\ast])^\ast \\
-     S; C,\CLABELS\,[t_2^\ast] \vdashinstrseq \instr_2^\ast : [] \to [t_2^\ast] \\
+     ~~S; C,\CLABELS\,(\LCATCH~[t_2^n]) \vdashinstrseq \instr_1^\ast : [(t_1^\ast)^?] \to [t_2^n])^\ast \\
+     S; C,\CLABELS\,[t_2^n] \vdashinstrseq \instr_2^\ast : [] \to [t_2^n] \\
    \end{array}
    }{
-     S; C,\CLABELS\,[t_2^\ast] \vdashadmininstr \CATCHadm\{\tagaddr^?~{\instr_1}^\ast\}^\ast~\instr_2^\ast~\END : [] \to [t_2^\ast]
+     S; C,\CLABELS\,[t_2^n] \vdashadmininstr \HANDLERadm_n\{(\tagaddr^?~{\instr_1}^\ast)^\ast\}~\instr_2^\ast~\END : [] \to [t_2^n]
    }
 
 
-.. index:: delegate, throw context
-.. _valid-delegate-admin:
+.. index:: handler, throw context
+.. _valid-handleradm:
 
-:math:`\DELEGATEadm\{l\}~\instr^\ast~\END`
-..........................................
+:math:`\HANDLERadm_n\{l\}~\instr^\ast~\END`
+...........................................
 
 * The label :math:`C.\CLABELS[l]` must be defined in the context.
 
 * Let :math:`C'` be the same :ref:`context <context>` as :math:`C`, but with the label :math:`[t^\ast]` prepended to the |CLABELS| vector.
 
 * Under context :math:`C'`,
-  the instruction sequence :math:`\instr^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[]\to[t^\ast]`.
+  the instruction sequence :math:`\instr^\ast` must be :ref:`valid <valid-instr-seq>` with type :math:`[]\to[t^n]`.
 
-* Then the compound instruction is valid under context :math:`C'` with type :math:`[] \to [t^\ast]`.
+* Then the compound instruction is valid under context :math:`C'` with type :math:`[] \to [t^n]`.
 
 .. math::
    \frac{
-     S; C,\CLABELS\,[t^\ast] \vdashinstrseq \instr^\ast : [] \to [t^\ast]
+     S; C,\CLABELS\,[t^n] \vdashinstrseq \instr^\ast : [] \to [t^n]
      \qquad
      C.\CLABELS[l] = [t_0^\ast]
    }{
-     S; C,\CLABELS\,[t^\ast] \vdashadmininstr \DELEGATEadm\{l\}~\instr^\ast~\END : [] \to [t^\ast]
+     S; C,\CLABELS\,[t^n] \vdashadmininstr \HANDLERadm_n\{l\}~\instr^\ast~\END : [] \to [t^n]
    }
 
 

document/core/exec/instructions.rst

@@ -2643,26 +2643,26 @@ Control Instructions
 
    b. Let :math:`a_i` be the tag address :math:`F.\AMODULE.\MITAGS[x_i]`.
 
-   c. Let :math:`H_i` be the handler clause :math:`\{a_i~\instr_{2i}^\ast\}`.
+   c. Let :math:`H_i` be the handler :math:`(a_i~\instr_{2i}^\ast)`.
 
 8. If there is a catch all clause :math:`(\CATCHALL~\instr_3^\ast)`, then:
 
-    a. Let :math:`H'^?` be the handler clause :math:`\{\epsilon~\instr_3^\ast\}`.
+    a. Let :math:`H'^?` be the handler :math:`(\epsilon~\instr_3^\ast)`.
 
 9. Else:
 
-    a. Let :math:`H'^?` be the empty handler clause :math:`\epsilon`.
+    a. Let :math:`H'^?` be the empty handler :math:`\epsilon`.
 
-10. Let :math:`H^\ast` be the :ref:`catching exception handler <syntax-handler>` containing the concatenation of the handler clauses :math:`H_i` and :math:`H'^?`.
+10. Let :math:`H^\ast` be the concatenation of :math:`H_i` and :math:`H'^?`.
 
-11. :ref:`Enter <exec-handler-enter>` the block :math:`\val^m~\instr_1^\ast` with label :math:`L` and exception handler :math:`H`.
+11. :ref:`Enter <exec-handler-enter>` the block :math:`\val^m~\instr_1^\ast` with label :math:`L` and exception handler :math:`H^\ast`.
 
 .. math::
    ~\\[-1ex]
    \begin{array}{l}
    F; \val^m~(\TRY~\X{bt}~\instr_1^\ast~(\CATCH~x~\instr_2^\ast)^\ast~(\CATCHALL~\instr_3^\ast)^?~\END
    \quad \stepto \\
-   \qquad F; \LABEL_n\{\epsilon\}~(\CATCHadm\{a_x~\instr_2^\ast\}^\ast\{\epsilon~\instr_3\ast\}^?~\val^m~\instr_1^\ast~\END)~\END \\
+   \qquad F; \LABEL_n\{\epsilon\}~(\HANDLERadm_n\{(a_x~\instr_2^\ast)^\ast~(\epsilon~\instr_3^\ast)^?\}~\val^m~\instr_1^\ast~\END)~\END \\
    (\iff \expand_F(\X{bt}) = [t_1^m] \to [t_2^n] \land (F.\AMODULE.\MITAGS[x]=a_x)^\ast)
    \end{array}
 
@@ -2678,21 +2678,19 @@ Control Instructions
 
 3. Let :math:`L` be the label whose arity is :math:`n` and whose continuation is the end of the |TRY| instruction.
 
-4. Let :math:`H` be the :ref:`delegating exception handler <syntax-handler>` :math:`\DELEGATEadm\{l\}`, targeting the :math:`l`-th surrounding block.
+4. Let :math:`H` be the :ref:`exception handler <syntax-handler>` :math:`l`, targeting the :math:`l`-th surrounding block.
 
 5. Assert: due to :ref:`validation <valid-try-delegate>`, there are at least :math:`m` values on the top of the stack.
 
 6. Pop the values :math:`\val^m` from the stack.
 
-7. :ref:`Enter <exec-instr-seq-enter>` the block :math:`H~(\val^n~\instr^\ast)~\END` with label :math:`L`.
-
-8. :ref:`Install <exec-handler-enter>` the exception handler `H` containing :math:`\val^m~\instr^\ast`.
+7. :ref:`Enter <exec-handler-enter>` the block :math:`\val^m~\instr^\ast` with label :math:`L` and  exception handler `H`.
 
 .. math::
    ~\\[-1ex]
    \begin{array}{lcl}
    F; \val^m~(\TRY~\X{bt}~\instr^\ast~\DELEGATE~l) &\stepto&
-   F; \LABEL_n\{\epsilon\}~(\DELEGATEadm\{l\}~\val^m~\instr^\ast~\END)~\END \\
+   F; \LABEL_n\{\epsilon\}~(\HANDLERadm_n\{l\}~\val^m~\instr^\ast~\END)~\END \\
    && (\iff \expand_F(\X{bt}) = [t_1^m] \to [t_2^n])
    \end{array}
 
@@ -2728,8 +2726,8 @@ Control Instructions
 .. math::
    ~\\[-1ex]
    \begin{array}{lclr@{\qquad}}
-   \CAUGHTadm\{a~\val^n\}~\XB^l[\RETHROW~l]~\END &\stepto&
-   \CAUGHTadm\{a~\val^n\}~\XB^l[\val^n~(\THROWadm~a)]~\END \\
+   \CAUGHTadm_n\{a~\val^n\}~\XB^l[\RETHROW~l]~\END &\stepto&
+   \CAUGHTadm_n\{a~\val^n\}~\XB^l[\val^n~(\THROWadm~a)]~\END \\
    \end{array}
 
 
@@ -3053,8 +3051,7 @@ When the end of a :ref:`try <syntax-try>` instruction is reached without a jump,
 .. math::
    ~\\[-1ex]
    \begin{array}{lcl@{\qquad}l}
-   \CATCHadm\{a^?~\instr^\ast\}^\ast~\val^m~\END &\stepto& \val^m \\
-   \DELEGATEadm\{l\}~\val^m~\END &\stepto& \val^m
+   \HANDLERadm_m\{\handler\}~\val^m~\END &\stepto& \val^m \\
    \end{array}
 
 
@@ -3067,7 +3064,7 @@ When a throw occurs, then values, labels, active catch clauses,
 and call frames are popped if necessary, until an appropriate exception handler is found
 on the top of the stack.
 
- 1. Assert: due to :ref:`validation <valid-throw>`,, :math:`S.\STAGS[a]` exists.
+ 1. Assert: due to :ref:`validation <valid-throw>`, :math:`S.\STAGS[a]` exists.
 
  2. Let :math:`[t^n] \to []` be the :ref:`tag type <syntax-tagtype>` :math:`S.\STAGS[a].\TAGITYPE`.
 
@@ -3079,126 +3076,112 @@ on the top of the stack.
 
     a. Pop the top element from the stack.
 
- 6. Assert: The stack is now either empty, or there is an exception handler on the top of the stack.
+ 6. Assert: the stack is now either empty, or there is an exception handler on the top of the stack.
 
  7. If the stack is empty, then:
 
-    a. Return the uncaught exception :math:`\val^n~(\THROWadm~a)` as a result.
-
-8. Else:
+    a. Return the uncaught exception :math:`\val^n~(\THROWadm~a)` as a :ref:`result <syntax-result>`.
 
-   a. Assert: there is an :ref:`exception handler <syntax-handler>` :math:`H` on the top of the stack.
+8. Else assert: there is an :ref:`exception handler <syntax-handler>` :math:`H` on the top of the stack.
 
 9. Pop the exception handler :math:`H` from the stack.
 
-10. Assert: :math:`H` is either of the a catching or a delegating :ref:`exception handler <syntax-handler>`.
-
-11. If :math:`H` is a catching exception handler, let :math:`\{a^?~\instr^\ast\}^k` be its clauses. Then:
-
-    a. If :math:`k = 0`, then:
-
-       i. Put the values :math:`\val^n` back onto the stack.
-
-       ii. :ref:`Throw <exec-throwadm>` an exception with tag address :math:`a`.
-
-    b. Else :math:`H`'s clauses are of the form :math:`\{a_1^?~\instr^\ast\}\{a'^?~\instr'^\ast\}^\ast`.
+10. If :math:`H` is list of handlers, then:
 
-    c. If :math:`a_1^? = \epsilon`, then:
+    a. While :math:`H` is not empty, do:
 
-       i. :ref:`Enter <exec-caughtadm-enter>` :math:`\instr^\ast` with catch clause holding the caught exception :math:`\{a~\val^n\}`.
+       i. Let :math:`(a_1^?~\instr^\ast)` be the first handler in :math:`H`.
 
-    d. Else if :math:`a_1^? = a`, then:
+       ii. If :math:`a_1^? = \epsilon`, then:
 
-       i. :ref:`Enter <exec-caughtadm-enter>` :math:`\val^n~\instr^\ast` with catch clause holding the caught exception :math:`\{a~\val^n\}`.
+           * :ref:`Enter <exec-caughtadm-enter>` the block :math:`\instr^\ast` with caught exception :math:`a~\val^n`.
 
-    e. Else:
+       iii. Else if :math:`a_1^? = a`, then:
 
-       i. Let :math:`H'` be the catching exception handler with clauses :math:`\{a'^?~\instr'^\ast\}^\ast`.
+            * :ref:`Enter <exec-caughtadm-enter>` the block :math:`\val^n~\instr^\ast` with caught exception :math:`a~\val^n`.
 
-       ii. Repeat step 11 for :math:`H'`.
+       iv. Else, pop the first handler from :math:`H`.
 
-12. Else:
+    b. Else, the exception was not caught by :math:`H`:
 
-    a. Assert: :math:`H` is a delegating exception handler.
+       i. Put the values :math:`\val^n` back onto the stack.
 
-13. Let :math:`l` be the label index of :math:`H`.
+       ii. :ref:`Throw <exec-throwadm>` an exception with tag address :math:`a`.
 
-14. Assert: due to :ref:`validation <valid-delegate-admin>`, the stack contains at least :math:`l` labels.
+11. Else :math:`H` is a label index :math:`l`.
 
-15. Let :math:`L` be the :math:`l`-th label appearing on the stack, starting from the top and counting from zero.
+    a. Assert: due to :ref:`validation <valid-handleradm>`, the stack contains at least :math:`l` labels.
 
-15. Repeat :math:`l` times:
+    b. Repeat :math:`l` times:
 
-   a. While the top of the stack is not a label, do:
+       i. While the top of the stack is not a label, do:
 
-       i. Pop the top element from the stack.
+          * Pop the top element from the stack.
 
-   b. Assert: due to :ref:`validation <valid-delegate-admin>`, the top of the stack now is a label.
+    c. Assert: due to :ref:`validation <valid-handleradm>`, the top of the stack now is a label.
 
-   c. Pop the label from the stack.
+    d. Pop the label from the stack.
 
-16. Push the values :math:`\val^n` onto the stack.
+    e. Push the values :math:`\val^n` onto the stack.
 
-17. :ref:`Throw <exec-throwadm>` an exception with tag address :math:`a`.
+    f. :ref:`Throw <exec-throwadm>` an exception with tag address :math:`a`.
 
 .. math::
    \begin{array}{rcl}
-   \CATCHadm~\XT[\val^n~(\THROWadm~a)]~\END &\stepto&
-   \XT[\val^n~(\THROWadm~a)] \\
-   \CATCHadm\{a_1^?~\instr^\ast\}\{a'^?~\instr'^\ast\}^\ast~\XT[\val^n~(\THROWadm~a)]~\END &\stepto&
-   \CATCHadm\{a'^?~\instr'^\ast\}^\ast~\XT[\val^n~(\THROWadm~a)]~\END  \\
+   \HANDLERadm_n\{\}~\XT[(\THROWadm~a)]~\END &\stepto&
+   \XT[(\THROWadm~a)] \\
+   \HANDLERadm_n\{(a_1^?~\instr^\ast)~(a'^?~\instr'^\ast)^\ast\}~\XT[(\THROWadm~a)]~\END &\stepto&
+   \HANDLERadm_n\{(a'^?~\instr'^\ast)^\ast~\XT[(\THROWadm~a)]~\END  \\
    && (\iff a_1^? \neq \epsilon \land a_1^? \neq a) \\
-   S;~\CATCHadm\{a_1^?~\instr^\ast\}\{a'^?~\instr'^\ast\}^\ast~\XT[\val^n~(\THROWadm~a)]~\END &\stepto&
-   S;~\CAUGHTadm\{a~\val^n\}~(\val^n)^?~\instr^\ast~\END \\
+   S;~\HANDLERadm_n\{(a_1^?~\instr^\ast)~(a'^?~\instr'^\ast)^\ast\}~\XT[\val^n~(\THROWadm~a)]~\END &\stepto&
+   S;~\CAUGHTadm_n\{a~\val^n\}~(\val^n)^?~\instr^\ast~\END \\
    && (\iff~(a_1^? = \epsilon \lor a_1^? = a)~\land\\
    && \ S.\STAGS[a].\TAGITYPE = [t^n]\to[]) \\
-   \LABEL_n\{\}~\XB^l[\DELEGATEadm\{l\}~\XT[\val^n~(\THROWadm~a)]~\END]~\END &\stepto&
-   \XT[\val^n~(\THROWadm~a)]  \\
+   \LABEL_n\{\}~\XB^l[\HANDLERadm_n\{l\}~\XT[(\THROWadm~a)]~\END]~\END &\stepto&
+   \XT[(\THROWadm~a)]  \\
    \end{array}
 
 .. note::
-   The reduction step entering a catch clause |CAUGHTadm| is the only one that does not preserve the throw context.
-
-.. todo::
-   Explain why or what's the meaning of apparently preserving the throw context in the other rules.
+   The rules are formulated in this way to allow looking up the exception values in the throw context,
+   only when a thrown exception is caught.
 
 
 .. _exec-caughtadm-enter:
 
-Entering :math:`\instr^\ast` with catch clause holding a caught exception :math:`\{a~\val^n\}`
-..............................................................................................
+Entering :math:`\instr^\ast` with caught exception :math:`\{\exn\}`
+...................................................................
 
-1. Push :math:`\CAUGHTadm\{a~\val^n\}` onto the stack.
+1. Push the caught exception |exn| onto the stack.
 
 2. Jump to the start of the instruction sequence :math:`\instr^\ast`.
 
 
-.. _exec-caughtadm:
+.. _exec-caughtadm-exit:
 
-Exiting a catch clause
-......................
+Exiting a block with a caught exception
+.......................................
 
-When the |END| of a catch clause is reached without a jump, exception, or trap, then the following steps are performed.
+When the |END| of a block with a caught exception is reached without a jump, thrown exception, or trap, then the following steps are performed.
 
-1. Let :math:`\val^\ast` be the values on the top of the stack.
+1. Let :math:`\val^m` be the values on the top of the stack.
 
-2. Pop the values :math:`\val^\ast` from the stack.
+2. Pop the values :math:`\val^m` from the stack.
 
-3. Assert: due to :ref:`validation <valid-instr-seq>`, a caught exception :math:`\{a~\val_0^\ast\}` is now on the top of the stack.
+3. Assert: due to :ref:`validation <valid-caughtadm>`, a caught exception is now on the top of the stack.
 
 4. Pop the caught exception from the stack.
 
-5. Push :math:`\val^\ast` back to the stack.
+5. Push :math:`\val^m` back to the stack.
 
-6. Jump to the position after the |END| of the administrative instruction associated with the catch clause.
+6. Jump to the position after the |END| of the administrative instruction associated with the caught exception.
 
 .. math::
    \begin{array}{rcl}
-   \CAUGHTadm\{a~\val_0^\ast\}~\val^\ast~\END  &\stepto& \val^\ast
+   \CAUGHTadm_n\{\exn\}~\val^m~\END  &\stepto& \val^m
    \end{array}
 
 .. note::
-   An exception can only be rethrown from the scope of the |CAUGHTadm| administrative instruction holding it, i.e., from the scope of the |CATCH| or |CATCHALL| block of a :ref:`try-catch <syntax-try-catch>` instruction that caught it. Upon exit from a |CAUGHTadm|, the exception it holds is discarded.
+   A caught exception can only be rethrown from the scope of the administrative instruction associated with it, i.e., from the scope of the |CATCH| or |CATCHALL| block of a :ref:`try-catch <syntax-try-catch>` instruction that caught it. Upon exit from that block, the caught exception is discarded.
 
 
 .. index:: ! call, function, function instance, label, frame