From 00c2ca083e004e9fdf3176f3362fd3b1091370ae Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Wed, 25 Jul 2018 15:26:58 -0700 Subject: 4406 Fix CI. --- tangle/003tangle.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tangle/003tangle.cc') diff --git a/tangle/003tangle.cc b/tangle/003tangle.cc index 384af5e6..bcb3c315 100644 --- a/tangle/003tangle.cc +++ b/tangle/003tangle.cc @@ -296,11 +296,14 @@ list::iterator balancing_curly(list::iterator curr) { // one or more lines of escaped setup in C/C++ ('%') // followed by one or more lines of input, // followed optionally by (in order): -// one or more lines expected in trace in order ('+') -// one or more lines trace shouldn't include ('-') +// one or more lines expected in trace in order ('+') and one or more lines trace shouldn't include ('-') // one or more lines expressing counts of specific layers emitted in trace ('$') // a directive to print the trace just for debugging ('?') // Remember to update is_input below if you add to this format. +// +// Allowing interleaving of '+' and '-' lines is a kludgy way to indicate that +// two sets of trace lines can occur in any order. We should come up with a +// better way to specify order-independence. void emit_test(const string& name, list& lines, list& result) { result.push_back(Line("void test_"+name+"() {", front(lines).filename, front(lines).line_number-1)); // use line number of directive //? result.push_back("cerr << \""+name+"\\n\";"); // debug: uncomment this to print scenario names as you run them @@ -343,6 +346,7 @@ bool is_input(const string& line) { void emit_input_lines(list& hunk, list& out) { assert(!hunk.empty()); + if (!is_input(front(hunk).contents)) return; Line curr_out; curr_out.line_number = hunk.front().line_number; curr_out.filename = hunk.front().filename; -- cgit 1.4.1-2-gfad0