about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2014-07-31 02:08:23 -0700
committerKartik K. Agaram <vc@akkartik.com>2014-07-31 02:09:45 -0700
commitfa234f9a861e15e439f649d8f0c9284e1bb46cfb (patch)
tree454bf2bd3b97b06f3204c279e1e642d09ee91c5a
parent66a52b5ff217de8035cb7829d33c630f1bb1462b (diff)
downloadmu-fa234f9a861e15e439f649d8f0c9284e1bb46cfb.tar.gz
42 - update Readme
Broken since commit 11 on Jul 10.
-rw-r--r--Readme6
-rw-r--r--x.mu6
2 files changed, 6 insertions, 6 deletions
diff --git a/Readme b/Readme
index f137ffbf..88904c1a 100644
--- a/Readme
+++ b/Readme
@@ -6,9 +6,9 @@ $ git clone http://github.com/arclanguage/anarki
 
 $ cat x.mu
 (main
-  (1 <- loadi 1)
-  (2 <- loadi 3)
-  (3 <- add 1 2)
+  ((1 integer) <- literal 1)
+  ((2 integer) <- literal 3)
+  ((3 integer) <- add (1 integer) (2 integer))
 )
 
 $ ./anarki/arc mu.arc x.mu
diff --git a/x.mu b/x.mu
index 98a75608..78a51159 100644
--- a/x.mu
+++ b/x.mu
@@ -1,5 +1,5 @@
 (main
-  (1 <- loadi 1)
-  (2 <- loadi 3)
-  (3 <- add 1 2)
+  ((1 integer) <- literal 1)
+  ((2 integer) <- literal 3)
+  ((3 integer) <- add (1 integer) (2 integer))
 )
' href='#n146'>146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Mu - apps/advent2020/2b.mu</title>
<meta name="Generator" content="Vim/8.1">
<meta name="plugin-version" content="vim8.1_v1">
<meta name="syntax" content="none">
<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
<meta name="colorscheme" content="minimal-light">
<style type="text/css">
<!--
pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
a { color:inherit; }
* { font-size:12pt; font-size: 1em; }
.CommentedCode { color: #8a8a8a; }
.muComment { color: #005faf; }
.LineNr { }
.SpecialChar { color: #d70000; }
.Constant { color: #008787; }
.muFunction { color: #af5f00; text-decoration: underline; }
.Delimiter { color: #c000c0; }
.PreProc { color: #c000c0; }
-->
</style>

<script type='text/javascript'>
<!--

/* function to open any folds containing a jumped-to line before jumping to it */
function JumpToLine()
{
  var lineNum;
  lineNum = window.location.hash;
  lineNum = lineNum.substr(1); /* strip off '#' */

  if (lineNum.indexOf('L') == -1) {
    lineNum = 'L'+lineNum;
  }
  var lineElem = document.getElementById(lineNum);
  /* Always jump to new location even if the line was hidden inside a fold, or
   * we corrected the raw number to a line ID.
   */
  if (lineElem) {
    lineElem.scrollIntoView(true);
  }
  return true;
}
if ('onhashchange' in window) {
  window.onhashchange = JumpToLine;
}

-->
</script>
</head>
<body onload='JumpToLine();'>
<a href='https://github.com/akkartik/mu/blob/master/apps/advent2020/2b.mu'>https://github.com/akkartik/mu/blob/master/apps/advent2020/2b.mu</a>
<pre id='vimCodeElement'>
<span id="L1" class="LineNr">  1 </span><span class="muComment"># <a href="https://adventofcode.com/2020/day/2">https://adventofcode.com/2020/day/2</a></span>
<span id="L2" class="LineNr">  2 </span><span class="muComment">#</span>
<span id="L3" class="LineNr">  3 </span><span class="muComment"># To run (on Linux):</span>
<span id="L4" class="LineNr">  4 </span><span class="muComment">#   $ git clone <a href="https://github.com/akkartik/mu">https://github.com/akkartik/mu</a></span>
<span id="L5" class="LineNr">  5 </span><span class="muComment">#   $ cd mu</span>
<span id="L6" class="LineNr">  6 </span><span class="muComment">#   $ ./translate_mu apps/advent2020/2b.mu</span>
<span id="L7" class="LineNr">  7 </span><span class="muComment">#   $ ./a.elf &lt; input</span>
<span id="L8" class="LineNr">  8 </span><span class="muComment">#</span>
<span id="L9" class="LineNr">  9 </span><span class="muComment"># You'll need to register to download the 'input' file for yourself.</span>
<span id="L10" class="LineNr"> 10 </span>
<span id="L11" class="LineNr"> 11 </span><span class="PreProc">fn</span> <span class="muFunction">main</span><span class="PreProc"> -&gt; </span>_/<span class="Constant">ebx</span>: int <span class="Delimiter">{</span>
<span id="L12" class="LineNr"> 12 </span>  <span class="PreProc">var</span> valid-password-count/<span class="Constant">edi</span>: int <span class="SpecialChar">&lt;-</span> copy <span class="Constant">0</span>
<span id="L13" class="LineNr"> 13 </span>  <span class="PreProc">var</span> line-storage: (stream byte <span class="Constant">0x100</span>)  <span class="muComment"># 256 bytes</span>
<span id="L14" class="LineNr"> 14 </span>  <span class="PreProc">var</span> line/<span class="Constant">edx</span>: (addr stream byte) <span class="SpecialChar">&lt;-</span> address line-storage
<span id="L15" class="LineNr"> 15 </span>  <span class="PreProc">var</span> slice-storage: slice
<span id="L16" class="LineNr"> 16 </span>  <span class="PreProc">var</span> slice/<span class="Constant">ecx</span>: (addr slice) <span class="SpecialChar">&lt;-</span> address slice-storage
<span id="L17" class="LineNr"> 17 </span>  <span class="Delimiter">{</span>
<span id="L18" class="LineNr"> 18 </span>    <span class="muComment"># read line from stdin</span>
<span id="L19" class="LineNr"> 19 </span>    <a href='../../106stream.subx.html#L17'>clear-stream</a> line
<span id="L20" class="LineNr"> 20 </span>    <a href='../../305keyboard.subx.html#L158'>read-line-from-real-keyboard</a> line
<span id="L21" class="LineNr"> 21 </span>    <span class="muComment"># if line is empty (not even a newline), quit</span>
<span id="L22" class="LineNr"> 22 </span>    <span class="PreProc">var</span> done?/<span class="Constant">eax</span>: boolean <span class="SpecialChar">&lt;-</span> <a href='../../309stream.subx.html#L6'>stream-empty?</a> line
<span id="L23" class="LineNr"> 23 </span>    compare done?, <span class="Constant">0</span>  <span class="muComment"># false</span>
<span id="L24" class="LineNr"> 24 </span>    <span class="PreProc">break-if-!=</span>
<span id="L25" class="LineNr"> 25 </span>    <a href='../../304screen.subx.html#L147'>print-stream-to-real-screen</a> line
<span id="L26" class="LineNr"> 26 </span>    <span class="muComment"># slice = next-token(line, '-')</span>
<span id="L27" class="LineNr"> 27 </span>    <a href='../../124next-token.subx.html#L10'>next-token</a> line, <span class="Constant">0x2d</span>, slice
<span id="L28" class="LineNr"> 28 </span>    <span class="muComment"># pos1 = parse-int(slice)</span>
<span id="L29" class="LineNr"> 29 </span>    <span class="PreProc">var</span> _pos1/<span class="Constant">eax</span>: int <span class="SpecialChar">&lt;-</span> <a href='../../311decimal-int.subx.html#L4'>parse-decimal-int-from-slice</a> slice
<span id="L30" class="LineNr"> 30 </span>    <span class="PreProc">var</span> pos1/<span class="Constant">ebx</span>: int <span class="SpecialChar">&lt;-</span> copy _pos1
<span id="L31" class="LineNr"> 31 </span>    <span class="PreProc">var</span> dash/<span class="Constant">eax</span>: byte <span class="SpecialChar">&lt;-</span> <a href='../../112read-byte.subx.html#L273'>read-byte</a> line  <span class="muComment"># skip '-'</span>
<span id="L32" class="LineNr"> 32 </span>    <span class="muComment"># slice = next-token(line, ' ')</span>
<span id="L33" class="LineNr"> 33 </span>    <a href='../../124next-token.subx.html#L10'>next-token</a> line, <span class="Constant">0x20</span>, slice
<span id="L34" class="LineNr"> 34 </span>    <span class="PreProc">var</span> _pos2/<span class="Constant">eax</span>: int <span class="SpecialChar">&lt;-</span> <a href='../../311decimal-int.subx.html#L4'>parse-decimal-int-from-slice</a> slice
<span id="L35" class="LineNr"> 35 </span>    <span class="PreProc">var</span> pos2/<span class="Constant">esi</span>: int <span class="SpecialChar">&lt;-</span> copy _pos2
<span id="L36" class="LineNr"> 36 </span>    <a href='../../405screen.mu.html#L480'>print-int32-decimal</a> <span class="Constant">0</span>, pos1
<span id="L37" class="LineNr"> 37 </span>    <a href='../../405screen.mu.html#L169'>print-string</a> <span class="Constant">0</span>, <span class="Constant">&quot; &quot;</span>
<span id="L38" class="LineNr"> 38 </span>    <a href='../../405screen.mu.html#L480'>print-int32-decimal</a> <span class="Constant">0</span>, pos2
<span id="L39" class="LineNr"> 39 </span>    <a href='../../405screen.mu.html#L169'>print-string</a> <span class="Constant">0</span>, <span class="Constant">&quot;\n&quot;</span>
<span id="L40" class="LineNr"> 40 </span>    compare pos1, pos2
<span id="L41" class="LineNr"> 41 </span>    <span class="Delimiter">{</span>
<span id="L42" class="LineNr"> 42 </span>      <span class="PreProc">break-if-&lt;=</span>
<span id="L43" class="LineNr"> 43 </span>      <a href='../../405screen.mu.html#L169'>print-string</a> <span class="Constant">0</span>, <span class="Constant">&quot;out of order!\n&quot;</span>
<span id="L44" class="LineNr"> 44 </span>      <span class="PreProc">return</span> <span class="Constant">1</span>
<span id="L45" class="LineNr"> 45 </span>    <span class="Delimiter">}</span>
<span id="L46" class="LineNr"> 46 </span>    <span class="muComment"># letter = next non-space</span>
<span id="L47" class="LineNr"> 47 </span>    <a href='../../124next-token.subx.html#L464'>skip-chars-matching-whitespace</a> line
<span id="L48" class="LineNr"> 48 </span>    <span class="PreProc">var</span> letter/<span class="Constant">eax</span>: byte <span class="SpecialChar">&lt;-</span> <a href='../../112read-byte.subx.html#L273'>read-byte</a> line
<span id="L49" class="LineNr"> 49 </span>    <span class="muComment"># skip some stuff</span>
<span id="L50" class="LineNr"> 50 </span>    <span class="Delimiter">{</span>
<span id="L51" class="LineNr"> 51 </span>      <span class="PreProc">var</span> colon/<span class="Constant">eax</span>: byte <span class="SpecialChar">&lt;-</span> <a href='../../112read-byte.subx.html#L273'>read-byte</a> line  <span class="muComment"># skip ':'</span>
<span id="L52" class="LineNr"> 52 </span>    <span class="Delimiter">}</span>
<span id="L53" class="LineNr"> 53 </span>    <a href='../../124next-token.subx.html#L464'>skip-chars-matching-whitespace</a> line
<span id="L54" class="LineNr"> 54 </span>    <span class="muComment"># now check the rest of the line</span>
<span id="L55" class="LineNr"> 55 </span>    <span class="PreProc">var</span> is-valid?/<span class="Constant">eax</span>: boolean <span class="SpecialChar">&lt;-</span> is-valid? pos1, pos2, letter, line
<span id="L56" class="LineNr"> 56 </span>    compare is-valid?, <span class="Constant">0</span>  <span class="muComment"># false</span>
<span id="L57" class="LineNr"> 57 </span>    <span class="Delimiter">{</span>
<span id="L58" class="LineNr"> 58 </span>      <span class="PreProc">break-if-=</span>
<span id="L59" class="LineNr"> 59 </span>      <a href='../../405screen.mu.html#L169'>print-string</a> <span class="Constant">0</span>, <span class="Constant">&quot;valid!\n&quot;</span>
<span id="L60" class="LineNr"> 60 </span>      valid-password-count <span class="SpecialChar">&lt;-</span> increment
<span id="L61" class="LineNr"> 61 </span>    <span class="Delimiter">}</span>
<span id="L62" class="LineNr"> 62 </span>    <span class="PreProc">loop</span>
<span id="L63" class="LineNr"> 63 </span>  <span class="Delimiter">}</span>
<span id="L64" class="LineNr"> 64 </span>  <a href='../../405screen.mu.html#L480'>print-int32-decimal</a> <span class="Constant">0</span>, valid-password-count
<span id="L65" class="LineNr"> 65 </span>  <a href='../../405screen.mu.html#L169'>print-string</a> <span class="Constant">0</span>, <span class="Constant">&quot;\n&quot;</span>
<span id="L66" class="LineNr"> 66 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>
<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">}</span>
<span id="L68" class="LineNr"> 68 </span>
<span id="L69" class="LineNr"> 69 </span><span class="muComment"># ideally password would be a random-access array</span>
<span id="L70" class="LineNr"> 70 </span><span class="muComment"># we'll just track an index</span>
<span id="L71" class="LineNr"> 71 </span><span class="muComment"># one benefit: we can easily start at 1</span>
<span id="L72" class="LineNr"> 72 </span><span class="PreProc">fn</span> <span class="muFunction">is-valid?</span> pos1: int, pos2: int, letter: byte, password: (addr stream byte)<span class="PreProc"> -&gt; </span>_/<span class="Constant">eax</span>: boolean <span class="Delimiter">{</span>
<span id="L73" class="LineNr"> 73 </span>  <span class="PreProc">var</span> i/<span class="Constant">esi</span>: int <span class="SpecialChar">&lt;-</span> copy <span class="Constant">1</span>
<span id="L74" class="LineNr"> 74 </span>  <span class="PreProc">var</span> letter-count/<span class="Constant">edi</span>: int <span class="SpecialChar">&lt;-</span> copy <span class="Constant">0</span>
<span id="L75" class="LineNr"> 75 </span>  <span class="muComment"># while password stream isn't empty</span>
<span id="L76" class="LineNr"> 76 </span>  <span class="muComment">#   c = read byte from password</span>
<span id="L77" class="LineNr"> 77 </span>  <span class="muComment">#   if (c == letter)</span>
<span id="L78" class="LineNr"> 78 </span>  <span class="muComment">#     if (i == pos1)</span>
<span id="L79" class="LineNr"> 79 </span>  <span class="muComment">#       ++letter-count</span>
<span id="L80" class="LineNr"> 80 </span>  <span class="muComment">#     if (i == pos2)</span>
<span id="L81" class="LineNr"> 81 </span>  <span class="muComment">#       ++letter-count</span>
<span id="L82" class="LineNr"> 82 </span>  <span class="muComment">#     ++i</span>
<span id="L83" class="LineNr"> 83 </span>  <span class="Delimiter">{</span>
<span id="L84" class="LineNr"> 84 </span><span class="CommentedCode">#?     print-string 0, &quot;  &quot;</span>
<span id="L85" class="LineNr"> 85 </span><span class="CommentedCode">#?     print-int32-decimal 0, i</span>
<span id="L86" class="LineNr"> 86 </span><span class="CommentedCode">#?     print-string 0, &quot;\n&quot;</span>
<span id="L87" class="LineNr"> 87 </span>    <span class="PreProc">var</span> done?/<span class="Constant">eax</span>: boolean <span class="SpecialChar">&lt;-</span> <a href='../../309stream.subx.html#L6'>stream-empty?</a> password
<span id="L88" class="LineNr"> 88 </span>    compare done?, <span class="Constant">0</span>  <span class="muComment"># false</span>
<span id="L89" class="LineNr"> 89 </span>    <span class="PreProc">break-if-!=</span>
<span id="L90" class="LineNr"> 90 </span>    <span class="PreProc">var</span> c/<span class="Constant">eax</span>: byte <span class="SpecialChar">&lt;-</span> <a href='../../112read-byte.subx.html#L273'>read-byte</a> password
<span id="L91" class="LineNr"> 91 </span><span class="CommentedCode">#?     {</span>
<span id="L92" class="LineNr"> 92 </span><span class="CommentedCode">#?       var c2/eax: int &lt;- copy c</span>
<span id="L93" class="LineNr"> 93 </span><span class="CommentedCode">#?       print-int32-decimal 0, c2</span>
<span id="L94" class="LineNr"> 94 </span><span class="CommentedCode">#?       print-string 0, &quot;\n&quot;</span>
<span id="L95" class="LineNr"> 95 </span><span class="CommentedCode">#?     }</span>
<span id="L96" class="LineNr"> 96 </span>    compare c, letter
<span id="L97" class="LineNr"> 97 </span>    <span class="Delimiter">{</span>
<span id="L98" class="LineNr"> 98 </span>      <span class="PreProc">break-if-!=</span>
<span id="L99" class="LineNr"> 99 </span>      compare i, pos1
<span id="L100" class="LineNr">100 </span>      <span class="Delimiter">{</span>
<span id="L101" class="LineNr">101 </span>        <span class="PreProc">break-if-!=</span>
<span id="L102" class="LineNr">102 </span>        letter-count <span class="SpecialChar">&lt;-</span> increment
<span id="L103" class="LineNr">103 </span><span class="CommentedCode">#?         print-string 0, &quot;  hit\n&quot;</span>
<span id="L104" class="LineNr">104 </span>      <span class="Delimiter">}</span>
<span id="L105" class="LineNr">105 </span>      compare i, pos2
<span id="L106" class="LineNr">106 </span>      <span class="Delimiter">{</span>
<span id="L107" class="LineNr">107 </span>        <span class="PreProc">break-if-!=</span>
<span id="L108" class="LineNr">108 </span>        letter-count <span class="SpecialChar">&lt;-</span> increment
<span id="L109" class="LineNr">109 </span><span class="CommentedCode">#?         print-string 0, &quot;  hit\n&quot;</span>
<span id="L110" class="LineNr">110 </span>      <span class="Delimiter">}</span>
<span id="L111" class="LineNr">111 </span>    <span class="Delimiter">}</span>
<span id="L112" class="LineNr">112 </span>    i <span class="SpecialChar">&lt;-</span> increment
<span id="L113" class="LineNr">113 </span>    <span class="PreProc">loop</span>
<span id="L114" class="LineNr">114 </span>  <span class="Delimiter">}</span>
<span id="L115" class="LineNr">115 </span>  <span class="muComment"># return (letter-count == 1)</span>
<span id="L116" class="LineNr">116 </span>  compare letter-count, <span class="Constant">1</span>
<span id="L117" class="LineNr">117 </span>  <span class="Delimiter">{</span>
<span id="L118" class="LineNr">118 </span>    <span class="PreProc">break-if-!=</span>
<span id="L119" class="LineNr">119 </span>    <span class="PreProc">return</span> <span class="Constant">1</span>  <span class="muComment"># true</span>
<span id="L120" class="LineNr">120 </span>  <span class="Delimiter">}</span>
<span id="L121" class="LineNr">121 </span>  <span class="PreProc">return</span> <span class="Constant">0</span>  <span class="muComment"># false</span>
<span id="L122" class="LineNr">122 </span><span class="Delimiter">}</span>
</pre>
</body>
</html>
<!-- vim: set foldmethod=manual : -->