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/.traces/first_scenario_in_mu | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) (limited to 'cpp/.traces/first_scenario_in_mu') diff --git a/cpp/.traces/first_scenario_in_mu b/cpp/.traces/first_scenario_in_mu index 9e02c432..090585b8 100644 --- a/cpp/.traces/first_scenario_in_mu +++ b/cpp/.traces/first_scenario_in_mu @@ -1,14 +1,42 @@ +parse/0: instruction: run +parse/0: ingredient: {name: " + 1:integer <- add 2:literal, 2:literal + ", value: 0, type: 0, properties: [" + 1:integer <- add 2:literal, 2:literal + ": "literal-string"]} +parse/0: instruction: memory-should-contain +parse/0: ingredient: {name: " + 1 <- 4 + ", value: 0, type: 0, properties: [" + 1 <- 4 + ": "literal-string"]} +after-brace/0: recipe first_scenario_in_mu +after-brace/0: run ... +after-brace/0: memory-should-contain ... +new/0: routine allocated memory from 1000 to 101000 +schedule/0: first_scenario_in_mu +run/0: instruction first_scenario_in_mu/0 +run/0: run {name: " + 1:integer <- add 2:literal, 2:literal + ", value: 0, type: 0, properties: [" + 1:integer <- add 2:literal, 2:literal + ": "literal-string"]} parse/0: instruction: add parse/0: ingredient: {name: "2", value: 0, type: 0, properties: ["2": "literal"]} parse/0: ingredient: {name: "2", value: 0, type: 0, properties: ["2": "literal"]} parse/0: product: {name: "1", value: 0, type: 1, properties: ["1": "integer"]} -after-brace/0: recipe test-first_scenario_in_mu +after-brace/0: recipe tmp0 after-brace/0: add ... -new/0: routine allocated memory from 1000 to 101000 -schedule/0: test-first_scenario_in_mu -run/0: instruction test-first_scenario_in_mu/0 +run/0: instruction tmp0/0 run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- add {name: "2", value: 2, type: 0, properties: ["2": "literal"]}, {name: "2", value: 2, type: 0, properties: ["2": "literal"]} run/0: ingredient 0 is 2 run/0: ingredient 1 is 2 run/0: product 0 is 4 mem/0: storing 4 in location 1 +run/0: instruction first_scenario_in_mu/1 +run/0: memory-should-contain {name: " + 1 <- 4 + ", value: 0, type: 0, properties: [" + 1 <- 4 + ": "literal-string"]} +run/0: checking location 1 -- cgit 1.4.1-2-gfad0