akkartik/mu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

3839

Browse Source 
Fix CI.

In the process I also fixed a bug in the tangle/ utility.
This commit is contained in:
Kartik K. Agaram 2017-04-20 12:44:38 -07:00
parent b7df1a7aab
commit 84537b81bd
6 changed files with 1071 additions and 1050 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
054static_dispatch.cc
View File

@ -576,7 +576,7 @@ string header_label(const recipe& caller) {
string original_header_label(const recipe& caller) {
ostringstream out;
out << "recipe " << caller.original_name;
out << "recipe " << caller.name;
for (int i = 0; i < SIZE(caller.ingredients); ++i)
out << ' ' << caller.ingredients.at(i).original_string;
if (!caller.products.empty()) out << " ->";

2
056shape_shifting_recipe.cc
View File

@ -52,6 +52,8 @@ string original_name;
//: original name is only set during load
:(before "End Load Recipe Name")
result.original_name = result.name;
:(replace "out << \"recipe \" << caller.name;" following "string original_header_label(const recipe& caller)")
out << "recipe " << caller.original_name;
:(after "Static Dispatch Phase 3")
candidates = strictly_matching_shape_shifting_variants(inst, variants);

2
html/054static_dispatch.cc.html
View File

@ -641,7 +641,7 @@ if ('onhashchange' in window) {
<span id="L576" class="LineNr">576 </span>
<span id="L577" class="LineNr">577 </span>string <a href='054static_dispatch.cc.html#L577'>original_header_label</a><span class="Delimiter">(</span><span class="Normal">const</span> recipe&amp; caller<span class="Delimiter">)</span> <span class="Delimiter">{</span>
<span id="L578" class="LineNr">578 </span> ostringstream out<span class="Delimiter">;</span>
<span id="L579" class="LineNr">579 </span> out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>original_name<span class="Delimiter">;</span>
<span id="L579" class="LineNr">579 </span> out &lt;&lt; <span class="Constant">&quot;recipe &quot;</span> &lt;&lt; caller<span class="Delimiter">.</span>name<span class="Delimiter">;</span>
<span id="L580" class="LineNr">580 </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 &lt; <a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">);</span> ++i<span class="Delimiter">)</span>
<span id="L581" class="LineNr">581 </span> <span class="Conceal">¦</span> out &lt;&lt; <span class="Constant">' '</span> &lt;&lt; caller<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>original_string<span class="Delimiter">;</span>
<span id="L582" class="LineNr">582 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>!caller<span class="Delimiter">.</span>products<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> out &lt;&lt; <span class="Constant">&quot; -&gt;&quot;</span><span class="Delimiter">;</span>

2092
html/056shape_shifting_recipe.cc.html
View File

File diff suppressed because it is too large Load Diff

9
tangle/003tangle.cc
View File

@ -251,10 +251,13 @@ void slurp_tangle_string(istream& in, ostream& out) {
in.get();
char c;
while (in >> c) {
if (c == '\\') // only works for double-quotes
if (c == '\\') {
// skip backslash and save next character unconditionally
in >> c;
out << c;
continue;
if (c == '"')
break;
}
if (c == '"') break;
out << c;
}
}

14
tangle/003tangle.test.cc
View File

@ -76,6 +76,20 @@ void test_tangle_with_tanglecomments_inside_directive() {
CHECK_TRACE_DOESNT_CONTAIN("tangle", "//: 1");
}
void test_tangle_with_multiword_directives() {
istringstream in("a b\nc\n:(after \"a b\")\nd\n");
list<Line> dummy;
tangle(in, dummy);
CHECK_TRACE_CONTENTS("tangle", "a bdc");
}
void test_tangle_with_quoted_multiword_directives() {
istringstream in("a \"b\"\nc\n:(after \"a \\\"b\\\"\")\nd\n");
list<Line> dummy;
tangle(in, dummy);
CHECK_TRACE_CONTENTS("tangle", "a \"b\"dc");
}
void test_tangle2() {
istringstream in("a\nb\nc\n:(after b)\nd\n");
list<Line> dummy;