4230

2 files changed, 47 insertions, 51 deletions

diff --git a/exception2.mu b/exception2.mu
index abe3ebbc..48179dc2 100644
--- a/exception2.mu
+++ b/exception2.mu
@@ -13,9 +13,7 @@ exclusive-container error-or:_elem [
 
 def main [
   local-scope
-  no-exception:bool <- copy 0/false
   foo 0/no-exception
-  raise-exception:bool <- copy 1/true
   foo 1/raise-exception
 ]
 
diff --git a/html/exception2.mu.html b/html/exception2.mu.html
index 520c9927..50dede52 100644
--- a/html/exception2.mu.html
+++ b/html/exception2.mu.html
@@ -73,55 +73,53 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span>
 <span id="L14" class="LineNr">14 </span><span class="muRecipe">def</span> <a href='exception2.mu.html#L14'>main</a> [
 <span id="L15" class="LineNr">15 </span>  <span class="Constant">local-scope</span>
-<span id="L16" class="LineNr">16 </span>  no-exception:bool <span class="Special">&lt;-</span> copy <span class="Constant">0/false</span>
-<span id="L17" class="LineNr">17 </span>  <a href='exception2.mu.html#L23'>foo</a> <span class="Constant">0/no-exception</span>
-<span id="L18" class="LineNr">18 </span>  raise-exception:bool <span class="Special">&lt;-</span> copy <span class="Constant">1/true</span>
-<span id="L19" class="LineNr">19 </span>  <a href='exception2.mu.html#L23'>foo</a> <span class="Constant">1/raise-exception</span>
-<span id="L20" class="LineNr">20 </span>]
-<span id="L21" class="LineNr">21 </span>
-<span id="L22" class="LineNr">22 </span><span class="Comment"># example showing exception handling</span>
-<span id="L23" class="LineNr">23 </span><span class="muRecipe">def</span> <a href='exception2.mu.html#L23'>foo</a> raise-exception?:bool [
-<span id="L24" class="LineNr">24 </span>  <span class="Constant">local-scope</span>
-<span id="L25" class="LineNr">25 </span>  <span class="Constant">load-inputs</span>
-<span id="L26" class="LineNr">26 </span>  <span class="Comment"># To run an instruction of the form:</span>
-<span id="L27" class="LineNr">27 </span>  <span class="Comment">#   try f ...</span>
-<span id="L28" class="LineNr">28 </span>  <span class="Comment"># write this:</span>
-<span id="L29" class="LineNr">29 </span>  <span class="Comment">#   call-with-continuation-mark 999/exception-tag, f, ...</span>
-<span id="L30" class="LineNr">30 </span>  <span class="Comment"># By convention we reserve tag 999 for exceptions.</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Comment">#</span>
-<span id="L32" class="LineNr">32 </span>  <span class="Comment"># The other inputs and outputs to 'call-with-continuation-mark' depend on</span>
-<span id="L33" class="LineNr">33 </span>  <span class="Comment"># the function it is called with.</span>
-<span id="L34" class="LineNr">34 </span>  _, result:<a href='exception2.mu.html#L9'>error-or</a>:num <span class="Special">&lt;-</span> <span class="muControl">call-with-continuation-mark</span> <span class="Constant">999/exception-tag</span>, <a href='exception2.mu.html#L49'>f</a>, raise-exception?
-<span id="L35" class="LineNr">35 </span>  <span class="Delimiter">{</span>
-<span id="L36" class="LineNr">36 </span>    val:num, normal-exit?:bool <span class="Special">&lt;-</span> maybe-convert result, <span class="Constant">value:variant</span>
-<span id="L37" class="LineNr">37 </span>    <span class="muControl">break-unless</span> normal-exit?
-<span id="L38" class="LineNr">38 </span>    $print <span class="Constant">[normal exit; result ]</span> val <span class="Constant">10/newline</span>
-<span id="L39" class="LineNr">39 </span>  <span class="Delimiter">}</span>
-<span id="L40" class="LineNr">40 </span>  <span class="Delimiter">{</span>
-<span id="L41" class="LineNr">41 </span>    err:text, error-exit?:bool <span class="Special">&lt;-</span> maybe-convert result, <span class="Constant">error:variant</span>
-<span id="L42" class="LineNr">42 </span>    <span class="muControl">break-unless</span> error-exit?
-<span id="L43" class="LineNr">43 </span>    $print <span class="Constant">[error caught: ]</span> err <span class="Constant">10/newline</span>
-<span id="L44" class="LineNr">44 </span>  <span class="Delimiter">}</span>
-<span id="L45" class="LineNr">45 </span>]
-<span id="L46" class="LineNr">46 </span>
-<span id="L47" class="LineNr">47 </span><span class="Comment"># Callee function that we catch exceptions in must always return using a</span>
-<span id="L48" class="LineNr">48 </span><span class="Comment"># continuation.</span>
-<span id="L49" class="LineNr">49 </span><span class="muRecipe">def</span> <a href='exception2.mu.html#L49'>f</a> raise-exception?:bool<span class="muRecipe"> -&gt; </span>result:<a href='exception2.mu.html#L9'>error-or</a>:num [
-<span id="L50" class="LineNr">50 </span>  <span class="Constant">local-scope</span>
-<span id="L51" class="LineNr">51 </span>  <span class="Constant">load-inputs</span>
-<span id="L52" class="LineNr">52 </span>  <span class="Delimiter">{</span>
-<span id="L53" class="LineNr">53 </span>    <span class="muControl">break-unless</span> raise-exception?
-<span id="L54" class="LineNr">54 </span>    <span class="Comment"># throw/raise</span>
-<span id="L55" class="LineNr">55 </span>    result <span class="Special">&lt;-</span> merge <span class="Constant">0/error</span>, <span class="Constant">[error will robinson!]</span>
-<span id="L56" class="LineNr">56 </span>    <span class="muControl">return-continuation-until-mark</span> <span class="Constant">999/exception-tag</span>, result
-<span id="L57" class="LineNr">57 </span>  <span class="Delimiter">}</span>
-<span id="L58" class="LineNr">58 </span>  <span class="Comment"># 'normal' return; still uses the continuation mark</span>
-<span id="L59" class="LineNr">59 </span>  result <span class="Special">&lt;-</span> merge <span class="Constant">1/value</span>,<span class="Constant"> 34</span>
-<span id="L60" class="LineNr">60 </span>  <span class="muControl">return-continuation-until-mark</span> <span class="Constant">999/exception-tag</span>, result
-<span id="L61" class="LineNr">61 </span>  <span class="Comment"># dead code just to avoid errors</span>
-<span id="L62" class="LineNr">62 </span>  result <span class="Special">&lt;-</span> merge <span class="Constant">1/value</span>,<span class="Constant"> 0</span>
-<span id="L63" class="LineNr">63 </span> <span class="muControl"> return</span> result
-<span id="L64" class="LineNr">64 </span>]
+<span id="L16" class="LineNr">16 </span>  <a href='exception2.mu.html#L21'>foo</a> <span class="Constant">0/no-exception</span>
+<span id="L17" class="LineNr">17 </span>  <a href='exception2.mu.html#L21'>foo</a> <span class="Constant">1/raise-exception</span>
+<span id="L18" class="LineNr">18 </span>]
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span><span class="Comment"># example showing exception handling</span>
+<span id="L21" class="LineNr">21 </span><span class="muRecipe">def</span> <a href='exception2.mu.html#L21'>foo</a> raise-exception?:bool [
+<span id="L22" class="LineNr">22 </span>  <span class="Constant">local-scope</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Constant">load-inputs</span>
+<span id="L24" class="LineNr">24 </span>  <span class="Comment"># To run an instruction of the form:</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Comment">#   try f ...</span>
+<span id="L26" class="LineNr">26 </span>  <span class="Comment"># write this:</span>
+<span id="L27" class="LineNr">27 </span>  <span class="Comment">#   call-with-continuation-mark 999/exception-tag, f, ...</span>
+<span id="L28" class="LineNr">28 </span>  <span class="Comment"># By convention we reserve tag 999 for exceptions.</span>
+<span id="L29" class="LineNr">29 </span>  <span class="Comment">#</span>
+<span id="L30" class="LineNr">30 </span>  <span class="Comment"># The other inputs and outputs to 'call-with-continuation-mark' depend on</span>
+<span id="L31" class="LineNr">31 </span>  <span class="Comment"># the function it is called with.</span>
+<span id="L32" class="LineNr">32 </span>  _, result:<a href='exception2.mu.html#L9'>error-or</a>:num <span class="Special">&lt;-</span> <span class="muControl">call-with-continuation-mark</span> <span class="Constant">999/exception-tag</span>, <a href='exception2.mu.html#L47'>f</a>, raise-exception?
+<span id="L33" class="LineNr">33 </span>  <span class="Delimiter">{</span>
+<span id="L34" class="LineNr">34 </span>    val:num, normal-exit?:bool <span class="Special">&lt;-</span> maybe-convert result, <span class="Constant">value:variant</span>
+<span id="L35" class="LineNr">35 </span>    <span class="muControl">break-unless</span> normal-exit?
+<span id="L36" class="LineNr">36 </span>    $print <span class="Constant">[normal exit; result ]</span> val <span class="Constant">10/newline</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Delimiter">}</span>
+<span id="L38" class="LineNr">38 </span>  <span class="Delimiter">{</span>
+<span id="L39" class="LineNr">39 </span>    err:text, error-exit?:bool <span class="Special">&lt;-</span> maybe-convert result, <span class="Constant">error:variant</span>
+<span id="L40" class="LineNr">40 </span>    <span class="muControl">break-unless</span> error-exit?
+<span id="L41" class="LineNr">41 </span>    $print <span class="Constant">[error caught: ]</span> err <span class="Constant">10/newline</span>
+<span id="L42" class="LineNr">42 </span>  <span class="Delimiter">}</span>
+<span id="L43" class="LineNr">43 </span>]
+<span id="L44" class="LineNr">44 </span>
+<span id="L45" class="LineNr">45 </span><span class="Comment"># Callee function that we catch exceptions in must always return using a</span>
+<span id="L46" class="LineNr">46 </span><span class="Comment"># continuation.</span>
+<span id="L47" class="LineNr">47 </span><span class="muRecipe">def</span> <a href='exception2.mu.html#L47'>f</a> raise-exception?:bool<span class="muRecipe"> -&gt; </span>result:<a href='exception2.mu.html#L9'>error-or</a>:num [
+<span id="L48" class="LineNr">48 </span>  <span class="Constant">local-scope</span>
+<span id="L49" class="LineNr">49 </span>  <span class="Constant">load-inputs</span>
+<span id="L50" class="LineNr">50 </span>  <span class="Delimiter">{</span>
+<span id="L51" class="LineNr">51 </span>    <span class="muControl">break-unless</span> raise-exception?
+<span id="L52" class="LineNr">52 </span>    <span class="Comment"># throw/raise</span>
+<span id="L53" class="LineNr">53 </span>    result <span class="Special">&lt;-</span> merge <span class="Constant">0/error</span>, <span class="Constant">[error will robinson!]</span>
+<span id="L54" class="LineNr">54 </span>    <span class="muControl">return-continuation-until-mark</span> <span class="Constant">999/exception-tag</span>, result
+<span id="L55" class="LineNr">55 </span>  <span class="Delimiter">}</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Comment"># 'normal' return; still uses the continuation mark</span>
+<span id="L57" class="LineNr">57 </span>  result <span class="Special">&lt;-</span> merge <span class="Constant">1/value</span>,<span class="Constant"> 34</span>
+<span id="L58" class="LineNr">58 </span>  <span class="muControl">return-continuation-until-mark</span> <span class="Constant">999/exception-tag</span>, result
+<span id="L59" class="LineNr">59 </span>  <span class="Comment"># dead code just to avoid errors</span>
+<span id="L60" class="LineNr">60 </span>  result <span class="Special">&lt;-</span> merge <span class="Constant">1/value</span>,<span class="Constant"> 0</span>
+<span id="L61" class="LineNr">61 </span> <span class="muControl"> return</span> result
+<span id="L62" class="LineNr">62 </span>]
 </pre>
 </body>
 </html>