diff options
-rw-r--r-- | 013update_operation.cc | 4 | ||||
-rw-r--r-- | 038new_text.cc | 2 | ||||
-rw-r--r-- | html/013update_operation.cc.html | 4 | ||||
-rw-r--r-- | html/038new_text.cc.html | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/013update_operation.cc b/013update_operation.cc index 806f69c2..0468e80d 100644 --- a/013update_operation.cc +++ b/013update_operation.cc @@ -13,7 +13,7 @@ void update_instruction_operations(const recipe_ordinal r) { instruction& inst = caller.steps.at(index); if (inst.is_label) continue; if (!contains_key(Recipe_ordinal, inst.name)) { - raise << maybe(caller.name) << "instruction '" << inst.name << "' has no recipe\n" << end(); + raise << maybe(caller.name) << "instruction '" << inst.name << "' has no recipe in '" << to_original_string(inst) << "'\n" << end(); continue; } inst.operation = get(Recipe_ordinal, inst.name); @@ -32,4 +32,4 @@ string maybe(string s) { def main [ 1:number , copy 0 # typo: ',' instead of '<-' ] -+error: main: instruction '1:number' has no recipe ++error: main: instruction '1:number' has no recipe in '1:number copy, 0' diff --git a/038new_text.cc b/038new_text.cc index d65ac63d..d6019e5e 100644 --- a/038new_text.cc +++ b/038new_text.cc @@ -69,7 +69,7 @@ int new_mu_text(const string& contents) { def main [ [abc] ] -+error: main: instruction '[abc]' has no recipe ++error: main: instruction '[abc]' has no recipe in '[abc] ' //: stash recognizes strings diff --git a/html/013update_operation.cc.html b/html/013update_operation.cc.html index 044050ad..437ffbd7 100644 --- a/html/013update_operation.cc.html +++ b/html/013update_operation.cc.html @@ -77,7 +77,7 @@ if ('onhashchange' in window) { <span id="L13" class="LineNr">13 </span> <span class="Conceal">¦</span> instruction& inst = caller<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>index<span class="Delimiter">);</span> <span id="L14" class="LineNr">14 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>is_label<span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L15" class="LineNr">15 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">))</span> <span class="Delimiter">{</span> -<span id="L16" class="LineNr">16 </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">"instruction '"</span> << inst<span class="Delimiter">.</span>name << <span class="Constant">"' has no <a href='010vm.cc.html#L19'>recipe</a></span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L16" class="LineNr">16 </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">"instruction '"</span> << inst<span class="Delimiter">.</span>name << <span class="Constant">"' has no <a href='010vm.cc.html#L19'>recipe</a> 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#L185'>end</a><span class="Delimiter">();</span> <span id="L17" class="LineNr">17 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L18" class="LineNr">18 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> <span id="L19" class="LineNr">19 </span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>operation = get<span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>name<span class="Delimiter">);</span> @@ -96,7 +96,7 @@ if ('onhashchange' in window) { <span id="L32" class="LineNr">32 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L33" class="LineNr">33 </span> <span class="Constant">1</span>:number <span class="Delimiter">,</span> copy <span class="Constant">0</span> <span class="Comment"># typo: ',' instead of '<-'</span> <span id="L34" class="LineNr">34 </span>] -<span id="L35" class="LineNr">35 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: <a href='010vm.cc.html#L32'>instruction</a> '1:number' has no <a href='010vm.cc.html#L19'>recipe</a></span> +<span id="L35" class="LineNr">35 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: <a href='010vm.cc.html#L32'>instruction</a> '1:number' has no <a href='010vm.cc.html#L19'>recipe</a> in '1:number copy, 0'</span> </pre> </body> </html> diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html index f676f23c..d28cf8c8 100644 --- a/html/038new_text.cc.html +++ b/html/038new_text.cc.html @@ -134,7 +134,7 @@ if ('onhashchange' in window) { <span id="L69" class="LineNr"> 69 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ <span id="L70" class="LineNr"> 70 </span> [abc] <span id="L71" class="LineNr"> 71 </span>] -<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: <a href='010vm.cc.html#L32'>instruction</a> '[abc]' has no <a href='010vm.cc.html#L19'>recipe</a></span> +<span id="L72" class="LineNr"> 72 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: <a href='010vm.cc.html#L32'>instruction</a> '[abc]' has no <a href='010vm.cc.html#L19'>recipe</a> in '[abc] '</span> <span id="L73" class="LineNr"> 73 </span> <span id="L74" class="LineNr"> 74 </span><span class="Comment">//: stash recognizes strings</span> <span id="L75" class="LineNr"> 75 </span> |