From 22b3069272c1a177e814a7c4e769e20858e2b368 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 2 May 2015 15:52:22 -0700 Subject: 1242 - simpler implementation for 'scenario' Also now has the side effect that scenarios can have any number of 'run' or check or any future blocks, in any order. --- cpp/049scenario_helpers.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'cpp/049scenario_helpers.cc') diff --git a/cpp/049scenario_helpers.cc b/cpp/049scenario_helpers.cc index fa584565..d5b755f2 100644 --- a/cpp/049scenario_helpers.cc +++ b/cpp/049scenario_helpers.cc @@ -12,15 +12,6 @@ recipe main [ ] +mem: storing 13 in location 1 -:(scenario run_handles_comments) -recipe main [ - run [ - # comment - 1:integer <- copy 13:literal - ] -] -+mem: storing 13 in location 1 - :(before "End Globals") size_t Num_temporary_recipes = 0; :(before "End Setup") @@ -208,6 +199,7 @@ bool check_trace(const string& expected) { raise << "missing [" << expected_lines[curr_expected_line].second << "] " << "in trace layer " << expected_lines[curr_expected_line].first << '\n'; + Passed = false; return false; } @@ -293,6 +285,7 @@ bool check_trace_missing(const string& in) { for (size_t i = 0; i < lines.size(); ++i) { if (trace_count(lines[i].first, lines[i].second) != 0) { raise << "unexpected [" << lines[i].second << "] in trace layer " << lines[i].first << '\n'; + Passed = false; return false; } } -- cgit 1.4.1-2-gfad0