diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-06-19 16:35:10 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-06-19 16:35:10 -0700 |
commit | f91179bdfc4b8049e9b4609396e1d7a01e302304 (patch) | |
tree | 83700e54968e70e9c1866012984bd5774045459d | |
parent | a91c1c2a28583262cc6052a5c3d9e713e9b4c0e0 (diff) | |
download | mu-f91179bdfc4b8049e9b4609396e1d7a01e302304.tar.gz |
1600
-rw-r--r-- | 037call_reply.cc | 4 | ||||
-rw-r--r-- | 072scenario_screen.cc | 1 | ||||
-rw-r--r-- | 075scenario_keyboard.cc | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/037call_reply.cc b/037call_reply.cc index fa224216..8c69fa3f 100644 --- a/037call_reply.cc +++ b/037call_reply.cc @@ -126,6 +126,7 @@ recipe test1 [ if (curr.name == "reply-if") { assert(curr.products.empty()); curr.operation = Recipe_number["jump-unless"]; + curr.name = "jump-unless"; vector<reagent> results; copy(++curr.ingredients.begin(), curr.ingredients.end(), inserter(results, results.end())); curr.ingredients.resize(1); @@ -133,6 +134,7 @@ if (curr.name == "reply-if") { result.steps.push_back(curr); curr.clear(); curr.operation = Recipe_number["reply"]; + curr.name = "reply"; curr.ingredients.swap(results); } // rewrite `reply-unless a, b, c, ...` to @@ -143,6 +145,7 @@ if (curr.name == "reply-if") { if (curr.name == "reply-unless") { assert(curr.products.empty()); curr.operation = Recipe_number["jump-if"]; + curr.name = "jump-if"; vector<reagent> results; copy(++curr.ingredients.begin(), curr.ingredients.end(), inserter(results, results.end())); curr.ingredients.resize(1); @@ -150,5 +153,6 @@ if (curr.name == "reply-unless") { result.steps.push_back(curr); curr.clear(); curr.operation = Recipe_number["reply"]; + curr.name = "reply"; curr.ingredients.swap(results); } diff --git a/072scenario_screen.cc b/072scenario_screen.cc index 66febddc..b529a4fc 100644 --- a/072scenario_screen.cc +++ b/072scenario_screen.cc @@ -134,6 +134,7 @@ Name[tmp_recipe.at(0)]["screen"] = SCREEN; //? cout << "before: " << curr.to_string() << '\n'; //? 1 if (curr.name == "assume-screen") { curr.operation = Recipe_number["new-fake-screen"]; + curr.name = "new-fake-screen"; assert(curr.operation); assert(curr.products.empty()); curr.products.push_back(reagent("screen:address")); diff --git a/075scenario_keyboard.cc b/075scenario_keyboard.cc index 83d13b40..6a5da304 100644 --- a/075scenario_keyboard.cc +++ b/075scenario_keyboard.cc @@ -44,6 +44,7 @@ if (s == "keyboard") return true; if (curr.name == "assume-keyboard") { // insert first instruction curr.operation = Recipe_number["new"]; + curr.name = "new"; assert(curr.products.empty()); curr.products.push_back(reagent("keyboard:address")); curr.products.at(0).set_value(KEYBOARD); @@ -51,6 +52,7 @@ if (curr.name == "assume-keyboard") { // leave second instruction in curr curr.clear(); curr.operation = Recipe_number["new-fake-keyboard"]; + curr.name = "new-fake-keyboard"; assert(curr.ingredients.empty()); curr.ingredients.push_back(reagent("keyboard:address")); curr.ingredients.at(0).set_value(KEYBOARD); |