4009

Undo commit 4002 for factorial.mu, because index.html describes it as an
example showing the labels '{' and '}'.

2 files changed, 28 insertions, 19 deletions

diff --git a/factorial.mu b/factorial.mu
index 5b43d151..8a261207 100644
--- a/factorial.mu
+++ b/factorial.mu
@@ -10,8 +10,12 @@ def main [
 def factorial n:num -> result:num [
   local-scope
   load-ingredients
-  # if n=0 return 1
-  return-unless n, 1
+  {
+    # if n=0 return 1
+    zero?:bool <- equal n, 0
+    break-unless zero?
+    return 1
+  }
   # return n * factorial(n-1)
   x:num <- subtract n, 1
   subresult:num <- factorial x
diff --git a/html/factorial.mu.html b/html/factorial.mu.html
index da3f44eb..db134e8f 100644
--- a/html/factorial.mu.html
+++ b/html/factorial.mu.html
@@ -19,6 +19,7 @@ a:hover { text-decoration: underline; }
 .muScenario { color: #00af00; }
 .Special { color: #c00000; }
 .Conceal { color: #4e4e4e; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
@@ -70,23 +71,27 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">10 </span><span class="muRecipe">def</span> <a href='factorial.mu.html#L10'>factorial</a> n:num<span class="muRecipe"> -&gt; </span>result:num [
 <span id="L11" class="LineNr">11 </span>  <span class="Constant">local-scope</span>
 <span id="L12" class="LineNr">12 </span>  <span class="Constant">load-ingredients</span>
-<span id="L13" class="LineNr">13 </span>  <span class="Comment"># if n=0 return 1</span>
-<span id="L14" class="LineNr">14 </span>  <span class="muControl">return-unless</span> n,<span class="Constant"> 1</span>
-<span id="L15" class="LineNr">15 </span>  <span class="Comment"># return n * factorial(n-1)</span>
-<span id="L16" class="LineNr">16 </span>  x:num <span class="Special">&lt;-</span> subtract n,<span class="Constant"> 1</span>
-<span id="L17" class="LineNr">17 </span>  subresult:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a> x
-<span id="L18" class="LineNr">18 </span>  result <span class="Special">&lt;-</span> multiply subresult, n
-<span id="L19" class="LineNr">19 </span>]
-<span id="L20" class="LineNr">20 </span>
-<span id="L21" class="LineNr">21 </span><span class="Comment"># unit test</span>
-<span id="L22" class="LineNr">22 </span><span class="muScenario">scenario</span> factorial-test [
-<span id="L23" class="LineNr">23 </span>  run [
-<span id="L24" class="LineNr">24 </span>  <span class="Conceal">¦</span> 1:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a><span class="Constant"> 5</span>
-<span id="L25" class="LineNr">25 </span>  ]
-<span id="L26" class="LineNr">26 </span>  memory-should-contain [
-<span id="L27" class="LineNr">27 </span>  <span class="Conceal">¦</span><span class="Constant"> 1</span> <span class="Special">&lt;-</span><span class="Constant"> 120</span>
-<span id="L28" class="LineNr">28 </span>  ]
-<span id="L29" class="LineNr">29 </span>]
+<span id="L13" class="LineNr">13 </span>  <span class="Delimiter">{</span>
+<span id="L14" class="LineNr">14 </span>  <span class="Conceal">¦</span> <span class="Comment"># if n=0 return 1</span>
+<span id="L15" class="LineNr">15 </span>  <span class="Conceal">¦</span> zero?:bool <span class="Special">&lt;-</span> equal n,<span class="Constant"> 0</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Conceal">¦</span> <span class="muControl">break-unless</span> zero?
+<span id="L17" class="LineNr">17 </span>  <span class="Conceal">¦</span> <span class="muControl">return</span><span class="Constant"> 1</span>
+<span id="L18" class="LineNr">18 </span>  <span class="Delimiter">}</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L20" class="LineNr">20 </span>  x:num <span class="Special">&lt;-</span> subtract n,<span class="Constant"> 1</span>
+<span id="L21" class="LineNr">21 </span>  subresult:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a> x
+<span id="L22" class="LineNr">22 </span>  result <span class="Special">&lt;-</span> multiply subresult, n
+<span id="L23" class="LineNr">23 </span>]
+<span id="L24" class="LineNr">24 </span>
+<span id="L25" class="LineNr">25 </span><span class="Comment"># unit test</span>
+<span id="L26" class="LineNr">26 </span><span class="muScenario">scenario</span> factorial-test [
+<span id="L27" class="LineNr">27 </span>  run [
+<span id="L28" class="LineNr">28 </span>  <span class="Conceal">¦</span> 1:num <span class="Special">&lt;-</span> <a href='factorial.mu.html#L10'>factorial</a><span class="Constant"> 5</span>
+<span id="L29" class="LineNr">29 </span>  ]
+<span id="L30" class="LineNr">30 </span>  memory-should-contain [
+<span id="L31" class="LineNr">31 </span>  <span class="Conceal">¦</span><span class="Constant"> 1</span> <span class="Special">&lt;-</span><span class="Constant"> 120</span>
+<span id="L32" class="LineNr">32 </span>  ]
+<span id="L33" class="LineNr">33 </span>]
 </pre>
 </body>
 </html>