779 - first scenario tested in literate C++ version

2 files changed, 10 insertions, 10 deletions

diff --git a/cpp/literate/tangle/030tangle.cc b/cpp/literate/tangle/030tangle.cc
index 2bf193f4..2dda8667 100644
--- a/cpp/literate/tangle/030tangle.cc
+++ b/cpp/literate/tangle/030tangle.cc
@@ -210,7 +210,7 @@ void emit_test(const string& name, list<string>& lines, list<string>& result) {
 }
 
 void emit_session(list<string>& lines, list<string>& result) {
-  result.push_back("  rmref("+Toplevel+"(\""+input_lines(lines)+"\"));");
+  result.push_back("  "+Toplevel+"(\""+input_lines(lines)+"\");");
 }
 
 void emit_result_checking_session(list<string>& lines, list<string>& result) {
diff --git a/cpp/literate/tangle/030tangle.test.cc b/cpp/literate/tangle/030tangle.test.cc
index 307486fa..36ce2d1f 100644
--- a/cpp/literate/tangle/030tangle.test.cc
+++ b/cpp/literate/tangle/030tangle.test.cc
@@ -85,7 +85,7 @@ void test_tangle_supports_scenarios() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"abc def\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"abc def\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_CONTENTS(\"layer1: pqrlayer2: xyz\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();
   CHECK(lines.empty());
@@ -96,7 +96,7 @@ void test_tangle_supports_configurable_toplevel() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(foo(\"abc def\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  foo(\"abc def\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_CONTENTS(\"layer1: pqr\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();
   CHECK(lines.empty());
@@ -110,7 +110,7 @@ void test_tangle_supports_strings_in_scenarios() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"abc \\\"def\\\"\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"abc \\\"def\\\"\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_CONTENTS(\"layer1: pqrlayer2: \\\"xyz\\\"\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();
   CHECK(lines.empty());
@@ -121,7 +121,7 @@ void test_tangle_supports_strings_in_scenarios2() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"abc \\\"\\\"\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"abc \\\"\\\"\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_CONTENTS(\"layer1: pqrlayer2: \\\"\\\"\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();
   CHECK(lines.empty());
@@ -132,7 +132,7 @@ void test_tangle_supports_multiline_input_in_scenarios() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"abc def\\n  efg\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"abc def\\n  efg\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_CONTENTS(\"layer1: pqrlayer2: \\\"\\\"\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();
   CHECK(lines.empty());
@@ -143,9 +143,9 @@ void test_tangle_supports_reset_in_scenarios() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"abc def\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"abc def\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CLEAR_TRACE;");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"efg\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"efg\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_CONTENTS(\"layer1: pqrlayer2: \\\"\\\"\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();
   CHECK(lines.empty());
@@ -156,7 +156,7 @@ void test_tangle_can_check_for_absence_at_end_of_scenarios() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"abc def\\n  efg\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"abc def\\n  efg\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_CONTENTS(\"layer1: pqr\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_DOESNT_CONTAIN(\"layer1: xyz\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();
@@ -168,7 +168,7 @@ void test_tangle_can_check_for_absence_at_end_of_scenarios2() {
   list<string> lines;
   tangle(in, lines);
   CHECK_EQ(lines.front(), "void test_does_bar() {");  lines.pop_front();
-  CHECK_EQ(lines.front(), "  rmref(run(\"abc def\\n  efg\\n\"));");  lines.pop_front();
+  CHECK_EQ(lines.front(), "  run(\"abc def\\n  efg\\n\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_DOESNT_CONTAIN(\"layer1: pqr\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "  CHECK_TRACE_DOESNT_CONTAIN(\"layer1: xyz\");");  lines.pop_front();
   CHECK_EQ(lines.front(), "}");  lines.pop_front();