diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2017-08-30 03:07:18 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2017-08-30 03:07:18 -0700 |
| commit | b74744cd5851e034a88d4a335b22a372ebb39237 (patch) | |
| tree | abfaa2047c44d2d15219f9c1882269194d79c54a | |
| parent | 0899b237b0923a07ecac16a9adf551921925c5a3 (diff) | |
| download | mu-b74744cd5851e034a88d4a335b22a372ebb39237.tar.gz | |
3985
| -rw-r--r-- | 071recipe.cc | 4 | ||||
| -rw-r--r-- | html/071recipe.cc.html | 232 |
2 files changed, 116 insertions, 120 deletions
diff --git a/071recipe.cc b/071recipe.cc index 9d77869d..a3a258c7 100644 --- a/071recipe.cc +++ b/071recipe.cc @@ -277,9 +277,7 @@ bool is_mu_recipe(const reagent& r) { if (!r.type) return false; if (r.type->atom) return r.type->name == "recipe-literal"; - if (!r.type->left->atom) return false; - if (r.type->left->name == "recipe") return true; - return false; + return r.type->left->atom && r.type->left->name == "recipe"; } :(scenario copy_typecheck_recipe_variable) diff --git a/html/071recipe.cc.html b/html/071recipe.cc.html index 4765419f..fec9a6f7 100644 --- a/html/071recipe.cc.html +++ b/html/071recipe.cc.html @@ -17,9 +17,9 @@ a:hover { text-decoration: underline; } * { font-size: 12pt; font-size: 1em; } .Constant { color: #00a0a0; } .muRecipe { color: #ff8700; } +.Special { color: #c00000; } .Conceal { color: #4e4e4e; } .SalientComment { color: #00ffff; } -.Special { color: #c00000; } .Comment { color: #9090ff; } .Comment a { color:#0000ee; text-decoration:underline; } .Delimiter { color: #800080; } @@ -341,122 +341,120 @@ if ('onhashchange' in window) { <span id="L277" class="LineNr">277 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> <span id="L278" class="LineNr">278 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span id="L279" class="LineNr">279 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> r<span class="Delimiter">.</span>type<span class="Delimiter">-></span>name == <span class="Constant">"recipe-literal"</span><span class="Delimiter">;</span> -<span id="L280" class="LineNr">280 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!r<span class="Delimiter">.</span>type<span class="Delimiter">-></span>left<span class="Delimiter">-></span>atom<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L281" class="LineNr">281 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">-></span>left<span class="Delimiter">-></span>name == <span class="Constant">"recipe"</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> -<span id="L282" class="LineNr">282 </span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span> -<span id="L284" class="LineNr">284 </span> -<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable)</span> -<span id="L286" class="LineNr">286 </span><span class="Special">% Hide_errors = true;</span> -<span id="L287" class="LineNr">287 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L288" class="LineNr">288 </span> <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># abc def</span> -<span id="L289" class="LineNr">289 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f <span class="Comment"># store literal in a matching variable</span> -<span id="L290" class="LineNr">290 </span> <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> boolean<span class="muRecipe"> -> </span>boolean<span class="Delimiter">)}</span><span class="Special"> <- </span>copy <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span> <span class="Comment"># mismatch between recipe variables</span> -<span id="L291" class="LineNr">291 </span>] -<span id="L292" class="LineNr">292 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -> </span>y:num [ -<span id="L293" class="LineNr">293 </span> local-scope -<span id="L294" class="LineNr">294 </span> load-ingredients -<span id="L295" class="LineNr">295 </span> y<span class="Special"> <- </span>copy x -<span id="L296" class="LineNr">296 </span>] -<span id="L297" class="LineNr">297 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '{1: (recipe number -> number)}' to '{2: (recipe boolean -> boolean)}'; types don't match</span> -<span id="L298" class="LineNr">298 </span> -<span id="L299" class="LineNr">299 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable_2)</span> -<span id="L300" class="LineNr">300 </span><span class="Special">% Hide_errors = true;</span> -<span id="L301" class="LineNr">301 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L302" class="LineNr">302 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f <span class="Comment"># mismatch with a recipe literal</span> -<span id="L303" class="LineNr">303 </span>] -<span id="L304" class="LineNr">304 </span><span class="muRecipe">def</span> f x:<span class="Normal">bool</span><span class="muRecipe"> -> </span>y:<span class="Normal">bool</span> [ -<span id="L305" class="LineNr">305 </span> local-scope -<span id="L306" class="LineNr">306 </span> load-ingredients -<span id="L307" class="LineNr">307 </span> y<span class="Special"> <- </span>copy x -<span id="L308" class="LineNr">308 </span>] -<span id="L309" class="LineNr">309 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy 'f' to '{1: (recipe number -> number)}'; types don't match</span> -<span id="L310" class="LineNr">310 </span> -<span id="L311" class="LineNr">311 </span><span class="Delimiter">:(before "End Matching Types For Literal(to)")</span> -<span id="L312" class="LineNr">312 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='071recipe.cc.html#L276'>is_mu_recipe</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L313" class="LineNr">313 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L314" class="LineNr">314 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"trying to store <a href='010vm.cc.html#L19'>recipe</a> "</span> << from<span class="Delimiter">.</span>name << <span class="Constant">" into "</span> << <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>to<span class="Delimiter">)</span> << <span class="Constant">" but there's no such recipe</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> -<span id="L315" class="LineNr">315 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L316" class="LineNr">316 </span> <span class="Delimiter">}</span> -<span id="L317" class="LineNr">317 </span> <span class="Normal">const</span> recipe& rrhs = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">);</span> -<span id="L318" class="LineNr">318 </span> <span class="Normal">const</span> recipe& rlhs = <a href='071recipe.cc.html#L207'>from_reagent</a><span class="Delimiter">(</span>to<span class="Delimiter">);</span> -<span id="L319" class="LineNr">319 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L320" class="LineNr">320 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> -<span id="L321" class="LineNr">321 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L322" class="LineNr">322 </span> <span class="Delimiter">}</span> -<span id="L323" class="LineNr">323 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>products<span class="Delimiter">));</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L324" class="LineNr">324 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> -<span id="L325" class="LineNr">325 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> -<span id="L326" class="LineNr">326 </span> <span class="Delimiter">}</span> -<span id="L327" class="LineNr">327 </span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> -<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span> -<span id="L329" class="LineNr">329 </span> -<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(scenario call_variable_compound_ingredient)</span> -<span id="L331" class="LineNr">331 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L332" class="LineNr">332 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f -<span id="L333" class="LineNr">333 </span> <span class="Constant">2</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span> -<span id="L334" class="LineNr">334 </span> <span class="Constant">3</span>:num<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -> </span>number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&:num -<span id="L335" class="LineNr">335 </span>] -<span id="L336" class="LineNr">336 </span><span class="muRecipe">def</span> f x:&:num<span class="muRecipe"> -> </span>y:num [ -<span id="L337" class="LineNr">337 </span> local-scope -<span id="L338" class="LineNr">338 </span> load-ingredients -<span id="L339" class="LineNr">339 </span> y<span class="Special"> <- </span>copy x -<span id="L340" class="LineNr">340 </span>] -<span id="L341" class="LineNr">341 </span>$error: <span class="Constant">0</span> -<span id="L342" class="LineNr">342 </span> -<span id="L343" class="LineNr">343 </span><span class="Comment">//: make sure we don't accidentally break on a function literal</span> -<span id="L344" class="LineNr">344 </span><span class="Delimiter">:(scenario jump_forbidden_on_recipe_literals)</span> -<span id="L345" class="LineNr">345 </span><span class="Special">% Hide_errors = true;</span> -<span id="L346" class="LineNr">346 </span><span class="muRecipe">def</span> foo [ -<span id="L347" class="LineNr">347 </span> local-scope -<span id="L348" class="LineNr">348 </span>] -<span id="L349" class="LineNr">349 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L350" class="LineNr">350 </span> local-scope -<span id="L351" class="LineNr">351 </span> <span class="Delimiter">{</span> -<span id="L352" class="LineNr">352 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span>-<span class="Normal">if</span> foo -<span id="L353" class="LineNr">353 </span> <span class="Delimiter">}</span> -<span id="L354" class="LineNr">354 </span>] -<span id="L355" class="LineNr">355 </span><span class="Comment"># error should be as if foo is not a recipe</span> -<span id="L356" class="LineNr">356 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'foo' in 'break-if foo'</span> -<span id="L357" class="LineNr">357 </span> -<span id="L358" class="LineNr">358 </span><span class="Delimiter">:(before "End JUMP_IF Checks")</span> -<span id="L359" class="LineNr">359 </span><a href='071recipe.cc.html#L363'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span> -<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(before "End JUMP_UNLESS Checks")</span> -<span id="L361" class="LineNr">361 </span><a href='071recipe.cc.html#L363'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span> -<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(code)</span> -<span id="L363" class="LineNr">363 </span><span class="Normal">void</span> <a href='071recipe.cc.html#L363'>check_for_recipe_literals</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction& inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe& caller<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L364" class="LineNr">364 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L365" class="LineNr">365 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='071recipe.cc.html#L276'>is_mu_recipe</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span> -<span id="L366" class="LineNr">366 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> << <span class="Constant">"missing type for '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string << <span class="Constant">"' in '"</span> << to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span> -<span id="L367" class="LineNr">367 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_present_in_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span> -<span id="L368" class="LineNr">368 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">" did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span> -<span id="L369" class="LineNr">369 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> -<span id="L370" class="LineNr">370 </span> <span class="Delimiter">}</span> -<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span> -<span id="L372" class="LineNr">372 </span> -<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(scenario load_ingredients_missing_error_3)</span> -<span id="L374" class="LineNr">374 </span><span class="Special">% Hide_errors = true;</span> -<span id="L375" class="LineNr">375 </span><span class="muRecipe">def</span> foo <span class="Delimiter">{</span>f: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> num<span class="muRecipe"> -> </span>num<span class="Delimiter">)}</span> [ -<span id="L376" class="LineNr">376 </span> local-scope -<span id="L377" class="LineNr">377 </span> <span class="Normal">b</span>:num<span class="Special"> <- </span>call f<span class="Delimiter">,</span> <span class="Constant">1</span> -<span id="L378" class="LineNr">378 </span>] -<span id="L379" class="LineNr">379 </span><span class="traceContains">+error: foo: missing type for 'f' in 'b:num <- call f, 1'</span> -<span id="L380" class="LineNr">380 </span><span class="traceContains">+error: did you forget 'load-ingredients'?</span> -<span id="L381" class="LineNr">381 </span> -<span id="L382" class="LineNr">382 </span><span class="Delimiter">:(before "End Mu Types Initialization")</span> -<span id="L383" class="LineNr">383 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">"function"</span><span class="Delimiter">,</span> <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Constant">"recipe"</span><span class="Delimiter">));</span> -<span id="L384" class="LineNr">384 </span> -<span id="L385" class="LineNr">385 </span><span class="Delimiter">:(scenario call_function)</span> -<span id="L386" class="LineNr">386 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L387" class="LineNr">387 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f -<span id="L388" class="LineNr">388 </span> <span class="Constant">2</span>:num<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -> </span>number<span class="Delimiter">)},</span> <span class="Constant">34</span> -<span id="L389" class="LineNr">389 </span>] -<span id="L390" class="LineNr">390 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -> </span>y:num [ -<span id="L391" class="LineNr">391 </span> local-scope -<span id="L392" class="LineNr">392 </span> load-ingredients -<span id="L393" class="LineNr">393 </span> y<span class="Special"> <- </span>copy x -<span id="L394" class="LineNr">394 </span>] -<span id="L395" class="LineNr">395 </span><span class="traceContains">+mem: storing 34 in location 2</span> +<span id="L280" class="LineNr">280 </span> <span class="Identifier">return</span> r<span class="Delimiter">.</span>type<span class="Delimiter">-></span>left<span class="Delimiter">-></span>atom && r<span class="Delimiter">.</span>type<span class="Delimiter">-></span>left<span class="Delimiter">-></span>name == <span class="Constant">"recipe"</span><span class="Delimiter">;</span> +<span id="L281" class="LineNr">281 </span><span class="Delimiter">}</span> +<span id="L282" class="LineNr">282 </span> +<span id="L283" class="LineNr">283 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable)</span> +<span id="L284" class="LineNr">284 </span><span class="Special">% Hide_errors = true;</span> +<span id="L285" class="LineNr">285 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L286" class="LineNr">286 </span> <span class="Constant">3</span>:num<span class="Special"> <- </span>copy <span class="Constant">34</span> <span class="Comment"># abc def</span> +<span id="L287" class="LineNr">287 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f <span class="Comment"># store literal in a matching variable</span> +<span id="L288" class="LineNr">288 </span> <span class="Delimiter">{</span><span class="Constant">2</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> boolean<span class="muRecipe"> -> </span>boolean<span class="Delimiter">)}</span><span class="Special"> <- </span>copy <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span> <span class="Comment"># mismatch between recipe variables</span> +<span id="L289" class="LineNr">289 </span>] +<span id="L290" class="LineNr">290 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -> </span>y:num [ +<span id="L291" class="LineNr">291 </span> local-scope +<span id="L292" class="LineNr">292 </span> load-ingredients +<span id="L293" class="LineNr">293 </span> y<span class="Special"> <- </span>copy x +<span id="L294" class="LineNr">294 </span>] +<span id="L295" class="LineNr">295 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy '{1: (recipe number -> number)}' to '{2: (recipe boolean -> boolean)}'; types don't match</span> +<span id="L296" class="LineNr">296 </span> +<span id="L297" class="LineNr">297 </span><span class="Delimiter">:(scenario copy_typecheck_recipe_variable_2)</span> +<span id="L298" class="LineNr">298 </span><span class="Special">% Hide_errors = true;</span> +<span id="L299" class="LineNr">299 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L300" class="LineNr">300 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f <span class="Comment"># mismatch with a recipe literal</span> +<span id="L301" class="LineNr">301 </span>] +<span id="L302" class="LineNr">302 </span><span class="muRecipe">def</span> f x:<span class="Normal">bool</span><span class="muRecipe"> -> </span>y:<span class="Normal">bool</span> [ +<span id="L303" class="LineNr">303 </span> local-scope +<span id="L304" class="LineNr">304 </span> load-ingredients +<span id="L305" class="LineNr">305 </span> y<span class="Special"> <- </span>copy x +<span id="L306" class="LineNr">306 </span>] +<span id="L307" class="LineNr">307 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: can't copy 'f' to '{1: (recipe number -> number)}'; types don't match</span> +<span id="L308" class="LineNr">308 </span> +<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(before "End Matching Types For Literal(to)")</span> +<span id="L310" class="LineNr">310 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='071recipe.cc.html#L276'>is_mu_recipe</a><span class="Delimiter">(</span>to<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L311" class="LineNr">311 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L312" class="LineNr">312 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">"trying to store <a href='010vm.cc.html#L19'>recipe</a> "</span> << from<span class="Delimiter">.</span>name << <span class="Constant">" into "</span> << <a href='028call_return.cc.html#L158'>to_string</a><span class="Delimiter">(</span>to<span class="Delimiter">)</span> << <span class="Constant">" but there's no such recipe</span><span class="cSpecial">\n</span><span class="Constant">"</span> << end<span class="Delimiter">();</span> +<span id="L313" class="LineNr">313 </span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L314" class="LineNr">314 </span> <span class="Delimiter">}</span> +<span id="L315" class="LineNr">315 </span> <span class="Normal">const</span> recipe& rrhs = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> from<span class="Delimiter">.</span>value<span class="Delimiter">);</span> +<span id="L316" class="LineNr">316 </span> <span class="Normal">const</span> recipe& rlhs = <a href='071recipe.cc.html#L207'>from_reagent</a><span class="Delimiter">(</span>to<span class="Delimiter">);</span> +<span id="L317" class="LineNr">317 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">));</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L318" class="LineNr">318 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> +<span id="L319" class="LineNr">319 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L320" class="LineNr">320 </span> <span class="Delimiter">}</span> +<span id="L321" class="LineNr">321 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">long</span> <span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < min<span class="Delimiter">(</span><a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">),</span> <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>rrhs<span class="Delimiter">.</span>products<span class="Delimiter">));</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L322" class="LineNr">322 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!types_match<span class="Delimiter">(</span>rlhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> rrhs<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> +<span id="L323" class="LineNr">323 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">return</span> <span class="Constant">false</span><span class="Delimiter">;</span> +<span id="L324" class="LineNr">324 </span> <span class="Delimiter">}</span> +<span id="L325" class="LineNr">325 </span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span> +<span id="L326" class="LineNr">326 </span><span class="Delimiter">}</span> +<span id="L327" class="LineNr">327 </span> +<span id="L328" class="LineNr">328 </span><span class="Delimiter">:(scenario call_variable_compound_ingredient)</span> +<span id="L329" class="LineNr">329 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L330" class="LineNr">330 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f +<span id="L331" class="LineNr">331 </span> <span class="Constant">2</span>:&:num<span class="Special"> <- </span>copy <span class="Constant">0</span> +<span id="L332" class="LineNr">332 </span> <span class="Constant">3</span>:num<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> <span class="Delimiter">(</span><a href='043space.cc.html#L76'>address</a> number<span class="Delimiter">)</span><span class="muRecipe"> -> </span>number<span class="Delimiter">)},</span> <span class="Constant">2</span>:&:num +<span id="L333" class="LineNr">333 </span>] +<span id="L334" class="LineNr">334 </span><span class="muRecipe">def</span> f x:&:num<span class="muRecipe"> -> </span>y:num [ +<span id="L335" class="LineNr">335 </span> local-scope +<span id="L336" class="LineNr">336 </span> load-ingredients +<span id="L337" class="LineNr">337 </span> y<span class="Special"> <- </span>copy x +<span id="L338" class="LineNr">338 </span>] +<span id="L339" class="LineNr">339 </span>$error: <span class="Constant">0</span> +<span id="L340" class="LineNr">340 </span> +<span id="L341" class="LineNr">341 </span><span class="Comment">//: make sure we don't accidentally break on a function literal</span> +<span id="L342" class="LineNr">342 </span><span class="Delimiter">:(scenario jump_forbidden_on_recipe_literals)</span> +<span id="L343" class="LineNr">343 </span><span class="Special">% Hide_errors = true;</span> +<span id="L344" class="LineNr">344 </span><span class="muRecipe">def</span> foo [ +<span id="L345" class="LineNr">345 </span> local-scope +<span id="L346" class="LineNr">346 </span>] +<span id="L347" class="LineNr">347 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L348" class="LineNr">348 </span> local-scope +<span id="L349" class="LineNr">349 </span> <span class="Delimiter">{</span> +<span id="L350" class="LineNr">350 </span> <span class="Conceal">¦</span> <span class="Identifier">break</span>-<span class="Normal">if</span> foo +<span id="L351" class="LineNr">351 </span> <span class="Delimiter">}</span> +<span id="L352" class="LineNr">352 </span>] +<span id="L353" class="LineNr">353 </span><span class="Comment"># error should be as if foo is not a recipe</span> +<span id="L354" class="LineNr">354 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'foo' in 'break-if foo'</span> +<span id="L355" class="LineNr">355 </span> +<span id="L356" class="LineNr">356 </span><span class="Delimiter">:(before "End JUMP_IF Checks")</span> +<span id="L357" class="LineNr">357 </span><a href='071recipe.cc.html#L361'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span> +<span id="L358" class="LineNr">358 </span><span class="Delimiter">:(before "End JUMP_UNLESS Checks")</span> +<span id="L359" class="LineNr">359 </span><a href='071recipe.cc.html#L361'>check_for_recipe_literals</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span> +<span id="L360" class="LineNr">360 </span><span class="Delimiter">:(code)</span> +<span id="L361" class="LineNr">361 </span><span class="Normal">void</span> <a href='071recipe.cc.html#L361'>check_for_recipe_literals</a><span class="Delimiter">(</span><span class="Normal">const</span> instruction& inst<span class="Delimiter">,</span> <span class="Normal">const</span> recipe& caller<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L362" class="LineNr">362 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span> i < <a href='001help.cc.html#L141'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L363" class="LineNr">363 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='071recipe.cc.html#L276'>is_mu_recipe</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)))</span> <span class="Delimiter">{</span> +<span id="L364" class="LineNr">364 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> << <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>name<span class="Delimiter">)</span> << <span class="Constant">"missing type for '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string << <span class="Constant">"' in '"</span> << to_original_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> << <span class="Constant">"'</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span> +<span id="L365" class="LineNr">365 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>is_present_in_ingredients<span class="Delimiter">(</span>caller<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>name<span class="Delimiter">))</span> +<span id="L366" class="LineNr">366 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L168'>raise</a> << <span class="Constant">" did you forget 'load-ingredients'?</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L197'>end</a><span class="Delimiter">();</span> +<span id="L367" class="LineNr">367 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> +<span id="L368" class="LineNr">368 </span> <span class="Delimiter">}</span> +<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span> +<span id="L370" class="LineNr">370 </span> +<span id="L371" class="LineNr">371 </span><span class="Delimiter">:(scenario load_ingredients_missing_error_3)</span> +<span id="L372" class="LineNr">372 </span><span class="Special">% Hide_errors = true;</span> +<span id="L373" class="LineNr">373 </span><span class="muRecipe">def</span> foo <span class="Delimiter">{</span>f: <span class="Delimiter">(</span><a href='010vm.cc.html#L19'>recipe</a> num<span class="muRecipe"> -> </span>num<span class="Delimiter">)}</span> [ +<span id="L374" class="LineNr">374 </span> local-scope +<span id="L375" class="LineNr">375 </span> <span class="Normal">b</span>:num<span class="Special"> <- </span>call f<span class="Delimiter">,</span> <span class="Constant">1</span> +<span id="L376" class="LineNr">376 </span>] +<span id="L377" class="LineNr">377 </span><span class="traceContains">+error: foo: missing type for 'f' in 'b:num <- call f, 1'</span> +<span id="L378" class="LineNr">378 </span><span class="traceContains">+error: did you forget 'load-ingredients'?</span> +<span id="L379" class="LineNr">379 </span> +<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before "End Mu Types Initialization")</span> +<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Type_abbreviations<span class="Delimiter">,</span> <span class="Constant">"function"</span><span class="Delimiter">,</span> <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span><span class="Constant">"recipe"</span><span class="Delimiter">));</span> +<span id="L382" class="LineNr">382 </span> +<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario call_function)</span> +<span id="L384" class="LineNr">384 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L385" class="LineNr">385 </span> <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -> </span>number<span class="Delimiter">)}</span><span class="Special"> <- </span>copy f +<span id="L386" class="LineNr">386 </span> <span class="Constant">2</span>:num<span class="Special"> <- </span>call <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>function number<span class="muRecipe"> -> </span>number<span class="Delimiter">)},</span> <span class="Constant">34</span> +<span id="L387" class="LineNr">387 </span>] +<span id="L388" class="LineNr">388 </span><span class="muRecipe">def</span> f x:num<span class="muRecipe"> -> </span>y:num [ +<span id="L389" class="LineNr">389 </span> local-scope +<span id="L390" class="LineNr">390 </span> load-ingredients +<span id="L391" class="LineNr">391 </span> y<span class="Special"> <- </span>copy x +<span id="L392" class="LineNr">392 </span>] +<span id="L393" class="LineNr">393 </span><span class="traceContains">+mem: storing 34 in location 2</span> </pre> </body> </html> |