From 88be3dbc0c996490dbac97538f4d712a5b4f6f07 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Fri, 24 Apr 2015 10:19:03 -0700 Subject: 1162 --- cpp/003trace | 2 +- cpp/013literal_string | 6 +++--- cpp/014types | 6 +++--- cpp/021arithmetic | 20 ++++++++++---------- cpp/022boolean | 6 +++--- cpp/023jump | 12 ++++++------ cpp/024compare | 24 ++++++++++++------------ cpp/025trace | 2 +- cpp/030container | 8 ++++---- cpp/031address | 10 +++++----- cpp/032array | 8 ++++---- cpp/033length | 2 +- cpp/034exclusive_container | 6 +++--- cpp/035call | 4 ++-- cpp/036call_ingredient | 8 ++++---- cpp/037call_reply | 4 ++-- cpp/040brace | 30 +++++++++++++++--------------- cpp/041name | 16 ++++++++-------- cpp/042new | 6 +++--- cpp/043space | 10 +++++----- cpp/044space_surround | 2 +- cpp/050scenario | 4 ++-- cpp/054closure_name | 2 +- 23 files changed, 99 insertions(+), 99 deletions(-) diff --git a/cpp/003trace b/cpp/003trace index 2e906b29..af4858bf 100644 --- a/cpp/003trace +++ b/cpp/003trace @@ -22,7 +22,7 @@ //: trace("label") << "fact 1: " << val; //: //: The tests check for facts: -//: :(scenario foo) +//: :(scenario "foo") //: 34 # call run() with this input //: +label: fact 1: 34 # trace should have logged this at the end //: -label: fact 1: 35 # trace should never contain such a line diff --git a/cpp/013literal_string b/cpp/013literal_string index 008f95ad..be6f771e 100644 --- a/cpp/013literal_string +++ b/cpp/013literal_string @@ -6,13 +6,13 @@ //: parsing. :(scenarios load) -:(scenario "string_literal") +:(scenario string_literal) recipe main [ 1:address:array:character <- new [abc def] ] +parse: ingredient: {name: "abc def", value: 0, type: 0, properties: ["abc def": "literal-string"]} -:(scenario "string_literal_with_colons") +:(scenario string_literal_with_colons) recipe main [ 1:address:array:character <- new [abc:def/ghi] ] @@ -56,7 +56,7 @@ string slurp_quoted(istream& in) { return; } -:(scenario "string_literal_nested") +:(scenario string_literal_nested) recipe main [ 1:address:array:character <- new [abc [def]] ] diff --git a/cpp/014types b/cpp/014types index 755ae78d..d005bcbf 100644 --- a/cpp/014types +++ b/cpp/014types @@ -1,7 +1,7 @@ //: Textual form for types. -:(scenarios "load") -:(scenario "container") +:(scenarios load) +:(scenario container) container foo [ x:integer y:integer @@ -54,7 +54,7 @@ void insert_container(const string& command, kind_of_type kind, istream& in) { //:: Similarly for exclusive_container. -:(scenario "exclusive_container") +:(scenario exclusive_container) exclusive-container foo [ x:integer y:integer diff --git a/cpp/021arithmetic b/cpp/021arithmetic index a5ca095a..8f4b9c3b 100644 --- a/cpp/021arithmetic +++ b/cpp/021arithmetic @@ -19,7 +19,7 @@ case ADD: { break; } -:(scenario "add_literal") +:(scenario add_literal) recipe main [ 1:integer <- add 23:literal, 34:literal ] @@ -29,7 +29,7 @@ recipe main [ +run: product 0 is 57 +mem: storing 57 in location 1 -:(scenario "add") +:(scenario add) recipe main [ 1:integer <- copy 23:literal 2:integer <- copy 34:literal @@ -62,7 +62,7 @@ case SUBTRACT: { break; } -:(scenario "subtract_literal") +:(scenario subtract_literal) recipe main [ 1:integer <- subtract 5:literal, 2:literal ] @@ -72,7 +72,7 @@ recipe main [ +run: product 0 is 3 +mem: storing 3 in location 1 -:(scenario "subtract") +:(scenario subtract) recipe main [ 1:integer <- copy 23:literal 2:integer <- copy 34:literal @@ -106,7 +106,7 @@ case MULTIPLY: { break; } -:(scenario "multiply_literal") +:(scenario multiply_literal) recipe main [ 1:integer <- multiply 2:literal, 3:literal ] @@ -116,7 +116,7 @@ recipe main [ +run: product 0 is 6 +mem: storing 6 in location 1 -:(scenario "multiply") +:(scenario multiply) recipe main [ 1:integer <- copy 4:literal 2:integer <- copy 6:literal @@ -150,7 +150,7 @@ case DIVIDE: { break; } -:(scenario "divide_literal") +:(scenario divide_literal) recipe main [ 1:integer <- divide 8:literal, 2:literal ] @@ -160,7 +160,7 @@ recipe main [ +run: product 0 is 4 +mem: storing 4 in location 1 -:(scenario "divide") +:(scenario divide) recipe main [ 1:integer <- copy 27:literal 2:integer <- copy 3:literal @@ -197,7 +197,7 @@ case DIVIDE_WITH_REMAINDER: { break; } -:(scenario "divide_with_remainder_literal") +:(scenario divide_with_remainder_literal) recipe main [ 1:integer, 2:integer <- divide-with-remainder 9:literal, 2:literal ] @@ -209,7 +209,7 @@ recipe main [ +run: product 1 is 1 +mem: storing 1 in location 2 -:(scenario "divide_with_remainder") +:(scenario divide_with_remainder) recipe main [ 1:integer <- copy 27:literal 2:integer <- copy 11:literal diff --git a/cpp/022boolean b/cpp/022boolean index e7fc9b44..1aef69d9 100644 --- a/cpp/022boolean +++ b/cpp/022boolean @@ -19,7 +19,7 @@ case AND: { break; } -:(scenario "and") +:(scenario and) recipe main [ 1:integer <- copy 1:literal 2:integer <- copy 0:literal @@ -52,7 +52,7 @@ case OR: { break; } -:(scenario "or") +:(scenario or) recipe main [ 1:integer <- copy 1:literal 2:integer <- copy 0:literal @@ -82,7 +82,7 @@ case NOT: { break; } -:(scenario "not") +:(scenario not) recipe main [ 1:integer <- copy 1:literal 2:integer <- not 1:integer diff --git a/cpp/023jump b/cpp/023jump index 01314ace..3ed0901c 100644 --- a/cpp/023jump +++ b/cpp/023jump @@ -12,7 +12,7 @@ case JUMP: { break; } -:(scenario "jump_can_skip_instructions") +:(scenario jump_can_skip_instructions) recipe main [ jump 1:offset 1:integer <- copy 1:literal @@ -22,7 +22,7 @@ recipe main [ -run: instruction main/1 -mem: storing 1 in location 1 -:(scenario "jump_backward") +:(scenario jump_backward) recipe main [ jump 1:offset # 0 -+ jump 1:offset # | +-+ 1 @@ -52,7 +52,7 @@ case JUMP_IF: { break; } -:(scenario "jump_if") +:(scenario jump_if) recipe main [ jump-if 999:literal 1:offset 1:integer <- copy 1:literal @@ -63,7 +63,7 @@ recipe main [ -run: instruction main/1 -mem: storing 1 in location 1 -:(scenario "jump_if_fallthrough") +:(scenario jump_if_fallthrough) recipe main [ jump-if 0:literal 1:offset 123:integer <- copy 1:literal @@ -92,7 +92,7 @@ case JUMP_UNLESS: { break; } -:(scenario "jump_unless") +:(scenario jump_unless) recipe main [ jump-unless 0:literal 1:offset 1:integer <- copy 1:literal @@ -103,7 +103,7 @@ recipe main [ -run: instruction main/1 -mem: storing 1 in location 1 -:(scenario "jump_unless_fallthrough") +:(scenario jump_unless_fallthrough) recipe main [ jump-unless 999:literal 1:offset 123:integer <- copy 1:literal diff --git a/cpp/024compare b/cpp/024compare index 1484649b..c1e961f9 100644 --- a/cpp/024compare +++ b/cpp/024compare @@ -17,7 +17,7 @@ case EQUAL: { break; } -:(scenario "equal") +:(scenario equal) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 33:literal @@ -31,7 +31,7 @@ recipe main [ +run: product 0 is 0 +mem: storing 0 in location 3 -:(scenario "equal2") +:(scenario equal2) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 34:literal @@ -64,7 +64,7 @@ case GREATER_THAN: { break; } -:(scenario "greater_than") +:(scenario greater_than) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 33:literal @@ -78,7 +78,7 @@ recipe main [ +run: product 0 is 1 +mem: storing 1 in location 3 -:(scenario "greater_than2") +:(scenario greater_than2) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 34:literal @@ -111,7 +111,7 @@ case LESS_THAN: { break; } -:(scenario "less_than") +:(scenario less_than) recipe main [ 1:integer <- copy 32:literal 2:integer <- copy 33:literal @@ -125,7 +125,7 @@ recipe main [ +run: product 0 is 1 +mem: storing 1 in location 3 -:(scenario "less_than2") +:(scenario less_than2) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 33:literal @@ -158,7 +158,7 @@ case GREATER_OR_EQUAL: { break; } -:(scenario "greater_or_equal") +:(scenario greater_or_equal) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 33:literal @@ -172,7 +172,7 @@ recipe main [ +run: product 0 is 1 +mem: storing 1 in location 3 -:(scenario "greater_or_equal2") +:(scenario greater_or_equal2) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 34:literal @@ -186,7 +186,7 @@ recipe main [ +run: product 0 is 1 +mem: storing 1 in location 3 -:(scenario "greater_or_equal3") +:(scenario greater_or_equal3) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 35:literal @@ -219,7 +219,7 @@ case LESSER_OR_EQUAL: { break; } -:(scenario "lesser_or_equal") +:(scenario lesser_or_equal) recipe main [ 1:integer <- copy 32:literal 2:integer <- copy 33:literal @@ -233,7 +233,7 @@ recipe main [ +run: product 0 is 1 +mem: storing 1 in location 3 -:(scenario "lesser_or_equal2") +:(scenario lesser_or_equal2) recipe main [ 1:integer <- copy 33:literal 2:integer <- copy 33:literal @@ -247,7 +247,7 @@ recipe main [ +run: product 0 is 1 +mem: storing 1 in location 3 -:(scenario "lesser_or_equal3") +:(scenario lesser_or_equal3) recipe main [ 1:integer <- copy 34:literal 2:integer <- copy 33:literal diff --git a/cpp/025trace b/cpp/025trace index 247a9dc7..017c24b9 100644 --- a/cpp/025trace +++ b/cpp/025trace @@ -1,6 +1,6 @@ //: Allow mu programs to log facts just like we've been doing in C++ so far. -:(scenario "trace") +:(scenario trace) recipe main [ trace [foo], [this is a trace in mu] ] diff --git a/cpp/030container b/cpp/030container index b84314b6..9069f576 100644 --- a/cpp/030container +++ b/cpp/030container @@ -39,7 +39,7 @@ vector i2; i2.push_back(integer); Type[point_integer].elements.push_back(i2); -:(scenario "copy_handles_nested_container_elements") +:(scenario copy_handles_nested_container_elements) recipe main [ 12:integer <- copy 34:literal 13:integer <- copy 35:literal @@ -60,7 +60,7 @@ if (t.kind == container) { } //:: To access elements of a container, use 'get' -:(scenario "get") +:(scenario get) recipe main [ 12:integer <- copy 34:literal 13:integer <- copy 35:literal @@ -112,7 +112,7 @@ case GET: { :(before "End Mu Types Initialization") Type_number["offset"] = 0; -:(scenario "get_handles_nested_container_elements") +:(scenario get_handles_nested_container_elements) recipe main [ 12:integer <- copy 34:literal 13:integer <- copy 35:literal @@ -130,7 +130,7 @@ recipe main [ //:: To write to elements of containers, you need their address. -:(scenario "get_address") +:(scenario get_address) recipe main [ 12:integer <- copy 34:literal 13:integer <- copy 35:literal diff --git a/cpp/031address b/cpp/031address index e31ae67d..fd713a22 100644 --- a/cpp/031address +++ b/cpp/031address @@ -1,7 +1,7 @@ //: Instructions can read from addresses pointing at other locations using the //: 'deref' property. -:(scenario "copy_indirect") +:(scenario copy_indirect) recipe main [ 1:address:integer <- copy 2:literal 2:integer <- copy 34:literal @@ -18,7 +18,7 @@ x = canonize(x); //: similarly, write to addresses pointing at other locations using the //: 'deref' property -:(scenario "store_indirect") +:(scenario store_indirect) recipe main [ 1:address:integer <- copy 2:literal 1:address:integer/deref <- copy 34:literal @@ -76,7 +76,7 @@ reagent deref(reagent x) { } //:: 'get' can read from container address -:(scenario "get_indirect") +:(scenario get_indirect) recipe main [ 1:integer <- copy 2:literal 2:integer <- copy 34:literal @@ -88,7 +88,7 @@ recipe main [ +run: product 0 is 34 +mem: storing 34 in location 4 -:(scenario "include_nonderef_properties") +:(scenario include_nonderef_properties) recipe main [ 1:integer <- copy 2:literal 2:integer <- copy 34:literal @@ -103,7 +103,7 @@ recipe main [ :(after "reagent base = " following "case GET:") base = canonize(base); -:(scenario "get_address_indirect") +:(scenario get_address_indirect) # 'get' can read from container address recipe main [ 1:integer <- copy 2:literal diff --git a/cpp/032array b/cpp/032array index 3aa531d0..1c5c58c4 100644 --- a/cpp/032array +++ b/cpp/032array @@ -58,7 +58,7 @@ if (x.types[0] != Type_number["array"] && size_of(x) != data.size()) //:: To access elements of an array, use 'index' -:(scenario "index") +:(scenario index) recipe main [ 1:integer <- copy 3:literal 2:integer <- copy 14:literal @@ -73,7 +73,7 @@ recipe main [ +run: product 0 is 14 +mem: storing 14 in location 5 -:(scenario "index_direct_offset") +:(scenario index_direct_offset) recipe main [ 1:integer <- copy 3:literal 2:integer <- copy 14:literal @@ -128,7 +128,7 @@ vector array_element(const vector& types) { return vector(++types.begin(), types.end()); } -:(scenario "index_address") +:(scenario index_address) recipe main [ 1:integer <- copy 3:literal 2:integer <- copy 14:literal @@ -142,7 +142,7 @@ recipe main [ //:: To write to elements of containers, you need their address. -:(scenario "index_indirect") +:(scenario index_indirect) recipe main [ 1:integer <- copy 3:literal 2:integer <- copy 14:literal diff --git a/cpp/033length b/cpp/033length index 9d3bb714..01199ce6 100644 --- a/cpp/033length +++ b/cpp/033length @@ -1,6 +1,6 @@ //: Recipe to compute the length of an array. -:(scenario "array_length") +:(scenario array_length) recipe main [ 1:integer <- copy 3:literal 2:integer <- copy 14:literal diff --git a/cpp/034exclusive_container b/cpp/034exclusive_container index b7d08c12..d9f266c0 100644 --- a/cpp/034exclusive_container +++ b/cpp/034exclusive_container @@ -25,7 +25,7 @@ Type[tmp].element_names.push_back("i"); Type[tmp].element_names.push_back("p"); } -:(scenario "copy_exclusive_container") +:(scenario copy_exclusive_container) # Copying exclusive containers copies all their contents and an extra location for the tag. recipe main [ 1:integer <- copy 1:literal # 'point' variant @@ -64,7 +64,7 @@ if (t.kind == exclusive_container) { :(before "End Mu Types Initialization") Type_number["variant"] = 0; -:(scenario "maybe_convert") +:(scenario maybe_convert) recipe main [ 12:integer <- copy 1:literal 13:integer <- copy 35:literal @@ -73,7 +73,7 @@ recipe main [ ] +mem: storing 13 in location 20 -:(scenario "maybe_convert_fail") +:(scenario maybe_convert_fail) recipe main [ 12:integer <- copy 1:literal 13:integer <- copy 35:literal diff --git a/cpp/035call b/cpp/035call index d5867f80..58de7d57 100644 --- a/cpp/035call +++ b/cpp/035call @@ -1,6 +1,6 @@ //: So far the recipes we define can't run each other. Let's fix that. -:(scenario "calling_recipe") +:(scenario calling_recipe) recipe main [ f ] @@ -9,7 +9,7 @@ recipe f [ ] +mem: storing 4 in location 3 -:(scenario "return_on_fallthrough") +:(scenario return_on_fallthrough) recipe main [ f 1:integer <- copy 34:literal diff --git a/cpp/036call_ingredient b/cpp/036call_ingredient index f71be902..a1b80959 100644 --- a/cpp/036call_ingredient +++ b/cpp/036call_ingredient @@ -1,7 +1,7 @@ //: Calls can take ingredients just like primitives. To access a recipe's //: ingredients, use 'next-ingredient'. -:(scenario "next_ingredient") +:(scenario next_ingredient) recipe main [ f 2:literal ] @@ -13,7 +13,7 @@ recipe f [ +mem: location 12 is 2 +mem: storing 3 in location 13 -:(scenario "next_ingredient_missing") +:(scenario next_ingredient_missing) recipe main [ f ] @@ -63,7 +63,7 @@ case NEXT_INGREDIENT: { break; } -:(scenario "rewind_ingredients") +:(scenario rewind_ingredients) recipe main [ f 2:literal ] @@ -88,7 +88,7 @@ case REWIND_INGREDIENTS: { break; } -:(scenario "ingredient") +:(scenario ingredient) recipe main [ f 1:literal, 2:literal ] diff --git a/cpp/037call_reply b/cpp/037call_reply index 2e5459d4..22548eef 100644 --- a/cpp/037call_reply +++ b/cpp/037call_reply @@ -1,6 +1,6 @@ //: Calls can also generate products, using 'reply'. -:(scenario "reply") +:(scenario reply) recipe main [ 3:integer, 4:integer <- f 2:literal ] @@ -39,7 +39,7 @@ case REPLY: { } //: Products can include containers and exclusive containers, addresses and arrays. -:(scenario "reply_container") +:(scenario reply_container) recipe main [ 3:point <- f 2:literal ] diff --git a/cpp/040brace b/cpp/040brace index e79f6100..fa9efab5 100644 --- a/cpp/040brace +++ b/cpp/040brace @@ -20,7 +20,7 @@ //: like 'if', 'while', 'for', etc. :(scenarios transform) -:(scenario "brace_conversion") +:(scenario brace_conversion) recipe main [ { break @@ -183,7 +183,7 @@ Recipe_number["loop"] = LOOP; Recipe_number["loop-if"] = LOOP_IF; Recipe_number["loop-unless"] = LOOP_UNLESS; -:(scenario "loop") +:(scenario loop) recipe main [ 1:integer <- copy 0:literal 2:integer <- copy 0:literal @@ -198,7 +198,7 @@ recipe main [ +after-brace: copy ... +after-brace: jump -2:offset -:(scenario "break_empty_block") +:(scenario break_empty_block) recipe main [ 1:integer <- copy 0:literal { @@ -209,7 +209,7 @@ recipe main [ +after-brace: copy ... +after-brace: jump 0:offset -:(scenario "break_cascading") +:(scenario break_cascading) recipe main [ 1:integer <- copy 0:literal { @@ -224,7 +224,7 @@ recipe main [ +after-brace: jump 0:offset +after-brace: jump 0:offset -:(scenario "break_cascading2") +:(scenario break_cascading2) recipe main [ 1:integer <- copy 0:literal 2:integer <- copy 0:literal @@ -243,7 +243,7 @@ recipe main [ +after-brace: copy ... +after-brace: jump 0:offset -:(scenario "break_if") +:(scenario break_if) recipe main [ 1:integer <- copy 0:literal 2:integer <- copy 0:literal @@ -262,7 +262,7 @@ recipe main [ +after-brace: copy ... +after-brace: jump 0:offset -:(scenario "break_nested") +:(scenario break_nested) recipe main [ 1:integer <- copy 0:literal { @@ -276,7 +276,7 @@ recipe main [ ] +after-brace: jump 4:offset -:(scenario "break_nested_degenerate") +:(scenario break_nested_degenerate) recipe main [ 1:integer <- copy 0:literal { @@ -289,7 +289,7 @@ recipe main [ ] +after-brace: jump 3:offset -:(scenario "break_nested_degenerate2") +:(scenario break_nested_degenerate2) recipe main [ 1:integer <- copy 0:literal { @@ -301,7 +301,7 @@ recipe main [ ] +after-brace: jump 2:offset -:(scenario "break_label") +:(scenario break_label) recipe main [ 1:integer <- copy 0:literal { @@ -310,7 +310,7 @@ recipe main [ ] +after-brace: jump +foo:offset -:(scenario "break_unless") +:(scenario break_unless) recipe main [ 1:integer <- copy 0:literal 2:integer <- copy 0:literal @@ -325,7 +325,7 @@ recipe main [ +after-brace: jump-unless 2, 1:offset +after-brace: copy ... -:(scenario "loop_unless") +:(scenario loop_unless) recipe main [ 1:integer <- copy 0:literal 2:integer <- copy 0:literal @@ -340,7 +340,7 @@ recipe main [ +after-brace: jump-unless 2, -1:offset +after-brace: copy ... -:(scenario "loop_nested") +:(scenario loop_nested) recipe main [ 1:integer <- copy 0:literal { @@ -355,7 +355,7 @@ recipe main [ +after-brace: recipe main +after-brace: jump-if 4, -5:offset -:(scenario "loop_label") +:(scenario loop_label) recipe main [ 1:integer <- copy 0:literal +foo @@ -367,7 +367,7 @@ recipe main [ //: test how things actually run :(scenarios run) -:(scenario "brace_conversion_and_run") +:(scenario brace_conversion_and_run) recipe test-factorial [ 1:integer <- copy 5:literal 2:integer <- copy 1:literal diff --git a/cpp/041name b/cpp/041name index 791e2227..071f6f5a 100644 --- a/cpp/041name +++ b/cpp/041name @@ -2,7 +2,7 @@ //: locations. In mu, a transform called 'convert-names' provides this //: convenience. -:(scenario "convert_names") +:(scenario convert_names) recipe main [ x:integer <- copy 0:literal ] @@ -10,7 +10,7 @@ recipe main [ +run: instruction main/0 +mem: storing 0 in location 1 -:(scenario "convert_names_warns") +:(scenario convert_names_warns) hide warnings recipe main [ x:integer <- copy y:integer @@ -110,7 +110,7 @@ bool is_raw(const reagent& r) { return false; } -:(scenario "convert_names_passes_dummy") +:(scenario convert_names_passes_dummy) # _ is just a dummy result that never gets consumed recipe main [ _, x:integer <- copy 0:literal @@ -119,7 +119,7 @@ recipe main [ -name: assign _ 1 //: one reserved word that we'll need later -:(scenario "convert_names_passes_default_space") +:(scenario convert_names_passes_default_space) recipe main [ default-space:integer, x:integer <- copy 0:literal ] @@ -127,7 +127,7 @@ recipe main [ -name: assign default-space 1 //: an escape hatch to suppress name conversion that we'll use later -:(scenario "convert_names_passes_raw") +:(scenario convert_names_passes_raw) recipe main [ x:integer/raw <- copy 0:literal ] @@ -139,7 +139,7 @@ recipe main [ :(before "End Mu Types Initialization") Type[point].element_names.push_back("x"); Type[point].element_names.push_back("y"); -:(scenario "convert_names_transforms_container_elements") +:(scenario convert_names_transforms_container_elements) recipe main [ a:integer <- get 0:point, y:offset b:integer <- get 0:point, x:offset @@ -164,7 +164,7 @@ if (inst.operation == Recipe_number["get"] //: this test is actually illegal so can't call run :(scenarios transform) -:(scenario "convert_names_handles_containers") +:(scenario convert_names_handles_containers) recipe main [ a:point <- copy 0:literal b:integer <- copy 0:literal @@ -175,7 +175,7 @@ recipe main [ //:: Support variant names for exclusive containers in 'maybe-convert'. :(scenarios run) -:(scenario "maybe_convert_named") +:(scenario maybe_convert_named) recipe main [ 12:integer <- copy 1:literal 13:integer <- copy 35:literal diff --git a/cpp/042new b/cpp/042new index 7244cca2..0fa7e16a 100644 --- a/cpp/042new +++ b/cpp/042new @@ -1,7 +1,7 @@ //: A simple memory allocator to create space for new variables at runtime. :(scenarios run) -:(scenario "new") +:(scenario new) # call new two times with identical arguments; you should get back different results recipe main [ 1:address:integer/raw <- new integer:type @@ -64,7 +64,7 @@ case NEW: { break; } -:(scenario "new_array") +:(scenario new_array) recipe main [ 1:address:array:integer/raw <- new integer:type, 5:literal 2:address:integer/raw <- new integer:type @@ -78,7 +78,7 @@ recipe main [ //:: Next, extend 'new' to handle a string literal argument. -:(scenario "new_string") +:(scenario new_string) recipe main [ 1:address:array:character <- new [abc def] 2:character <- index 1:address:array:character/deref, 5:literal diff --git a/cpp/043space b/cpp/043space index 4db3c725..f749b265 100644 --- a/cpp/043space +++ b/cpp/043space @@ -2,7 +2,7 @@ //: and all addresses in arguments are implicitly based on the 'default-space' //: (unless they have the /raw property) -:(scenario "set_default_space") +:(scenario set_default_space) # if default-space is 10, and if an array of 5 locals lies from location 11 to 15 (inclusive), # then location 0 is really location 11, location 1 is really location 12, and so on. recipe main [ @@ -12,7 +12,7 @@ recipe main [ ] +mem: storing 23 in location 12 -:(scenario "deref_sidesteps_default_space") +:(scenario deref_sidesteps_default_space) recipe main [ # pretend pointer from outside 3:integer <- copy 34:literal @@ -53,7 +53,7 @@ result.properties.push_back(pair >("raw", vector( //:: fix 'get' -:(scenario "deref_sidesteps_default_space_in_get") +:(scenario deref_sidesteps_default_space_in_get) recipe main [ # pretend pointer to container from outside 12:integer <- copy 34:literal @@ -72,7 +72,7 @@ tmp.properties.push_back(pair >("raw", vector())) //:: fix 'index' -:(scenario "deref_sidesteps_default_space_in_index") +:(scenario deref_sidesteps_default_space_in_index) recipe main [ # pretend pointer to array from outside 12:integer <- copy 2:literal @@ -115,7 +115,7 @@ int address(int offset, int base) { return; } -:(scenario "get_default_space") +:(scenario get_default_space) recipe main [ default-space:address:array:location <- copy 10:literal 1:integer/raw <- copy default-space:address:array:location diff --git a/cpp/044space_surround b/cpp/044space_surround index 6e16fd23..c5a03176 100644 --- a/cpp/044space_surround +++ b/cpp/044space_surround @@ -4,7 +4,7 @@ //: //: (Surrounding spaces are like lexical scopes in other languages.) -:(scenario "surrounding_space") +:(scenario surrounding_space) # location 1 in space 1 refers to the space surrounding the default space, here 20. recipe main [ 10:integer <- copy 5:literal # pretend array diff --git a/cpp/050scenario b/cpp/050scenario index 247bb0c1..8a4cf869 100644 --- a/cpp/050scenario +++ b/cpp/050scenario @@ -49,7 +49,7 @@ void run_mu_test(size_t i) { //:: How we create Scenarios. :(scenarios "parse_scenario") -:(scenario "parse_scenario_memory_expectation") +:(scenario parse_scenario_memory_expectation) scenario foo [ run [ a <- b @@ -60,7 +60,7 @@ scenario foo [ ] +parse: scenario will run: a <- b -:(scenario "parse_scenario_memory_expectation_duplicate") +:(scenario parse_scenario_memory_expectation_duplicate) hide warnings scenario foo [ run [ diff --git a/cpp/054closure_name b/cpp/054closure_name index 9c61d5cd..ea48694b 100644 --- a/cpp/054closure_name +++ b/cpp/054closure_name @@ -3,7 +3,7 @@ //: the variable in the chained/surrounding space. /space:2 looks up the //: surrounding space of the surrounding space, etc. -:(scenario "closure") +:(scenario closure) recipe main [ default-space:address:array:location <- new location:type, 30:literal 1:address:array:location/names:init-counter <- init-counter -- cgit 1.4.1-2-gfad0