6130

2 files changed, 18 insertions, 20 deletions

diff --git a/apps/factorial.mu b/apps/factorial.mu
index fe435a53..128ac9ad 100644
--- a/apps/factorial.mu
+++ b/apps/factorial.mu
@@ -36,10 +36,9 @@ fn main args: (addr array kernel-string) -> exit-status/ebx: int {
       break $main-body
     }
     # if (args[1] == "test") run-tests()
-    var tmp2/ecx: int <- copy 1  # we need this just because we don't yet support `index` on literals; requires some translation-time computation
-    var tmp3/ecx: (addr kernel-string) <- index a, tmp2
-    var tmp4/eax: boolean <- kernel-string-equal? *tmp3, "test"
-    compare tmp4, 0
+    var tmp2/ecx: (addr kernel-string) <- index a, 1
+    var tmp3/eax: boolean <- kernel-string-equal? *tmp2, "test"
+    compare tmp3, 0
     {
       break-if-=
       run-tests
diff --git a/html/apps/factorial.mu.html b/html/apps/factorial.mu.html
index c118171c..fa2ce7a3 100644
--- a/html/apps/factorial.mu.html
+++ b/html/apps/factorial.mu.html
@@ -61,7 +61,7 @@ if ('onhashchange' in window) {
 <span id="L3" class="LineNr"> 3 </span><span class="Comment">#   ./a.elf test  # to run tests</span>
 <span id="L4" class="LineNr"> 4 </span><span class="Comment">#   ./a.elf       # to run factorial(5)</span>
 <span id="L5" class="LineNr"> 5 </span>
-<span id="L6" class="LineNr"> 6 </span><span class="PreProc">fn</span> <a href='factorial.mu.html#L6'>factorial</a> n: int<span class="PreProc"> -&gt; </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span>
+<span id="L6" class="LineNr"> 6 </span><span class="PreProc">fn</span> factorial n: int<span class="PreProc"> -&gt; </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span>
 <span id="L7" class="LineNr"> 7 </span>  compare n <span class="Constant">1</span>
 <span id="L8" class="LineNr"> 8 </span>  <span class="Delimiter">{</span>
 <span id="L9" class="LineNr"> 9 </span>    <span class="Identifier">break-if-&gt;</span>
@@ -71,13 +71,13 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span>    <span class="Identifier">break-if-&lt;=</span>
 <span id="L14" class="LineNr">14 </span>    <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special">&lt;-</span> copy n
 <span id="L15" class="LineNr">15 </span>    tmp <span class="Special">&lt;-</span> decrement
-<span id="L16" class="LineNr">16 </span>    result <span class="Special">&lt;-</span> <a href='factorial.mu.html#L6'>factorial</a> tmp
+<span id="L16" class="LineNr">16 </span>    result <span class="Special">&lt;-</span> factorial tmp
 <span id="L17" class="LineNr">17 </span>    result <span class="Special">&lt;-</span> multiply n
 <span id="L18" class="LineNr">18 </span>  <span class="Delimiter">}</span>
 <span id="L19" class="LineNr">19 </span><span class="Delimiter">}</span>
 <span id="L20" class="LineNr">20 </span>
-<span id="L21" class="LineNr">21 </span><span class="PreProc">fn</span> <a href='factorial.mu.html#L21'>test-factorial</a> <span class="Delimiter">{</span>
-<span id="L22" class="LineNr">22 </span>  <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="Special">&lt;-</span> <a href='factorial.mu.html#L6'>factorial</a> <span class="Constant">5</span>
+<span id="L21" class="LineNr">21 </span><span class="PreProc">fn</span> test-factorial <span class="Delimiter">{</span>
+<span id="L22" class="LineNr">22 </span>  <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="Special">&lt;-</span> factorial <span class="Constant">5</span>
 <span id="L23" class="LineNr">23 </span>  <a href='../051test.subx.html#L24'>check-ints-equal</a> result <span class="Constant">0x78</span> <span class="Constant">&quot;F - test-factorial&quot;</span>
 <span id="L24" class="LineNr">24 </span><span class="Delimiter">}</span>
 <span id="L25" class="LineNr">25 </span>
@@ -89,22 +89,21 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr">31 </span>    <span class="Comment"># if (len(args) == 1) factorial(5)</span>
 <span id="L32" class="LineNr">32 </span>    <span class="Delimiter">{</span>
 <span id="L33" class="LineNr">33 </span>      <span class="Identifier">break-if-!=</span>
-<span id="L34" class="LineNr">34 </span>      <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="Special">&lt;-</span> <a href='factorial.mu.html#L6'>factorial</a> <span class="Constant">5</span>
+<span id="L34" class="LineNr">34 </span>      <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="Special">&lt;-</span> factorial <span class="Constant">5</span>
 <span id="L35" class="LineNr">35 </span>      exit-status <span class="Special">&lt;-</span> copy tmp
 <span id="L36" class="LineNr">36 </span>      <span class="Identifier">break</span> $main-body
 <span id="L37" class="LineNr">37 </span>    <span class="Delimiter">}</span>
 <span id="L38" class="LineNr">38 </span>    <span class="Comment"># if (args[1] == &quot;test&quot;) run-tests()</span>
-<span id="L39" class="LineNr">39 </span>    <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: int <span class="Special">&lt;-</span> copy <span class="Constant">1</span>  <span class="Comment"># we need this just because we don't yet support `index` on literals; requires some translation-time computation</span>
-<span id="L40" class="LineNr">40 </span>    <span class="PreProc">var</span> tmp3/<span class="Constant">ecx</span>: (addr kernel-string) <span class="Special">&lt;-</span> index a, tmp2
-<span id="L41" class="LineNr">41 </span>    <span class="PreProc">var</span> tmp4/<span class="Constant">eax</span>: boolean <span class="Special">&lt;-</span> <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a> *tmp3, <span class="Constant">&quot;test&quot;</span>
-<span id="L42" class="LineNr">42 </span>    compare tmp4, <span class="Constant">0</span>
-<span id="L43" class="LineNr">43 </span>    <span class="Delimiter">{</span>
-<span id="L44" class="LineNr">44 </span>      <span class="Identifier">break-if-=</span>
-<span id="L45" class="LineNr">45 </span>      run-tests
-<span id="L46" class="LineNr">46 </span>      exit-status <span class="Special">&lt;-</span> copy <span class="Constant">0</span>  <span class="Comment"># TODO: get at Num-test-failures somehow</span>
-<span id="L47" class="LineNr">47 </span>    <span class="Delimiter">}</span>
-<span id="L48" class="LineNr">48 </span>  <span class="Delimiter">}</span>
-<span id="L49" class="LineNr">49 </span><span class="Delimiter">}</span>
+<span id="L39" class="LineNr">39 </span>    <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr kernel-string) <span class="Special">&lt;-</span> index a, <span class="Constant">1</span>
+<span id="L40" class="LineNr">40 </span>    <span class="PreProc">var</span> tmp3/<span class="Constant">eax</span>: boolean <span class="Special">&lt;-</span> <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a> *tmp2, <span class="Constant">&quot;test&quot;</span>
+<span id="L41" class="LineNr">41 </span>    compare tmp3, <span class="Constant">0</span>
+<span id="L42" class="LineNr">42 </span>    <span class="Delimiter">{</span>
+<span id="L43" class="LineNr">43 </span>      <span class="Identifier">break-if-=</span>
+<span id="L44" class="LineNr">44 </span>      run-tests
+<span id="L45" class="LineNr">45 </span>      exit-status <span class="Special">&lt;-</span> copy <span class="Constant">0</span>  <span class="Comment"># TODO: get at Num-test-failures somehow</span>
+<span id="L46" class="LineNr">46 </span>    <span class="Delimiter">}</span>
+<span id="L47" class="LineNr">47 </span>  <span class="Delimiter">}</span>
+<span id="L48" class="LineNr">48 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>