diff options
| -rw-r--r-- | html/apps/ex1.mu.html | 5 | ||||
| -rw-r--r-- | html/apps/ex2.2.mu.html | 5 | ||||
| -rw-r--r-- | html/apps/ex2.mu.html | 5 | ||||
| -rw-r--r-- | html/apps/ex3.2.mu.html | 12 | ||||
| -rw-r--r-- | html/apps/ex3.mu.html | 10 | ||||
| -rw-r--r-- | html/apps/factorial.mu.html | 29 | ||||
| -rw-r--r-- | mu.vim | 15 |
7 files changed, 45 insertions, 36 deletions
diff --git a/html/apps/ex1.mu.html b/html/apps/ex1.mu.html index 10d019b0..9cde8645 100644 --- a/html/apps/ex1.mu.html +++ b/html/apps/ex1.mu.html @@ -14,6 +14,7 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } +.muFunction { color: #af5f00; text-decoration: underline; } .LineNr { } .Comment { color: #005faf; } .Constant { color: #008787; } @@ -65,8 +66,8 @@ if ('onhashchange' in window) { <span id="L8" class="LineNr"> 8 </span><span class="Comment"># $ echo $?</span> <span id="L9" class="LineNr"> 9 </span><span class="Comment"># 42</span> <span id="L10" class="LineNr">10 </span> -<span id="L11" class="LineNr">11 </span><span class="PreProc">fn</span> main<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> -<span id="L12" class="LineNr">12 </span> result <span class="Special"><-</span> copy <span class="Constant">0x2</span>a <span class="Comment"># Mu requires hexadecimal</span> +<span id="L11" class="LineNr">11 </span><span class="PreProc">fn</span> <span class="muFunction">main</span><span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L12" class="LineNr">12 </span> result <span class="Special"><-</span> copy <span class="Constant">0x2a</span> <span class="Comment"># Mu requires hexadecimal</span> <span id="L13" class="LineNr">13 </span><span class="Delimiter">}</span> </pre> </body> diff --git a/html/apps/ex2.2.mu.html b/html/apps/ex2.2.mu.html index aacf0671..d76222e3 100644 --- a/html/apps/ex2.2.mu.html +++ b/html/apps/ex2.2.mu.html @@ -14,6 +14,7 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } +.muFunction { color: #af5f00; text-decoration: underline; } .LineNr { } .Constant { color: #008787; } .Special { color: #ff6060; } @@ -54,11 +55,11 @@ if ('onhashchange' in window) { <body onload='JumpToLine();'> <a href='https://github.com/akkartik/mu/blob/master/apps/ex2.2.mu'>https://github.com/akkartik/mu/blob/master/apps/ex2.2.mu</a> <pre id='vimCodeElement'> -<span id="L1" class="LineNr"> 1 </span><span class="PreProc">fn</span> main<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L1" class="LineNr"> 1 </span><span class="PreProc">fn</span> <span class="muFunction">main</span><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> <a href='ex2.2.mu.html#L5'>foo</a> <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> <a href='ex2.2.mu.html#L5'>foo</a><span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L5" class="LineNr"> 5 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='ex2.2.mu.html#L5'>foo</a></span><span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> <span id="L6" class="LineNr"> 6 </span> <span class="PreProc">var</span> n: int <span id="L7" class="LineNr"> 7 </span> copy-to n, <span class="Constant">3</span> <span id="L8" class="LineNr"> 8 </span> increment n diff --git a/html/apps/ex2.mu.html b/html/apps/ex2.mu.html index a4a53e22..e8c04536 100644 --- a/html/apps/ex2.mu.html +++ b/html/apps/ex2.mu.html @@ -14,6 +14,7 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } +.muFunction { color: #af5f00; text-decoration: underline; } .LineNr { } .Comment { color: #005faf; } .Constant { color: #008787; } @@ -64,11 +65,11 @@ if ('onhashchange' in window) { <span id="L7" class="LineNr"> 7 </span><span class="Comment"># $ echo $?</span> <span id="L8" class="LineNr"> 8 </span><span class="Comment"># 7</span> <span id="L9" class="LineNr"> 9 </span> -<span id="L10" class="LineNr">10 </span><span class="PreProc">fn</span> main<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L10" class="LineNr">10 </span><span class="PreProc">fn</span> <span class="muFunction">main</span><span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> <span id="L11" class="LineNr">11 </span> result <span class="Special"><-</span> <a href='ex2.mu.html#L14'>do-add</a> <span class="Constant">3</span> <span class="Constant">4</span> <span id="L12" class="LineNr">12 </span><span class="Delimiter">}</span> <span id="L13" class="LineNr">13 </span> -<span id="L14" class="LineNr">14 </span><span class="PreProc">fn</span> <a href='ex2.mu.html#L14'>do-add</a> a: int, b: int<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L14" class="LineNr">14 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='ex2.mu.html#L14'>do-add</a></span> a: int, b: int<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> <span id="L15" class="LineNr">15 </span> result <span class="Special"><-</span> copy a <span id="L16" class="LineNr">16 </span> result <span class="Special"><-</span> add b <span id="L17" class="LineNr">17 </span><span class="Delimiter">}</span> diff --git a/html/apps/ex3.2.mu.html b/html/apps/ex3.2.mu.html index 436fe56a..1cbfd53d 100644 --- a/html/apps/ex3.2.mu.html +++ b/html/apps/ex3.2.mu.html @@ -14,11 +14,11 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } +.muFunction { color: #af5f00; text-decoration: underline; } .LineNr { } .Comment { color: #005faf; } .Constant { color: #008787; } .Special { color: #ff6060; } -.Identifier { color: #af5f00; } .Delimiter { color: #c000c0; } .PreProc { color: #c000c0; } --> @@ -64,28 +64,28 @@ if ('onhashchange' in window) { <span id="L6" class="LineNr"> 6 </span><span class="Comment"># $ echo $?</span> <span id="L7" class="LineNr"> 7 </span><span class="Comment"># 55</span> <span id="L8" class="LineNr"> 8 </span> -<span id="L9" class="LineNr"> 9 </span><span class="PreProc">fn</span> main<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L9" class="LineNr"> 9 </span><span class="PreProc">fn</span> <span class="muFunction">main</span><span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> <span id="L10" class="LineNr">10 </span> <span class="Comment"># populate a</span> <span id="L11" class="LineNr">11 </span> <span class="PreProc">var</span> a: (array int <span class="Constant">0xb</span>) <span class="Comment"># 11; we waste index 0</span> <span id="L12" class="LineNr">12 </span> <span class="PreProc">var</span> i/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy <span class="Constant">1</span> <span id="L13" class="LineNr">13 </span> <span class="Delimiter">{</span> <span id="L14" class="LineNr">14 </span> compare i, <span class="Constant">0xb</span> -<span id="L15" class="LineNr">15 </span> <span class="Identifier">break-if->=</span> +<span id="L15" class="LineNr">15 </span> <span class="PreProc">break-if->=</span> <span id="L16" class="LineNr">16 </span> <span class="PreProc">var</span> x/<span class="Constant">eax</span>: (addr int) <span class="Special"><-</span> index a, i <span id="L17" class="LineNr">17 </span> copy-to *x, i <span id="L18" class="LineNr">18 </span> i <span class="Special"><-</span> increment -<span id="L19" class="LineNr">19 </span> <span class="Identifier">loop</span> +<span id="L19" class="LineNr">19 </span> <span class="PreProc">loop</span> <span id="L20" class="LineNr">20 </span> <span class="Delimiter">}</span> <span id="L21" class="LineNr">21 </span> <span class="Comment"># sum</span> <span id="L22" class="LineNr">22 </span> result <span class="Special"><-</span> copy <span class="Constant">0</span> <span id="L23" class="LineNr">23 </span> i <span class="Special"><-</span> copy <span class="Constant">1</span> <span id="L24" class="LineNr">24 </span> <span class="Delimiter">{</span> <span id="L25" class="LineNr">25 </span> compare i, <span class="Constant">0xb</span> -<span id="L26" class="LineNr">26 </span> <span class="Identifier">break-if->=</span> +<span id="L26" class="LineNr">26 </span> <span class="PreProc">break-if->=</span> <span id="L27" class="LineNr">27 </span> <span class="PreProc">var</span> x/<span class="Constant">eax</span>: (addr int) <span class="Special"><-</span> index a, i <span id="L28" class="LineNr">28 </span> result <span class="Special"><-</span> add *x <span id="L29" class="LineNr">29 </span> i <span class="Special"><-</span> increment -<span id="L30" class="LineNr">30 </span> <span class="Identifier">loop</span> +<span id="L30" class="LineNr">30 </span> <span class="PreProc">loop</span> <span id="L31" class="LineNr">31 </span> <span class="Delimiter">}</span> <span id="L32" class="LineNr">32 </span><span class="Delimiter">}</span> </pre> diff --git a/html/apps/ex3.mu.html b/html/apps/ex3.mu.html index 60aac512..eb4de019 100644 --- a/html/apps/ex3.mu.html +++ b/html/apps/ex3.mu.html @@ -14,10 +14,10 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } +.muFunction { color: #af5f00; text-decoration: underline; } .LineNr { } .Constant { color: #008787; } .Special { color: #ff6060; } -.Identifier { color: #af5f00; } .Delimiter { color: #c000c0; } .PreProc { color: #c000c0; } --> @@ -55,15 +55,15 @@ if ('onhashchange' in window) { <body onload='JumpToLine();'> <a href='https://github.com/akkartik/mu/blob/master/apps/ex3.mu'>https://github.com/akkartik/mu/blob/master/apps/ex3.mu</a> <pre id='vimCodeElement'> -<span id="L1" class="LineNr"> 1 </span><span class="PreProc">fn</span> main<span class="PreProc"> -> </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span> +<span id="L1" class="LineNr"> 1 </span><span class="PreProc">fn</span> <span class="muFunction">main</span><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 <span class="Constant">0</span> <span id="L3" class="LineNr"> 3 </span> <span class="PreProc">var</span> i/<span class="Constant">eax</span>: int <span class="Special"><-</span> copy <span class="Constant">1</span> <span id="L4" class="LineNr"> 4 </span> <span class="Delimiter">{</span> -<span id="L5" class="LineNr"> 5 </span> compare i, <span class="Constant">0</span>xa -<span id="L6" class="LineNr"> 6 </span> <span class="Identifier">break-if-></span> +<span id="L5" class="LineNr"> 5 </span> compare i, <span class="Constant">0xa</span> +<span id="L6" class="LineNr"> 6 </span> <span class="PreProc">break-if-></span> <span id="L7" class="LineNr"> 7 </span> result <span class="Special"><-</span> add i <span id="L8" class="LineNr"> 8 </span> i <span class="Special"><-</span> increment -<span id="L9" class="LineNr"> 9 </span> <span class="Identifier">loop</span> +<span id="L9" class="LineNr"> 9 </span> <span class="PreProc">loop</span> <span id="L10" class="LineNr">10 </span> <span class="Delimiter">}</span> <span id="L11" class="LineNr">11 </span><span class="Delimiter">}</span> </pre> diff --git a/html/apps/factorial.mu.html b/html/apps/factorial.mu.html index bb402fdd..7159ab5e 100644 --- a/html/apps/factorial.mu.html +++ b/html/apps/factorial.mu.html @@ -14,11 +14,12 @@ pre { white-space: pre-wrap; font-family: monospace; color: #000000; background- body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; } a { color:inherit; } * { font-size:12pt; font-size: 1em; } +.muFunction { color: #af5f00; text-decoration: underline; } .LineNr { } +.muTest { color: #5f8700; } .Comment { color: #005faf; } .Constant { color: #008787; } .Special { color: #ff6060; } -.Identifier { color: #af5f00; } .Delimiter { color: #c000c0; } .PreProc { color: #c000c0; } --> @@ -69,14 +70,14 @@ if ('onhashchange' in window) { <span id="L11" class="LineNr">11 </span><span class="Comment">#</span> <span id="L12" class="LineNr">12 </span><span class="Comment"># Compare apps/factorial4.subx</span> <span id="L13" class="LineNr">13 </span> -<span id="L14" class="LineNr">14 </span><span class="PreProc">fn</span> <a href='factorial.mu.html#L14'>factorial</a> n: int<span class="PreProc"> -> </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span> +<span id="L14" class="LineNr">14 </span><span class="PreProc">fn</span> <span class="muFunction"><a href='factorial.mu.html#L14'>factorial</a></span> n: int<span class="PreProc"> -> </span>result/<span class="Constant">eax</span>: int <span class="Delimiter">{</span> <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="Identifier">break-if-></span> +<span id="L17" class="LineNr">17 </span> <span class="PreProc">break-if-></span> <span id="L18" class="LineNr">18 </span> result <span class="Special"><-</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="Identifier">break-if-<=</span> +<span id="L21" class="LineNr">21 </span> <span class="PreProc">break-if-<=</span> <span id="L22" class="LineNr">22 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> copy n <span id="L23" class="LineNr">23 </span> tmp <span class="Special"><-</span> decrement <span id="L24" class="LineNr">24 </span> result <span class="Special"><-</span> <a href='factorial.mu.html#L14'>factorial</a> tmp @@ -84,29 +85,29 @@ if ('onhashchange' in window) { <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> <a href='factorial.mu.html#L29'>test-factorial</a> <span class="Delimiter">{</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="Special"><-</span> <a href='factorial.mu.html#L14'>factorial</a> <span class="Constant">5</span> <span id="L31" class="LineNr">31 </span> <a href='../051test.subx.html#L24'>check-ints-equal</a> result <span class="Constant">0x78</span> <span class="Constant">"F - test-factorial"</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> main args: (addr array kernel-string)<span class="PreProc"> -> </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> a/<span class="Constant">eax</span>: (addr array kernel-string) <span class="Special"><-</span> copy args +<span id="L34" class="LineNr">34 </span><span class="PreProc">fn</span> <span class="muFunction">main</span> args: (addr array string)<span class="PreProc"> -> </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> a/<span class="Constant">eax</span>: (addr array string) <span class="Special"><-</span> copy args <span id="L36" class="LineNr">36 </span> <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special"><-</span> length a <span id="L37" class="LineNr">37 </span> $main-body: <span class="Delimiter">{</span> -<span id="L38" class="LineNr">38 </span> compare tmp, <span class="Constant">1</span> -<span id="L39" class="LineNr">39 </span> <span class="Comment"># if (len(args) == 1) factorial(5)</span> +<span id="L38" class="LineNr">38 </span> <span class="Comment"># if (len(args) <= 4) factorial(5)</span> +<span id="L39" class="LineNr">39 </span> compare tmp, <span class="Constant">4</span> <span id="L40" class="LineNr">40 </span> <span class="Delimiter">{</span> -<span id="L41" class="LineNr">41 </span> <span class="Identifier">break-if-!=</span> +<span id="L41" class="LineNr">41 </span> <span class="PreProc">break-if-></span> <span id="L42" class="LineNr">42 </span> <span class="PreProc">var</span> tmp/<span class="Constant">eax</span>: int <span class="Special"><-</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="Special"><-</span> copy tmp -<span id="L44" class="LineNr">44 </span> <span class="Identifier">break</span> $main-body +<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="Comment"># if (args[1] == "test") run-tests()</span> -<span id="L47" class="LineNr">47 </span> <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr kernel-string) <span class="Special"><-</span> index a, <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="Special"><-</span> <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a> *tmp2, <span class="Constant">"test"</span> +<span id="L47" class="LineNr">47 </span> <span class="PreProc">var</span> tmp2/<span class="Constant">ecx</span>: (addr string) <span class="Special"><-</span> index a, <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="Special"><-</span> <a href='../054string-equal.subx.html#L16'>string-equal?</a> *tmp2, <span class="Constant">"test"</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="Identifier">break-if-=</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="Special"><-</span> copy <span class="Constant">0</span> <span class="Comment"># TODO: get at Num-test-failures somehow</span> <span id="L54" class="LineNr">54 </span> <span class="Delimiter">}</span> diff --git a/mu.vim b/mu.vim index 363ac862..9206d27c 100644 --- a/mu.vim +++ b/mu.vim @@ -42,16 +42,21 @@ syntax match muAssign "<-" highlight link muAssign SpecialChar " common keywords -" use regular expressions for common words that may come after '/' syntax match muControl "^return\>\| return\>" syntax match muControl "\<jump\>\|\<jump-if[^ ]*" syntax match muControl "\<break\>\|\<break-if[^ ]*" syntax match muControl "\<loop\>\|\<loop-if[^ ]*" -highlight link muControl Identifier +highlight link muControl PreProc -syntax match muRecipe " -> " -syntax keyword muRecipe fn type var -highlight link muRecipe PreProc +syntax match muKeyword " -> " +syntax keyword muKeyword fn type var +highlight link muKeyword PreProc + +syntax match muFunction "\(fn\s*\)\@<=\(\S\+\)" +highlight muFunction cterm=underline ctermfg=130 + +syntax match muTest "\(fn\s*\)\@<=\(test-\S\+\)" +highlight muTest ctermfg=64 syntax match muData "^type\>" syntax match muData "\<eax\>\|\<ecx\>\|\<edx\>\|\<ebx\>\|\<esi\>\|\<edi\>" |