6 files changed, 19 insertions, 14 deletions
diff --git a/exuberant_ctags_rc b/exuberant_ctags_rc
index 785caaf0..92e873f9 100644
--- a/exuberant_ctags_rc
+++ b/exuberant_ctags_rc
@@ -1,3 +1,8 @@
+--langdef=mu
+--langmap=mu:.mu
+--regex-mu=/^fn[ \t]+([^ \t]*)/\1/d,definition/
+--regex-mu=/^type[ \t]+([^ \t]*)/\1/t,typeref/
+
 --langdef=subx
 --langmap=subx:.subx
 --regex-subx=/^([^$ #][^ #]*):/\1/d,definition/
diff --git a/html/apps/ex1.mu.html b/html/apps/ex1.mu.html
index 3fdf8664..10d019b0 100644
--- a/html/apps/ex1.mu.html
+++ b/html/apps/ex1.mu.html
@@ -65,7 +65,7 @@ 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> <a href='../mu-init-test.subx.html#L7'>main</a><span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
+<span id="L11" class="LineNr">11 </span><span class="PreProc">fn</span> main<span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
 <span id="L12" class="LineNr">12 </span>  result <span class="Special">&lt;-</span> copy <span class="Constant">0x2</span>a  <span class="Comment"># Mu requires hexadecimal</span>
 <span id="L13" class="LineNr">13 </span><span class="Delimiter">}</span>
 </pre>
diff --git a/html/apps/ex2.2.mu.html b/html/apps/ex2.2.mu.html
index dbb019cf..aacf0671 100644
--- a/html/apps/ex2.2.mu.html
+++ b/html/apps/ex2.2.mu.html
@@ -54,11 +54,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> <a href='../mu-init-test.subx.html#L7'>main</a><span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
-<span id="L2" class="LineNr"> 2 </span>  result <span class="Special">&lt;-</span> foo
+<span id="L1" class="LineNr"> 1 </span><span class="PreProc">fn</span> main<span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
+<span id="L2" class="LineNr"> 2 </span>  result <span class="Special">&lt;-</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> foo<span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</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"> -&gt; </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 fa0e8ed0..a4a53e22 100644
--- a/html/apps/ex2.mu.html
+++ b/html/apps/ex2.mu.html
@@ -64,11 +64,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> <a href='../mu-init-test.subx.html#L7'>main</a><span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
-<span id="L11" class="LineNr">11 </span>  result <span class="Special">&lt;-</span> do-add <span class="Constant">3</span> <span class="Constant">4</span>
+<span id="L10" class="LineNr">10 </span><span class="PreProc">fn</span> main<span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
+<span id="L11" class="LineNr">11 </span>  result <span class="Special">&lt;-</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> do-add a: int, b: int<span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</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"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
 <span id="L15" class="LineNr">15 </span>  result <span class="Special">&lt;-</span> copy a
 <span id="L16" class="LineNr">16 </span>  result <span class="Special">&lt;-</span> add b
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">}</span>
diff --git a/html/apps/ex3.mu.html b/html/apps/ex3.mu.html
index aa6c6983..60aac512 100644
--- a/html/apps/ex3.mu.html
+++ b/html/apps/ex3.mu.html
@@ -55,7 +55,7 @@ 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> <a href='../mu-init-test.subx.html#L7'>main</a><span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
+<span id="L1" class="LineNr"> 1 </span><span class="PreProc">fn</span> main<span class="PreProc"> -&gt; </span>result/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
 <span id="L2" class="LineNr"> 2 </span>  result <span class="Special">&lt;-</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">&lt;-</span> copy <span class="Constant">1</span>
 <span id="L4" class="LineNr"> 4 </span>  <span class="Delimiter">{</span>
diff --git a/html/apps/factorial.mu.html b/html/apps/factorial.mu.html
index afb0f1a5..c118171c 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> factorial 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> <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="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,17 +71,17 @@ 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> factorial tmp
+<span id="L16" class="LineNr">16 </span>    result <span class="Special">&lt;-</span> <a href='factorial.mu.html#L6'>factorial</a> 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> 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="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="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>
-<span id="L26" class="LineNr">26 </span><span class="PreProc">fn</span> <a href='../mu-init-test.subx.html#L7'>main</a> args: (addr array kernel-string)<span class="PreProc"> -&gt; </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
+<span id="L26" class="LineNr">26 </span><span class="PreProc">fn</span> main args: (addr array kernel-string)<span class="PreProc"> -&gt; </span>exit-status/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
 <span id="L27" class="LineNr">27 </span>  <span class="PreProc">var</span> a/<span class="Constant">eax</span>: (addr array kernel-string) <span class="Special">&lt;-</span> copy args
 <span id="L28" class="LineNr">28 </span>  <span class="PreProc">var</span> tmp/<span class="Constant">ecx</span>: int <span class="Special">&lt;-</span> length a
 <span id="L29" class="LineNr">29 </span>  $main-body: <span class="Delimiter">{</span>
@@ -89,7 +89,7 @@ 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> factorial <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> <a href='factorial.mu.html#L6'>factorial</a> <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>