diff options
| -rw-r--r-- | html/apps/ex2.2.mu.html | 2 | ||||
| -rw-r--r-- | html/apps/ex3.mu.html | 2 | ||||
| -rw-r--r-- | html/apps/factorial.mu.html | 16 | ||||
| -rw-r--r-- | mu.vim | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/html/apps/ex2.2.mu.html b/html/apps/ex2.2.mu.html index 4ba854ac..4cab5df4 100644 --- a/html/apps/ex2.2.mu.html +++ b/html/apps/ex2.2.mu.html @@ -59,7 +59,7 @@ if ('onhashchange' in window) { <span id="L3" class="LineNr"> 3 </span><span class="Delimiter">}</span> <span id="L4" class="LineNr"> 4 </span> <span id="L5" class="LineNr"> 5 </span><span class="PreProc">fn</span> foo<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> -<span id="L6" class="LineNr"> 6 </span> var n: int +<span id="L6" class="LineNr"> 6 </span> <span class="PreProc">var</span> n: int <span id="L7" class="LineNr"> 7 </span> copy-to n, 3 <span id="L8" class="LineNr"> 8 </span> increment n <span id="L9" class="LineNr"> 9 </span> result <span class="Special"><-</span> copy n diff --git a/html/apps/ex3.mu.html b/html/apps/ex3.mu.html index fed6aa64..bae8125a 100644 --- a/html/apps/ex3.mu.html +++ b/html/apps/ex3.mu.html @@ -57,7 +57,7 @@ if ('onhashchange' in window) { <pre id='vimCodeElement'> <span id="L1" class="LineNr"> 1 </span><span class="PreProc">fn</span> <a href='../mu-init-test.subx.html#L7'>main</a><span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> <span id="L2" class="LineNr"> 2 </span> result <span class="Special"><-</span> copy 0 -<span id="L3" class="LineNr"> 3 </span> var i/<span class="Constant">eax</span>: int <span class="Special"><-</span> copy 1 +<span id="L3" class="LineNr"> 3 </span> <span class="PreProc">var</span> i/<span class="Constant">eax</span>: int <span class="Special"><-</span> copy 1 <span id="L4" class="LineNr"> 4 </span> <span class="Delimiter">{</span> <span id="L5" class="LineNr"> 5 </span> compare i, 0xa <span id="L6" class="LineNr"> 6 </span> <span class="Identifier">break-if-></span> diff --git a/html/apps/factorial.mu.html b/html/apps/factorial.mu.html index 8c5cd816..f953f504 100644 --- a/html/apps/factorial.mu.html +++ b/html/apps/factorial.mu.html @@ -61,21 +61,21 @@ 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 class="PreProc">fn</span> <a href='../mu-init-test.subx.html#L7'>main</a> args: (addr array kernel-string)<span class="PreProc"> -> </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> -<span id="L6" class="LineNr"> 6 </span> var a/<span class="Constant">eax</span>: (addr array kernel-string) <span class="Special"><-</span> copy args -<span id="L7" class="LineNr"> 7 </span> var tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> length a +<span id="L6" class="LineNr"> 6 </span> <span class="PreProc">var</span> a/<span class="Constant">eax</span>: (addr array kernel-string) <span class="Special"><-</span> copy args +<span id="L7" class="LineNr"> 7 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> length a <span id="L8" class="LineNr"> 8 </span> $main-body: <span class="Delimiter">{</span> <span id="L9" class="LineNr"> 9 </span> compare tmp, 1 <span id="L10" class="LineNr">10 </span> <span class="Comment"># if (len(args) == 1) factorial(5)</span> <span id="L11" class="LineNr">11 </span> <span class="Delimiter">{</span> <span id="L12" class="LineNr">12 </span> <span class="Identifier">break-if-!=</span> -<span id="L13" class="LineNr">13 </span> var tmp/<span class="Constant">eax</span>: int <span class="Special"><-</span> factorial 5 +<span id="L13" class="LineNr">13 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="Special"><-</span> factorial 5 <span id="L14" class="LineNr">14 </span> exit-status <span class="Special"><-</span> copy tmp <span id="L15" class="LineNr">15 </span> <span class="Identifier">break</span> $main-body <span id="L16" class="LineNr">16 </span> <span class="Delimiter">}</span> <span id="L17" class="LineNr">17 </span> <span class="Comment"># if (args[1] == "test") run-tests()</span> -<span id="L18" class="LineNr">18 </span> var tmp2/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy 1 <span class="Comment"># we need this just because we don't yet support `index` on literals; requires some translation-time computation</span> -<span id="L19" class="LineNr">19 </span> var tmp3/<span class="Constant">ecx</span>: (addr kernel-string) <span class="Special"><-</span> index a, tmp2 -<span id="L20" class="LineNr">20 </span> var tmp4/<span class="Constant">eax</span>: boolean <span class="Special"><-</span> <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a> *tmp3, "test" +<span id="L18" class="LineNr">18 </span> <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy 1 <span class="Comment"># we need this just because we don't yet support `index` on literals; requires some translation-time computation</span> +<span id="L19" class="LineNr">19 </span> <span class="PreProc">var</span> tmp3/<span class="Constant">ecx</span>: (addr kernel-string) <span class="Special"><-</span> index a, tmp2 +<span id="L20" class="LineNr">20 </span> <span class="PreProc">var</span> tmp4/<span class="Constant">eax</span>: boolean <span class="Special"><-</span> <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a> *tmp3, "test" <span id="L21" class="LineNr">21 </span> compare tmp4, 0 <span id="L22" class="LineNr">22 </span> <span class="Delimiter">{</span> <span id="L23" class="LineNr">23 </span> <span class="Identifier">break-if-=</span> @@ -93,7 +93,7 @@ if ('onhashchange' in window) { <span id="L35" class="LineNr">35 </span> <span class="Delimiter">}</span> <span id="L36" class="LineNr">36 </span> <span class="Delimiter">{</span> <span id="L37" class="LineNr">37 </span> <span class="Identifier">break-if-<=</span> -<span id="L38" class="LineNr">38 </span> var tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy n +<span id="L38" class="LineNr">38 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy n <span id="L39" class="LineNr">39 </span> tmp <span class="Special"><-</span> decrement <span id="L40" class="LineNr">40 </span> result <span class="Special"><-</span> factorial tmp <span id="L41" class="LineNr">41 </span> result <span class="Special"><-</span> multiply n @@ -101,7 +101,7 @@ if ('onhashchange' in window) { <span id="L43" class="LineNr">43 </span><span class="Delimiter">}</span> <span id="L44" class="LineNr">44 </span> <span id="L45" class="LineNr">45 </span><span class="PreProc">fn</span> test-factorial <span class="Delimiter">{</span> -<span id="L46" class="LineNr">46 </span> var result/<span class="Constant">eax</span>: int <span class="Special"><-</span> factorial 5 +<span id="L46" class="LineNr">46 </span> <span class="PreProc">var</span> result/<span class="Constant">eax</span>: int <span class="Special"><-</span> factorial 5 <span id="L47" class="LineNr">47 </span> <a href='../051test.subx.html#L24'>check-ints-equal</a> result 0x78 "F - test-factorial" <span id="L48" class="LineNr">48 </span><span class="Delimiter">}</span> </pre> diff --git a/mu.vim b/mu.vim index c83b391b..b4b06710 100644 --- a/mu.vim +++ b/mu.vim @@ -48,7 +48,7 @@ syntax match muControl "\<loop\>\|\<loop-if[^ ]*" highlight link muControl Identifier syntax match muRecipe " -> " -syntax keyword muRecipe fn type +syntax keyword muRecipe fn type var highlight link muRecipe PreProc syntax match muData "^type\>" |