diff options
| author | Kartik Agaram <vc@akkartik.com> | 2018-12-01 14:13:33 -0800 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2018-12-01 14:13:33 -0800 |
| commit | e4ac3c9e6e5464a0fc0f8fd3763a572e0e180c04 (patch) | |
| tree | 7f6ca26afcdf8e3bf54459c6592ebf26fb968133 /html/052tangle.cc.html | |
| parent | 54e5128a14dcea5b93a8a9402558f0736fb7dba3 (diff) | |
| download | mu-e4ac3c9e6e5464a0fc0f8fd3763a572e0e180c04.tar.gz | |
4814
Diffstat (limited to 'html/052tangle.cc.html')
| -rw-r--r-- | html/052tangle.cc.html | 95 |
1 files changed, 49 insertions, 46 deletions
diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html index 54968c93..ab68c1f3 100644 --- a/html/052tangle.cc.html +++ b/html/052tangle.cc.html @@ -11,21 +11,23 @@ <style type="text/css"> <!-- pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; } -body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; } -a { color:#eeeeee; text-decoration: none; } -a:hover { text-decoration: underline; } -* { font-size: 12pt; font-size: 1em; } +body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; } +.subxS2Comment a { color:inherit; } +.subxS1Comment a { color:inherit; } +.subxComment a { color:inherit; } +.subxH2Comment a { color:inherit; } +.subxH1Comment a { color:inherit; } +* { font-size:12pt; font-size: 1em; } .cSpecial { color: #008000; } -.LineNr { color: #444444; } +.LineNr { color:#444444; } .traceAbsent { color: #c00000; } -.Constant { color: #00a0a0; } +.Constant { color:#00a0a0; } .muRecipe { color: #ff8700; } -.Delimiter { color: #800080; } -.Special { color: #c00000; } -.Identifier { color: #c0a020; } +.Delimiter { color:#800080; } +.Special { color:#c00000; } +.Identifier { color:#c0a020; } .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; } -.Comment { color: #9090ff; } -.Comment a { color:#0000ee; text-decoration:underline; } +.Comment { color: #8080ff; } .traceContains { color: #008000; } --> </style> @@ -60,6 +62,7 @@ if ('onhashchange' in window) { </script> </head> <body onload='JumpToLine();'> +<a href='https://github.com/akkartik/mu/blob/master/052tangle.cc'>https://github.com/akkartik/mu/blob/master/052tangle.cc</a> <pre id='vimCodeElement'> <span id="L1" class="LineNr"> 1 </span><span class="Comment">//: Allow code for recipes to be pulled in from multiple places and inserted</span> <span id="L2" class="LineNr"> 2 </span><span class="Comment">//: at special labels called 'waypoints' using two new top-level commands:</span> @@ -95,25 +98,25 @@ if ('onhashchange' in window) { <span id="L32" class="LineNr"> 32 </span><span class="Comment">//: while loading recipes, load before/after fragments</span> <span id="L33" class="LineNr"> 33 </span> <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L35" class="LineNr"> 35 </span>map<string <span class="Comment">/*</span><span class="Comment">label</span><span class="Comment">*/</span><span class="Delimiter">,</span> recipe> Before_fragments<span class="Delimiter">,</span> After_fragments<span class="Delimiter">;</span> -<span id="L36" class="LineNr"> 36 </span>set<string <span class="Comment">/*</span><span class="Comment">label</span><span class="Comment">*/</span>> Fragments_used<span class="Delimiter">;</span> +<span id="L35" class="LineNr"> 35 </span>map<string <span class="Comment">/*</span><span class="Comment">label</span><span class="Comment">*/</span><span class="Delimiter">,</span> recipe> <span class="Special">Before_fragments</span><span class="Delimiter">,</span> <span class="Special">After_fragments</span><span class="Delimiter">;</span> +<span id="L36" class="LineNr"> 36 </span>set<string <span class="Comment">/*</span><span class="Comment">label</span><span class="Comment">*/</span>> <span class="Special">Fragments_used</span><span class="Delimiter">;</span> <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">:(before "End Reset")</span> -<span id="L38" class="LineNr"> 38 </span>Before_fragments<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> -<span id="L39" class="LineNr"> 39 </span>After_fragments<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> -<span id="L40" class="LineNr"> 40 </span>Fragments_used<span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L38" class="LineNr"> 38 </span><span class="Special">Before_fragments</span><span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L39" class="LineNr"> 39 </span><span class="Special">After_fragments</span><span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> +<span id="L40" class="LineNr"> 40 </span><span class="Special">Fragments_used</span><span class="Delimiter">.</span><a href='050scenario.cc.html#L60'>clear</a><span class="Delimiter">();</span> <span id="L41" class="LineNr"> 41 </span> <span id="L42" class="LineNr"> 42 </span><span class="Delimiter">:(before "End Command Handlers")</span> <span id="L43" class="LineNr"> 43 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>command == <span class="Constant">"before"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> <span id="L44" class="LineNr"> 44 </span> string label = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L45" class="LineNr"> 45 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L46" class="LineNr"> 46 </span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span> -<span id="L47" class="LineNr"> 47 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"incomplete 'before' block at <a href='003trace.cc.html#L225'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> +<span id="L47" class="LineNr"> 47 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"incomplete 'before' block at <a href='003trace.cc.html#L225'>end</a> of file\n"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> <span id="L48" class="LineNr"> 48 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L49" class="LineNr"> 49 </span> <span class="Delimiter">}</span> <span id="L50" class="LineNr"> 50 </span> <a href='010vm.cc.html#L19'>recipe</a> tmp<span class="Delimiter">;</span> <span id="L51" class="LineNr"> 51 </span> <a href='011load.cc.html#L83'>slurp_body</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span> <span id="L52" class="LineNr"> 52 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='052tangle.cc.html#L13'>is_waypoint</a><span class="Delimiter">(</span>label<span class="Delimiter">))</span> -<span id="L53" class="LineNr"> 53 </span> Before_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>Before_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span> +<span id="L53" class="LineNr"> 53 </span> <span class="Special">Before_fragments</span>[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Special">Before_fragments</span>[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span> <span id="L54" class="LineNr"> 54 </span> <span class="Normal">else</span> <span id="L55" class="LineNr"> 55 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"can't tangle before non-waypoint "</span> << label << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L56" class="LineNr"> 56 </span> <span class="Comment">// End before Command Handler</span> @@ -122,13 +125,13 @@ if ('onhashchange' in window) { <span id="L59" class="LineNr"> 59 </span> string label = <a href='011load.cc.html#L169'>next_word</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span> <span id="L60" class="LineNr"> 60 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>label<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span> <span id="L61" class="LineNr"> 61 </span> assert<span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">));</span> -<span id="L62" class="LineNr"> 62 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"incomplete 'after' block at <a href='003trace.cc.html#L225'>end</a> of file</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> +<span id="L62" class="LineNr"> 62 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"incomplete 'after' block at <a href='003trace.cc.html#L225'>end</a> of file\n"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> <span id="L63" class="LineNr"> 63 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> <span id="L64" class="LineNr"> 64 </span> <span class="Delimiter">}</span> <span id="L65" class="LineNr"> 65 </span> <a href='010vm.cc.html#L19'>recipe</a> tmp<span class="Delimiter">;</span> <span id="L66" class="LineNr"> 66 </span> <a href='011load.cc.html#L83'>slurp_body</a><span class="Delimiter">(</span>in<span class="Delimiter">,</span> tmp<span class="Delimiter">);</span> <span id="L67" class="LineNr"> 67 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='052tangle.cc.html#L13'>is_waypoint</a><span class="Delimiter">(</span>label<span class="Delimiter">))</span> -<span id="L68" class="LineNr"> 68 </span> After_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>After_fragments[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span> +<span id="L68" class="LineNr"> 68 </span> <span class="Special">After_fragments</span>[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>insert<span class="Delimiter">(</span><span class="Special">After_fragments</span>[label]<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> tmp<span class="Delimiter">.</span>steps<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">());</span> <span id="L69" class="LineNr"> 69 </span> <span class="Normal">else</span> <span id="L70" class="LineNr"> 70 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"can't tangle after non-waypoint "</span> << label << <span class="cSpecial">'\n'</span> << end<span class="Delimiter">();</span> <span id="L71" class="LineNr"> 71 </span> <span class="Comment">// End after Command Handler</span> @@ -137,7 +140,7 @@ if ('onhashchange' in window) { <span id="L74" class="LineNr"> 74 </span><span class="Comment">//: after all recipes are loaded, insert fragments at appropriate labels.</span> <span id="L75" class="LineNr"> 75 </span> <span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(after "Begin Instruction Inserting/Deleting Transforms")</span> -<span id="L77" class="LineNr"> 77 </span>Transform<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>insert_fragments<span class="Delimiter">);</span> <span class="Comment">// NOT idempotent</span> +<span id="L77" class="LineNr"> 77 </span><span class="Special">Transform</span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>insert_fragments<span class="Delimiter">);</span> <span class="Comment">// NOT idempotent</span> <span id="L78" class="LineNr"> 78 </span> <span id="L79" class="LineNr"> 79 </span><span class="Comment">//: We might need to perform multiple passes, in case inserted fragments</span> <span id="L80" class="LineNr"> 80 </span><span class="Comment">//: include more labels that need further insertions. Track which labels we've</span> @@ -149,7 +152,7 @@ if ('onhashchange' in window) { <span id="L86" class="LineNr"> 86 </span> <span id="L87" class="LineNr"> 87 </span><span class="Delimiter">:(code)</span> <span id="L88" class="LineNr"> 88 </span><span class="Normal">void</span> insert_fragments<span class="Delimiter">(</span><span class="Normal">const</span> <a href='010vm.cc.html#L14'>recipe_ordinal</a> r<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L89" class="LineNr"> 89 </span> insert_fragments<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">));</span> +<span id="L89" class="LineNr"> 89 </span> insert_fragments<span class="Delimiter">(</span>get<span class="Delimiter">(</span><span class="Special">Recipe</span><span class="Delimiter">,</span> r<span class="Delimiter">));</span> <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span> <span id="L91" class="LineNr"> 91 </span> <span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> insert_fragments<span class="Delimiter">(</span>recipe& r<span class="Delimiter">)</span> <span class="Delimiter">{</span> @@ -168,19 +171,19 @@ if ('onhashchange' in window) { <span id="L105" class="LineNr">105 </span> <span class="Delimiter">}</span> <span id="L106" class="LineNr">106 </span> inst<span class="Delimiter">.</span>tangle_done =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L107" class="LineNr">107 </span> made_progress =<span class="Constant"> true</span><span class="Delimiter">;</span> -<span id="L108" class="LineNr">108 </span> Fragments_used<span class="Delimiter">.</span>insert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>label<span class="Delimiter">);</span> +<span id="L108" class="LineNr">108 </span> <span class="Special">Fragments_used</span><span class="Delimiter">.</span>insert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span>label<span class="Delimiter">);</span> <span id="L109" class="LineNr">109 </span> ostringstream prefix<span class="Delimiter">;</span> <span id="L110" class="LineNr">110 </span> prefix << <span class="Constant">'+'</span> << r<span class="Delimiter">.</span>name << <span class="Constant">'_'</span> << pass << <span class="Constant">'_'</span> << i<span class="Delimiter">;</span> <span id="L111" class="LineNr">111 </span> <span class="Comment">// ok to use contains_key even though Before_fragments uses [],</span> <span id="L112" class="LineNr">112 </span> <span class="Comment">// because appending an empty recipe is a noop</span> -<span id="L113" class="LineNr">113 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Before_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L113" class="LineNr">113 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span><span class="Special">Before_fragments</span><span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L114" class="LineNr">114 </span> <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"insert fragments before label "</span> << inst<span class="Delimiter">.</span>label << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> -<span id="L115" class="LineNr">115 </span> <a href='052tangle.cc.html#L128'>append_fragment</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> Before_fragments[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span> +<span id="L115" class="LineNr">115 </span> <a href='052tangle.cc.html#L128'>append_fragment</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Special">Before_fragments</span>[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span> <span id="L116" class="LineNr">116 </span> <span class="Delimiter">}</span> <span id="L117" class="LineNr">117 </span> result<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>inst<span class="Delimiter">);</span> -<span id="L118" class="LineNr">118 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>After_fragments<span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span> +<span id="L118" class="LineNr">118 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span><span class="Special">After_fragments</span><span class="Delimiter">,</span> inst<span class="Delimiter">.</span>label<span class="Delimiter">))</span> <span class="Delimiter">{</span> <span id="L119" class="LineNr">119 </span> <a href='003trace.cc.html#L189'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">"transform"</span><span class="Delimiter">)</span> << <span class="Constant">"insert fragments after label "</span> << inst<span class="Delimiter">.</span>label << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> -<span id="L120" class="LineNr">120 </span> <a href='052tangle.cc.html#L128'>append_fragment</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> After_fragments[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span> +<span id="L120" class="LineNr">120 </span> <a href='052tangle.cc.html#L128'>append_fragment</a><span class="Delimiter">(</span>result<span class="Delimiter">,</span> <span class="Special">After_fragments</span>[inst<span class="Delimiter">.</span>label]<span class="Delimiter">.</span>steps<span class="Delimiter">,</span> prefix<span class="Delimiter">.</span>str<span class="Delimiter">());</span> <span id="L121" class="LineNr">121 </span> <span class="Delimiter">}</span> <span id="L122" class="LineNr">122 </span> <span class="Delimiter">}</span> <span id="L123" class="LineNr">123 </span> r<span class="Delimiter">.</span>steps<span class="Delimiter">.</span>swap<span class="Delimiter">(</span>result<span class="Delimiter">);</span> @@ -228,12 +231,12 @@ if ('onhashchange' in window) { <span id="L165" class="LineNr">165 </span><a href='052tangle.cc.html#L167'>check_insert_fragments</a><span class="Delimiter">();</span> <span id="L166" class="LineNr">166 </span><span class="Delimiter">:(code)</span> <span id="L167" class="LineNr">167 </span><span class="Normal">void</span> <a href='052tangle.cc.html#L167'>check_insert_fragments</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> -<span id="L168" class="LineNr">168 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> recipe>::iterator p = Before_fragments<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != Before_fragments<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L169" class="LineNr">169 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> p<span class="Delimiter">-></span>first<span class="Delimiter">))</span> +<span id="L168" class="LineNr">168 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> recipe>::iterator p = <span class="Special">Before_fragments</span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <span class="Special">Before_fragments</span><span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L169" class="LineNr">169 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special">Fragments_used</span><span class="Delimiter">,</span> p<span class="Delimiter">-></span>first<span class="Delimiter">))</span> <span id="L170" class="LineNr">170 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"could not locate insert before label "</span> << p<span class="Delimiter">-></span>first << <span class="cSpecial">'\n'</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> <span id="L171" class="LineNr">171 </span> <span class="Delimiter">}</span> -<span id="L172" class="LineNr">172 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> recipe>::iterator p = After_fragments<span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != After_fragments<span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L173" class="LineNr">173 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> p<span class="Delimiter">-></span>first<span class="Delimiter">))</span> +<span id="L172" class="LineNr">172 </span> <span class="Normal">for</span> <span class="Delimiter">(</span>map<string<span class="Delimiter">,</span> recipe>::iterator p = <span class="Special">After_fragments</span><span class="Delimiter">.</span>begin<span class="Delimiter">();</span> p != <span class="Special">After_fragments</span><span class="Delimiter">.</span><a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L173" class="LineNr">173 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special">Fragments_used</span><span class="Delimiter">,</span> p<span class="Delimiter">-></span>first<span class="Delimiter">))</span> <span id="L174" class="LineNr">174 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"could not locate insert after label "</span> << p<span class="Delimiter">-></span>first << <span class="cSpecial">'\n'</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> <span id="L175" class="LineNr">175 </span> <span class="Delimiter">}</span> <span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span> @@ -507,29 +510,29 @@ if ('onhashchange' in window) { <span id="L444" class="LineNr">444 </span><span class="Delimiter">:(code)</span> <span id="L445" class="LineNr">445 </span><span class="Normal">void</span> <a href='052tangle.cc.html#L445'>test_new_fragment_after_tangle</a><span class="Delimiter">()</span> <span class="Delimiter">{</span> <span id="L446" class="LineNr">446 </span> <span class="Comment">// define a recipe</span> -<span id="L447" class="LineNr">447 </span> load<span class="Delimiter">(</span><span class="Constant">"def foo [</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L448" class="LineNr">448 </span> <span class="Constant">" local-scope</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L449" class="LineNr">449 </span> <span class="Constant">" <label></span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L450" class="LineNr">450 </span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L451" class="LineNr">451 </span> <span class="Constant">"after <label> [</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L452" class="LineNr">452 </span> <span class="Constant">" 1:num/raw <- copy 34</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L453" class="LineNr">453 </span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> +<span id="L447" class="LineNr">447 </span> load<span class="Delimiter">(</span><span class="Constant">"def foo [\n"</span> +<span id="L448" class="LineNr">448 </span> <span class="Constant">" local-scope\n"</span> +<span id="L449" class="LineNr">449 </span> <span class="Constant">" <label>\n"</span> +<span id="L450" class="LineNr">450 </span> <span class="Constant">"]\n"</span> +<span id="L451" class="LineNr">451 </span> <span class="Constant">"after <label> [\n"</span> +<span id="L452" class="LineNr">452 </span> <span class="Constant">" 1:num/raw <- copy 34\n"</span> +<span id="L453" class="LineNr">453 </span> <span class="Constant">"]\n"</span><span class="Delimiter">);</span> <span id="L454" class="LineNr">454 </span> <a href='012transform.cc.html#L46'>transform_all</a><span class="Delimiter">();</span> <span id="L455" class="LineNr">455 </span> <a href='003trace.cc.html#L256'>CHECK_TRACE_DOESNT_CONTAIN_ERRORS</a><span class="Delimiter">();</span> -<span id="L456" class="LineNr">456 </span> Hide_errors =<span class="Constant"> true</span><span class="Delimiter">;</span> +<span id="L456" class="LineNr">456 </span> <span class="Special">Hide_errors</span> =<span class="Constant"> true</span><span class="Delimiter">;</span> <span id="L457" class="LineNr">457 </span> <span class="Comment">// try to tangle into recipe foo after transform</span> -<span id="L458" class="LineNr">458 </span> load<span class="Delimiter">(</span><span class="Constant">"before <label> [</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L459" class="LineNr">459 </span> <span class="Constant">" 2:num/raw <- copy 35</span><span class="cSpecial">\n</span><span class="Constant">"</span> -<span id="L460" class="LineNr">460 </span> <span class="Constant">"]</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">);</span> +<span id="L458" class="LineNr">458 </span> load<span class="Delimiter">(</span><span class="Constant">"before <label> [\n"</span> +<span id="L459" class="LineNr">459 </span> <span class="Constant">" 2:num/raw <- copy 35\n"</span> +<span id="L460" class="LineNr">460 </span> <span class="Constant">"]\n"</span><span class="Delimiter">);</span> <span id="L461" class="LineNr">461 </span> <a href='003trace.cc.html#L255'>CHECK_TRACE_CONTAINS_ERRORS</a><span class="Delimiter">();</span> <span id="L462" class="LineNr">462 </span><span class="Delimiter">}</span> <span id="L463" class="LineNr">463 </span> <span id="L464" class="LineNr">464 </span><span class="Delimiter">:(before "End before Command Handler")</span> -<span id="L465" class="LineNr">465 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> label<span class="Delimiter">))</span> -<span id="L466" class="LineNr">466 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"we've already tangled some code at label "</span> << label << <span class="Constant">" in a previous call to transform_all(). Those locations won't be updated.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> +<span id="L465" class="LineNr">465 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span><span class="Special">Fragments_used</span><span class="Delimiter">,</span> label<span class="Delimiter">))</span> +<span id="L466" class="LineNr">466 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"we've already tangled some code at label "</span> << label << <span class="Constant">" in a previous call to transform_all(). Those locations won't be updated.\n"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> <span id="L467" class="LineNr">467 </span><span class="Delimiter">:(before "End after Command Handler")</span> -<span id="L468" class="LineNr">468 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span>Fragments_used<span class="Delimiter">,</span> label<span class="Delimiter">))</span> -<span id="L469" class="LineNr">469 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"we've already tangled some code at label "</span> << label << <span class="Constant">" in a previous call to transform_all(). Those locations won't be updated.</span><span class="cSpecial">\n</span><span class="Constant">"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> +<span id="L468" class="LineNr">468 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L226'>contains_key</a><span class="Delimiter">(</span><span class="Special">Fragments_used</span><span class="Delimiter">,</span> label<span class="Delimiter">))</span> +<span id="L469" class="LineNr">469 </span> <a href='003trace.cc.html#L196'>raise</a> << <span class="Constant">"we've already tangled some code at label "</span> << label << <span class="Constant">" in a previous call to transform_all(). Those locations won't be updated.\n"</span> << <a href='003trace.cc.html#L225'>end</a><span class="Delimiter">();</span> </pre> </body> </html> |