about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--apps/factorial.mu11
-rw-r--r--html/apps/factorial.mu.html81
2 files changed, 49 insertions, 43 deletions
diff --git a/apps/factorial.mu b/apps/factorial.mu
index 7be73342..b477190d 100644
--- a/apps/factorial.mu
+++ b/apps/factorial.mu
@@ -15,10 +15,12 @@ fn factorial n: int -> result/eax: int {
   compare n 1
   {
     break-if->
+    # n <= 1; return 1
     result <- copy 1
   }
   {
     break-if-<=
+    # n > 1; return n * factorial(n-1)
     var tmp/ecx: int <- copy n
     tmp <- decrement
     result <- factorial tmp
@@ -31,12 +33,13 @@ fn test-factorial {
   check-ints-equal result 0x78 "F - test-factorial"
 }
 
-fn main args-on-stack: (addr array addr array byte) -> exit-status/ebx: int {
+fn main args-on-stack: (addr array (addr array byte)) -> exit-status/ebx: int {
   var args/eax: (addr array addr array byte) <- copy args-on-stack
-  var tmp/ecx: int <- length args
+  # len = length(args)
+  var len/ecx: int <- length args
   $main-body: {
-    # if (len(args) <= 1) factorial(5)
-    compare tmp, 1
+    # if (len <= 1) factorial(5)
+    compare len, 1
     {
       break-if->
       var tmp/eax: int <- factorial 5
diff --git a/html/apps/factorial.mu.html b/html/apps/factorial.mu.html
index 289330dd..c52b1198 100644
--- a/html/apps/factorial.mu.html
+++ b/html/apps/factorial.mu.html
@@ -74,45 +74,48 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr">15 </span>  compare n <span class="Constant">1</span>
 <span id="L16" class="LineNr">16 </span>  <span class="Delimiter">{</span>
 <span id="L17" class="LineNr">17 </span>    <span class="PreProc">break-if-&gt;</span>
-<span id="L18" class="LineNr">18 </span>    result <span class="SpecialChar">&lt;-</span> copy <span class="Constant">1</span>
-<span id="L19" class="LineNr">19 </span>  <span class="Delimiter">}</span>
-<span id="L20" class="LineNr">20 </span>  <span class="Delimiter">{</span>
-<span id="L21" class="LineNr">21 </span>    <span class="PreProc">break-if-&lt;=</span>
-<span id="L22" class="LineNr">22 </span>    <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="SpecialChar">&lt;-</span> copy n
-<span id="L23" class="LineNr">23 </span>    tmp <span class="SpecialChar">&lt;-</span> decrement
-<span id="L24" class="LineNr">24 </span>    result <span class="SpecialChar">&lt;-</span> <a href='factorial.mu.html#L14'>factorial</a> tmp
-<span id="L25" class="LineNr">25 </span>    result <span class="SpecialChar">&lt;-</span> multiply n
-<span id="L26" class="LineNr">26 </span>  <span class="Delimiter">}</span>
-<span id="L27" class="LineNr">27 </span><span class="Delimiter">}</span>
-<span id="L28" class="LineNr">28 </span>
-<span id="L29" class="LineNr">29 </span><span class="PreProc">fn</span> <span class="muTest"><a href='factorial.mu.html#L29'>test-factorial</a></span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr">30 </span>  <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="SpecialChar">&lt;-</span> <a href='factorial.mu.html#L14'>factorial</a> <span class="Constant">5</span>
-<span id="L31" class="LineNr">31 </span>  <a href='../102test.subx.html#L23'>check-ints-equal</a> result <span class="Constant">0x78</span> <span class="Constant">&quot;F - test-factorial&quot;</span>
-<span id="L32" class="LineNr">32 </span><span class="Delimiter">}</span>
-<span id="L33" class="LineNr">33 </span>
-<span id="L34" class="LineNr">34 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='factorial.mu.html#L34'>main</a></span> args-on-stack: (addr array addr array byte)<span class="PreProc"> -&gt; </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
-<span id="L35" class="LineNr">35 </span>  <span class="PreProc">var</span> args/<span class="Constant">eax</span>: (addr array addr array byte) <span class="SpecialChar">&lt;-</span> copy args-on-stack
-<span id="L36" class="LineNr">36 </span>  <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="SpecialChar">&lt;-</span> length args
-<span id="L37" class="LineNr">37 </span>  $main-body: <span class="Delimiter">{</span>
-<span id="L38" class="LineNr">38 </span>    <span class="muComment"># if (len(args) &lt;= 1) factorial(5)</span>
-<span id="L39" class="LineNr">39 </span>    compare tmp, <span class="Constant">1</span>
-<span id="L40" class="LineNr">40 </span>    <span class="Delimiter">{</span>
-<span id="L41" class="LineNr">41 </span>      <span class="PreProc">break-if-&gt;</span>
-<span id="L42" class="LineNr">42 </span>      <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="SpecialChar">&lt;-</span> <a href='factorial.mu.html#L14'>factorial</a> <span class="Constant">5</span>
-<span id="L43" class="LineNr">43 </span>      exit-status <span class="SpecialChar">&lt;-</span> copy tmp
-<span id="L44" class="LineNr">44 </span>      <span class="PreProc">break</span> $main-body
-<span id="L45" class="LineNr">45 </span>    <span class="Delimiter">}</span>
-<span id="L46" class="LineNr">46 </span>    <span class="muComment"># if (args[1] == &quot;test&quot;) run-tests()</span>
-<span id="L47" class="LineNr">47 </span>    <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr addr array byte) <span class="SpecialChar">&lt;-</span> index args, <span class="Constant">1</span>
-<span id="L48" class="LineNr">48 </span>    <span class="PreProc">var</span> tmp3/<span class="Constant">eax</span>: boolean <span class="SpecialChar">&lt;-</span> <a href='../105string-equal.subx.html#L15'>string-equal?</a> *tmp2, <span class="Constant">&quot;test&quot;</span>
-<span id="L49" class="LineNr">49 </span>    compare tmp3, <span class="Constant">0</span>
-<span id="L50" class="LineNr">50 </span>    <span class="Delimiter">{</span>
-<span id="L51" class="LineNr">51 </span>      <span class="PreProc">break-if-=</span>
-<span id="L52" class="LineNr">52 </span>      run-tests
-<span id="L53" class="LineNr">53 </span>      exit-status <span class="SpecialChar">&lt;-</span> copy <span class="Constant">0</span>  <span class="muComment"># TODO: get at Num-test-failures somehow</span>
-<span id="L54" class="LineNr">54 </span>    <span class="Delimiter">}</span>
-<span id="L55" class="LineNr">55 </span>  <span class="Delimiter">}</span>
-<span id="L56" class="LineNr">56 </span><span class="Delimiter">}</span>
+<span id="L18" class="LineNr">18 </span>    <span class="muComment"># n &lt;= 1; return 1</span>
+<span id="L19" class="LineNr">19 </span>    result <span class="SpecialChar">&lt;-</span> copy <span class="Constant">1</span>
+<span id="L20" class="LineNr">20 </span>  <span class="Delimiter">}</span>
+<span id="L21" class="LineNr">21 </span>  <span class="Delimiter">{</span>
+<span id="L22" class="LineNr">22 </span>    <span class="PreProc">break-if-&lt;=</span>
+<span id="L23" class="LineNr">23 </span>    <span class="muComment"># n &gt; 1; return n * factorial(n-1)</span>
+<span id="L24" class="LineNr">24 </span>    <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="SpecialChar">&lt;-</span> copy n
+<span id="L25" class="LineNr">25 </span>    tmp <span class="SpecialChar">&lt;-</span> decrement
+<span id="L26" class="LineNr">26 </span>    result <span class="SpecialChar">&lt;-</span> <a href='factorial.mu.html#L14'>factorial</a> tmp
+<span id="L27" class="LineNr">27 </span>    result <span class="SpecialChar">&lt;-</span> multiply n
+<span id="L28" class="LineNr">28 </span>  <span class="Delimiter">}</span>
+<span id="L29" class="LineNr">29 </span><span class="Delimiter">}</span>
+<span id="L30" class="LineNr">30 </span>
+<span id="L31" class="LineNr">31 </span><span class="PreProc">fn</span> <span class="muTest"><a href='factorial.mu.html#L31'>test-factorial</a></span> <span class="Delimiter">{</span>
+<span id="L32" class="LineNr">32 </span>  <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="SpecialChar">&lt;-</span> <a href='factorial.mu.html#L14'>factorial</a> <span class="Constant">5</span>
+<span id="L33" class="LineNr">33 </span>  <a href='../102test.subx.html#L23'>check-ints-equal</a> result <span class="Constant">0x78</span> <span class="Constant">&quot;F - test-factorial&quot;</span>
+<span id="L34" class="LineNr">34 </span><span class="Delimiter">}</span>
+<span id="L35" class="LineNr">35 </span>
+<span id="L36" class="LineNr">36 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='factorial.mu.html#L36'>main</a></span> args-on-stack: (addr array (addr array byte))<span class="PreProc"> -&gt; </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
+<span id="L37" class="LineNr">37 </span>  <span class="PreProc">var</span> args/<span class="Constant">eax</span>: (addr array addr array byte) <span class="SpecialChar">&lt;-</span> copy args-on-stack
+<span id="L38" class="LineNr">38 </span>  <span class="muComment"># len = length(args)</span>
+<span id="L39" class="LineNr">39 </span>  <span class="PreProc">var</span> len/<span class="Constant">ecx</span>: int <span class="SpecialChar">&lt;-</span> length args
+<span id="L40" class="LineNr">40 </span>  $main-body: <span class="Delimiter">{</span>
+<span id="L41" class="LineNr">41 </span>    <span class="muComment"># if (len &lt;= 1) factorial(5)</span>
+<span id="L42" class="LineNr">42 </span>    compare len, <span class="Constant">1</span>
+<span id="L43" class="LineNr">43 </span>    <span class="Delimiter">{</span>
+<span id="L44" class="LineNr">44 </span>      <span class="PreProc">break-if-&gt;</span>
+<span id="L45" class="LineNr">45 </span>      <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="SpecialChar">&lt;-</span> <a href='factorial.mu.html#L14'>factorial</a> <span class="Constant">5</span>
+<span id="L46" class="LineNr">46 </span>      exit-status <span class="SpecialChar">&lt;-</span> copy tmp
+<span id="L47" class="LineNr">47 </span>      <span class="PreProc">break</span> $main-body
+<span id="L48" class="LineNr">48 </span>    <span class="Delimiter">}</span>
+<span id="L49" class="LineNr">49 </span>    <span class="muComment"># if (args[1] == &quot;test&quot;) run-tests()</span>
+<span id="L50" class="LineNr">50 </span>    <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr addr array byte) <span class="SpecialChar">&lt;-</span> index args, <span class="Constant">1</span>
+<span id="L51" class="LineNr">51 </span>    <span class="PreProc">var</span> tmp3/<span class="Constant">eax</span>: boolean <span class="SpecialChar">&lt;-</span> <a href='../105string-equal.subx.html#L15'>string-equal?</a> *tmp2, <span class="Constant">&quot;test&quot;</span>
+<span id="L52" class="LineNr">52 </span>    compare tmp3, <span class="Constant">0</span>
+<span id="L53" class="LineNr">53 </span>    <span class="Delimiter">{</span>
+<span id="L54" class="LineNr">54 </span>      <span class="PreProc">break-if-=</span>
+<span id="L55" class="LineNr">55 </span>      run-tests
+<span id="L56" class="LineNr">56 </span>      exit-status <span class="SpecialChar">&lt;-</span> copy <span class="Constant">0</span>  <span class="muComment"># TODO: get at Num-test-failures somehow</span>
+<span id="L57" class="LineNr">57 </span>    <span class="Delimiter">}</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Delimiter">}</span>
+<span id="L59" class="LineNr">59 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>