diff options
64 files changed, 208 insertions, 208 deletions
diff --git a/cpp/.traces/add b/cpp/.traces/add index ff1c01b5..791297a5 100644 --- a/cpp/.traces/add +++ b/cpp/.traces/add @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: add ... run/0: instruction main/0 run/0: ingredient 0 is 23 -mem/0: storing in location 1 +mem/0: storing 23 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 23 run/0: ingredient 1 is 2 mem/0: location 2 is 34 run/0: product 0 is 57 -mem/0: storing in location 3 +mem/0: storing 57 in location 3 diff --git a/cpp/.traces/add_literal b/cpp/.traces/add_literal index a111878f..755cf2c4 100644 --- a/cpp/.traces/add_literal +++ b/cpp/.traces/add_literal @@ -8,4 +8,4 @@ run/0: instruction main/0 run/0: ingredient 0 is 23 run/0: ingredient 1 is 34 run/0: product 0 is 57 -mem/0: storing in location 1 +mem/0: storing 57 in location 1 diff --git a/cpp/.traces/and b/cpp/.traces/and index 73efbe72..47823ef8 100644 --- a/cpp/.traces/and +++ b/cpp/.traces/and @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: and ... run/0: instruction main/0 run/0: ingredient 0 is 1 -mem/0: storing in location 1 +mem/0: storing 1 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 0 -mem/0: storing in location 2 +mem/0: storing 0 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 1 run/0: ingredient 1 is 2 mem/0: location 2 is 0 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 diff --git a/cpp/.traces/calling_recipe b/cpp/.traces/calling_recipe index d1b79af2..87986e69 100644 --- a/cpp/.traces/calling_recipe +++ b/cpp/.traces/calling_recipe @@ -12,4 +12,4 @@ run/0: instruction f/0 run/0: ingredient 0 is 2 run/0: ingredient 1 is 2 run/0: product 0 is 4 -mem/0: storing in location 3 +mem/0: storing 4 in location 3 diff --git a/cpp/.traces/convert_names b/cpp/.traces/convert_names index 3a7e2568..b8ed6d25 100644 --- a/cpp/.traces/convert_names +++ b/cpp/.traces/convert_names @@ -6,4 +6,4 @@ after-brace/0: recipe main after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 0 -mem/0: storing in location 1 +mem/0: storing 0 in location 1 diff --git a/cpp/.traces/convert_names_passes_default_space b/cpp/.traces/convert_names_passes_default_space index 92479559..c291c887 100644 --- a/cpp/.traces/convert_names_passes_default_space +++ b/cpp/.traces/convert_names_passes_default_space @@ -7,4 +7,4 @@ after-brace/0: recipe main after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 0 -mem/0: storing in location 0 +mem/0: storing 0 in location 0 diff --git a/cpp/.traces/convert_names_passes_raw b/cpp/.traces/convert_names_passes_raw index 7a87c163..c97b23ab 100644 --- a/cpp/.traces/convert_names_passes_raw +++ b/cpp/.traces/convert_names_passes_raw @@ -5,4 +5,4 @@ after-brace/0: recipe main after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 0 -mem/0: storing in location 0 +mem/0: storing 0 in location 0 diff --git a/cpp/.traces/convert_names_transforms_record_elements b/cpp/.traces/convert_names_transforms_record_elements index 99c78e6a..6e31dacf 100644 --- a/cpp/.traces/convert_names_transforms_record_elements +++ b/cpp/.traces/convert_names_transforms_record_elements @@ -20,7 +20,7 @@ run/0: address to copy is 1 run/0: its type is 1 mem/0: location 1 is 0 run/0: product 0 is 0 -mem/0: storing in location 1 +mem/0: storing 0 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 0 run/0: ingredient 1 is x @@ -28,4 +28,4 @@ run/0: address to copy is 0 run/0: its type is 1 mem/0: location 0 is 0 run/0: product 0 is 0 -mem/0: storing in location 2 +mem/0: storing 0 in location 2 diff --git a/cpp/.traces/copy b/cpp/.traces/copy index 075945a3..3005054c 100644 --- a/cpp/.traces/copy +++ b/cpp/.traces/copy @@ -9,8 +9,8 @@ after-brace/0: copy ... after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 23 -mem/0: storing in location 1 +mem/0: storing 23 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 1 mem/0: location 1 is 23 -mem/0: storing in location 2 +mem/0: storing 23 in location 2 diff --git a/cpp/.traces/copy_array b/cpp/.traces/copy_array index 00cab3ff..8b49bc79 100644 --- a/cpp/.traces/copy_array +++ b/cpp/.traces/copy_array @@ -21,23 +21,23 @@ after-brace/0: copy ... after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 3 -mem/0: storing in location 1 +mem/0: storing 3 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 14 -mem/0: storing in location 2 +mem/0: storing 14 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 15 -mem/0: storing in location 3 +mem/0: storing 15 in location 3 run/0: instruction main/3 run/0: ingredient 0 is 16 -mem/0: storing in location 4 +mem/0: storing 16 in location 4 run/0: instruction main/4 run/0: ingredient 0 is 1 mem/0: location 1 is 3 mem/0: location 2 is 14 mem/0: location 3 is 15 mem/0: location 4 is 16 -mem/0: storing in location 5 -mem/0: storing in location 6 -mem/0: storing in location 7 -mem/0: storing in location 8 +mem/0: storing 3 in location 5 +mem/0: storing 14 in location 6 +mem/0: storing 15 in location 7 +mem/0: storing 16 in location 8 diff --git a/cpp/.traces/copy_indirect b/cpp/.traces/copy_indirect index 8f83cd0c..c6d0b54c 100644 --- a/cpp/.traces/copy_indirect +++ b/cpp/.traces/copy_indirect @@ -13,12 +13,12 @@ after-brace/0: copy ... after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 2 -mem/0: storing in location 1 +mem/0: storing 2 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 2 mem/0: location 2 is 34 -mem/0: storing in location 3 +mem/0: storing 34 in location 3 diff --git a/cpp/.traces/copy_literal b/cpp/.traces/copy_literal index 2530b7b7..7e812f2c 100644 --- a/cpp/.traces/copy_literal +++ b/cpp/.traces/copy_literal @@ -5,4 +5,4 @@ after-brace/0: recipe main after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 23 -mem/0: storing in location 1 +mem/0: storing 23 in location 1 diff --git a/cpp/.traces/copy_multiple_locations b/cpp/.traces/copy_multiple_locations index 18c61d2d..9a727624 100644 --- a/cpp/.traces/copy_multiple_locations +++ b/cpp/.traces/copy_multiple_locations @@ -13,13 +13,13 @@ after-brace/0: copy ... after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 35 -mem/0: storing in location 2 +mem/0: storing 35 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 mem/0: location 2 is 35 -mem/0: storing in location 3 -mem/0: storing in location 4 +mem/0: storing 34 in location 3 +mem/0: storing 35 in location 4 diff --git a/cpp/.traces/divide b/cpp/.traces/divide index c361b85d..4e80b55d 100644 --- a/cpp/.traces/divide +++ b/cpp/.traces/divide @@ -14,10 +14,10 @@ after-brace/0: copy ... after-brace/0: divide ... run/0: instruction main/0 run/0: ingredient 0 is 27 -mem/0: storing in location 1 +mem/0: storing 27 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 3 -mem/0: storing in location 2 +mem/0: storing 3 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 27 @@ -25,4 +25,4 @@ run/0: ingredient 1 is 2 mem/0: location 2 is 3 run/0: ingredient 1 is 3 run/0: product 0 is 9 -mem/0: storing in location 3 +mem/0: storing 9 in location 3 diff --git a/cpp/.traces/divide_literal b/cpp/.traces/divide_literal index 882a3e7e..c45bd661 100644 --- a/cpp/.traces/divide_literal +++ b/cpp/.traces/divide_literal @@ -9,4 +9,4 @@ run/0: ingredient 0 is 8 run/0: ingredient 1 is 2 run/0: ingredient 1 is 2 run/0: product 0 is 4 -mem/0: storing in location 1 +mem/0: storing 4 in location 1 diff --git a/cpp/.traces/divide_with_remainder b/cpp/.traces/divide_with_remainder index 4c417eed..38d40c9c 100644 --- a/cpp/.traces/divide_with_remainder +++ b/cpp/.traces/divide_with_remainder @@ -15,16 +15,16 @@ after-brace/0: copy ... after-brace/0: divide_with_remainder ... run/0: instruction main/0 run/0: ingredient 0 is 27 -mem/0: storing in location 1 +mem/0: storing 27 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 11 -mem/0: storing in location 2 +mem/0: storing 11 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 27 run/0: ingredient 1 is 2 mem/0: location 2 is 11 run/0: product 0 is 2 -mem/0: storing in location 3 +mem/0: storing 2 in location 3 run/0: product 1 is 5 -mem/0: storing in location 4 +mem/0: storing 5 in location 4 diff --git a/cpp/.traces/divide_with_remainder_literal b/cpp/.traces/divide_with_remainder_literal index 4447d109..13f41d9f 100644 --- a/cpp/.traces/divide_with_remainder_literal +++ b/cpp/.traces/divide_with_remainder_literal @@ -9,6 +9,6 @@ run/0: instruction main/0 run/0: ingredient 0 is 9 run/0: ingredient 1 is 2 run/0: product 0 is 4 -mem/0: storing in location 1 +mem/0: storing 4 in location 1 run/0: product 1 is 1 -mem/0: storing in location 2 +mem/0: storing 1 in location 2 diff --git a/cpp/.traces/equal b/cpp/.traces/equal index e114b915..b44ac6bc 100644 --- a/cpp/.traces/equal +++ b/cpp/.traces/equal @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: equal ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 diff --git a/cpp/.traces/equal2 b/cpp/.traces/equal2 index 1589df01..ecbcf102 100644 --- a/cpp/.traces/equal2 +++ b/cpp/.traces/equal2 @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: equal ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 34 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/factorial b/cpp/.traces/factorial index ef8fff86..a1da686b 100644 --- a/cpp/.traces/factorial +++ b/cpp/.traces/factorial @@ -39,16 +39,16 @@ after-brace/0: 7: {name: "", value: -5, type: 0} after-brace/0: copy ... run/0: instruction factorial/0 run/0: ingredient 0 is 5 -mem/0: storing in location 1 +mem/0: storing 5 in location 1 run/0: instruction factorial/1 run/0: ingredient 0 is 1 -mem/0: storing in location 2 +mem/0: storing 1 in location 2 run/0: instruction factorial/3 run/0: ingredient 0 is 1 mem/0: location 1 is 5 run/0: ingredient 1 is 1 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 run/0: instruction factorial/4 mem/0: location 3 is 0 run/0: ingredient 0 is 0 @@ -60,13 +60,13 @@ run/0: ingredient 1 is 1 mem/0: location 1 is 5 run/0: ingredient 1 is 5 run/0: product 0 is 5 -mem/0: storing in location 2 +mem/0: storing 5 in location 2 run/0: instruction factorial/6 run/0: ingredient 0 is 1 mem/0: location 1 is 5 run/0: ingredient 1 is 1 run/0: product 0 is 4 -mem/0: storing in location 1 +mem/0: storing 4 in location 1 run/0: instruction factorial/7 run/0: ingredient 0 is -5 run/0: pc now 2 @@ -75,7 +75,7 @@ run/0: ingredient 0 is 1 mem/0: location 1 is 4 run/0: ingredient 1 is 1 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 run/0: instruction factorial/4 mem/0: location 3 is 0 run/0: ingredient 0 is 0 @@ -87,13 +87,13 @@ run/0: ingredient 1 is 1 mem/0: location 1 is 4 run/0: ingredient 1 is 4 run/0: product 0 is 20 -mem/0: storing in location 2 +mem/0: storing 20 in location 2 run/0: instruction factorial/6 run/0: ingredient 0 is 1 mem/0: location 1 is 4 run/0: ingredient 1 is 1 run/0: product 0 is 3 -mem/0: storing in location 1 +mem/0: storing 3 in location 1 run/0: instruction factorial/7 run/0: ingredient 0 is -5 run/0: pc now 2 @@ -102,7 +102,7 @@ run/0: ingredient 0 is 1 mem/0: location 1 is 3 run/0: ingredient 1 is 1 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 run/0: instruction factorial/4 mem/0: location 3 is 0 run/0: ingredient 0 is 0 @@ -114,13 +114,13 @@ run/0: ingredient 1 is 1 mem/0: location 1 is 3 run/0: ingredient 1 is 3 run/0: product 0 is 60 -mem/0: storing in location 2 +mem/0: storing 60 in location 2 run/0: instruction factorial/6 run/0: ingredient 0 is 1 mem/0: location 1 is 3 run/0: ingredient 1 is 1 run/0: product 0 is 2 -mem/0: storing in location 1 +mem/0: storing 2 in location 1 run/0: instruction factorial/7 run/0: ingredient 0 is -5 run/0: pc now 2 @@ -129,7 +129,7 @@ run/0: ingredient 0 is 1 mem/0: location 1 is 2 run/0: ingredient 1 is 1 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 run/0: instruction factorial/4 mem/0: location 3 is 0 run/0: ingredient 0 is 0 @@ -141,13 +141,13 @@ run/0: ingredient 1 is 1 mem/0: location 1 is 2 run/0: ingredient 1 is 2 run/0: product 0 is 120 -mem/0: storing in location 2 +mem/0: storing 120 in location 2 run/0: instruction factorial/6 run/0: ingredient 0 is 1 mem/0: location 1 is 2 run/0: ingredient 1 is 1 run/0: product 0 is 1 -mem/0: storing in location 1 +mem/0: storing 1 in location 1 run/0: instruction factorial/7 run/0: ingredient 0 is -5 run/0: pc now 2 @@ -156,7 +156,7 @@ run/0: ingredient 0 is 1 mem/0: location 1 is 1 run/0: ingredient 1 is 1 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 run/0: instruction factorial/4 mem/0: location 3 is 1 run/0: ingredient 0 is 1 @@ -165,4 +165,4 @@ run/0: jumping to instruction 8 run/0: instruction factorial/9 run/0: ingredient 0 is 2 mem/0: location 2 is 120 -mem/0: storing in location 4 +mem/0: storing 120 in location 4 diff --git a/cpp/.traces/get b/cpp/.traces/get index 165b9d8d..603027dc 100644 --- a/cpp/.traces/get +++ b/cpp/.traces/get @@ -14,10 +14,10 @@ after-brace/0: copy ... after-brace/0: get ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 12 +mem/0: storing 34 in location 12 run/0: instruction main/1 run/0: ingredient 0 is 35 -mem/0: storing in location 13 +mem/0: storing 35 in location 13 run/0: instruction main/2 run/0: ingredient 0 is 12 run/0: ingredient 1 is 1 @@ -25,4 +25,4 @@ run/0: address to copy is 13 run/0: its type is 1 mem/0: location 13 is 35 run/0: product 0 is 35 -mem/0: storing in location 15 +mem/0: storing 35 in location 15 diff --git a/cpp/.traces/get_address b/cpp/.traces/get_address index 7391d986..9de8754e 100644 --- a/cpp/.traces/get_address +++ b/cpp/.traces/get_address @@ -14,13 +14,13 @@ after-brace/0: copy ... after-brace/0: get-address ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 12 +mem/0: storing 34 in location 12 run/0: instruction main/1 run/0: ingredient 0 is 35 -mem/0: storing in location 13 +mem/0: storing 35 in location 13 run/0: instruction main/2 run/0: ingredient 0 is 12 run/0: ingredient 1 is 1 run/0: address to copy is 13 run/0: product 0 is 13 -mem/0: storing in location 15 +mem/0: storing 13 in location 15 diff --git a/cpp/.traces/get_address_indirect b/cpp/.traces/get_address_indirect index b7e71e53..bc7cb2e4 100644 --- a/cpp/.traces/get_address_indirect +++ b/cpp/.traces/get_address_indirect @@ -18,17 +18,17 @@ after-brace/0: copy ... after-brace/0: get-address ... run/0: instruction main/0 run/0: ingredient 0 is 2 -mem/0: storing in location 1 +mem/0: storing 2 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 35 -mem/0: storing in location 3 +mem/0: storing 35 in location 3 run/0: instruction main/3 run/0: ingredient 0 is 1 mem/0: location 1 is 2 run/0: ingredient 1 is 0 run/0: address to copy is 2 run/0: product 0 is 2 -mem/0: storing in location 4 +mem/0: storing 2 in location 4 diff --git a/cpp/.traces/get_handles_record_fields b/cpp/.traces/get_handles_record_fields index d0c19f67..af104e87 100644 --- a/cpp/.traces/get_handles_record_fields +++ b/cpp/.traces/get_handles_record_fields @@ -18,13 +18,13 @@ after-brace/0: copy ... after-brace/0: get ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 12 +mem/0: storing 34 in location 12 run/0: instruction main/1 run/0: ingredient 0 is 35 -mem/0: storing in location 13 +mem/0: storing 35 in location 13 run/0: instruction main/2 run/0: ingredient 0 is 36 -mem/0: storing in location 14 +mem/0: storing 36 in location 14 run/0: instruction main/3 run/0: ingredient 0 is 12 run/0: ingredient 1 is 1 @@ -32,4 +32,4 @@ run/0: address to copy is 14 run/0: its type is 1 mem/0: location 14 is 36 run/0: product 0 is 36 -mem/0: storing in location 15 +mem/0: storing 36 in location 15 diff --git a/cpp/.traces/get_indirect b/cpp/.traces/get_indirect index d29a679b..7b319905 100644 --- a/cpp/.traces/get_indirect +++ b/cpp/.traces/get_indirect @@ -18,13 +18,13 @@ after-brace/0: copy ... after-brace/0: get ... run/0: instruction main/0 run/0: ingredient 0 is 2 -mem/0: storing in location 1 +mem/0: storing 2 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 35 -mem/0: storing in location 3 +mem/0: storing 35 in location 3 run/0: instruction main/3 run/0: ingredient 0 is 1 mem/0: location 1 is 2 @@ -33,4 +33,4 @@ run/0: address to copy is 2 run/0: its type is 1 mem/0: location 2 is 34 run/0: product 0 is 34 -mem/0: storing in location 4 +mem/0: storing 34 in location 4 diff --git a/cpp/.traces/greater_or_equal b/cpp/.traces/greater_or_equal index b91ff266..201ee58d 100644 --- a/cpp/.traces/greater_or_equal +++ b/cpp/.traces/greater_or_equal @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: greater-or-equal ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/greater_or_equal2 b/cpp/.traces/greater_or_equal2 index dbaac94f..53ae7103 100644 --- a/cpp/.traces/greater_or_equal2 +++ b/cpp/.traces/greater_or_equal2 @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: greater-or-equal ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 34 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/greater_or_equal3 b/cpp/.traces/greater_or_equal3 index 24d3969c..537c15b7 100644 --- a/cpp/.traces/greater_or_equal3 +++ b/cpp/.traces/greater_or_equal3 @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: greater-or-equal ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 35 -mem/0: storing in location 2 +mem/0: storing 35 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 35 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 diff --git a/cpp/.traces/greater_than b/cpp/.traces/greater_than index 9d7645b3..3270a580 100644 --- a/cpp/.traces/greater_than +++ b/cpp/.traces/greater_than @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: greater-than ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/greater_than2 b/cpp/.traces/greater_than2 index 21ecf7ae..723816e0 100644 --- a/cpp/.traces/greater_than2 +++ b/cpp/.traces/greater_than2 @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: greater-than ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 34 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 diff --git a/cpp/.traces/include_nonderef_properties b/cpp/.traces/include_nonderef_properties index 6abd913d..ee2f7593 100644 --- a/cpp/.traces/include_nonderef_properties +++ b/cpp/.traces/include_nonderef_properties @@ -18,13 +18,13 @@ after-brace/0: copy ... after-brace/0: get ... run/0: instruction main/0 run/0: ingredient 0 is 2 -mem/0: storing in location 1 +mem/0: storing 2 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 35 -mem/0: storing in location 3 +mem/0: storing 35 in location 3 run/0: instruction main/3 run/0: ingredient 0 is 1 mem/0: location 1 is 2 @@ -33,4 +33,4 @@ run/0: address to copy is 2 run/0: its type is 1 mem/0: location 2 is 34 run/0: product 0 is 34 -mem/0: storing in location 4 +mem/0: storing 34 in location 4 diff --git a/cpp/.traces/index b/cpp/.traces/index index e56fcb07..296103d2 100644 --- a/cpp/.traces/index +++ b/cpp/.traces/index @@ -22,16 +22,16 @@ after-brace/0: copy ... after-brace/0: index ... run/0: instruction main/0 run/0: ingredient 0 is 3 -mem/0: storing in location 1 +mem/0: storing 3 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 14 -mem/0: storing in location 2 +mem/0: storing 14 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 15 -mem/0: storing in location 3 +mem/0: storing 15 in location 3 run/0: instruction main/3 run/0: ingredient 0 is 16 -mem/0: storing in location 4 +mem/0: storing 16 in location 4 run/0: instruction main/4 run/0: ingredient 0 is 1 run/0: ingredient 1 is 0 @@ -39,4 +39,4 @@ run/0: address to copy is 2 run/0: its type is 1 mem/0: location 2 is 14 run/0: product 0 is 14 -mem/0: storing in location 5 +mem/0: storing 14 in location 5 diff --git a/cpp/.traces/index_address b/cpp/.traces/index_address index 87d6fdfc..de36bd37 100644 --- a/cpp/.traces/index_address +++ b/cpp/.traces/index_address @@ -22,19 +22,19 @@ after-brace/0: copy ... after-brace/0: index-address ... run/0: instruction main/0 run/0: ingredient 0 is 3 -mem/0: storing in location 1 +mem/0: storing 3 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 14 -mem/0: storing in location 2 +mem/0: storing 14 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 15 -mem/0: storing in location 3 +mem/0: storing 15 in location 3 run/0: instruction main/3 run/0: ingredient 0 is 16 -mem/0: storing in location 4 +mem/0: storing 16 in location 4 run/0: instruction main/4 run/0: ingredient 0 is 1 run/0: ingredient 1 is 0 run/0: address to copy is 2 run/0: product 0 is 2 -mem/0: storing in location 5 +mem/0: storing 2 in location 5 diff --git a/cpp/.traces/jump_if_fallthrough b/cpp/.traces/jump_if_fallthrough index 74e1a479..2d1119cc 100644 --- a/cpp/.traces/jump_if_fallthrough +++ b/cpp/.traces/jump_if_fallthrough @@ -12,4 +12,4 @@ run/0: ingredient 0 is 0 run/0: jump-if fell through run/0: instruction main/1 run/0: ingredient 0 is 1 -mem/0: storing in location 123 +mem/0: storing 1 in location 123 diff --git a/cpp/.traces/jump_unless_fallthrough b/cpp/.traces/jump_unless_fallthrough index b640b6be..dc1a7c40 100644 --- a/cpp/.traces/jump_unless_fallthrough +++ b/cpp/.traces/jump_unless_fallthrough @@ -12,4 +12,4 @@ run/0: ingredient 0 is 999 run/0: jump-unless fell through run/0: instruction main/1 run/0: ingredient 0 is 1 -mem/0: storing in location 123 +mem/0: storing 1 in location 123 diff --git a/cpp/.traces/lesser_or_equal b/cpp/.traces/lesser_or_equal index f0f012e2..bc747e14 100644 --- a/cpp/.traces/lesser_or_equal +++ b/cpp/.traces/lesser_or_equal @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: lesser-or-equal ... run/0: instruction main/0 run/0: ingredient 0 is 32 -mem/0: storing in location 1 +mem/0: storing 32 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 32 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/lesser_or_equal2 b/cpp/.traces/lesser_or_equal2 index 57a72378..dea05c02 100644 --- a/cpp/.traces/lesser_or_equal2 +++ b/cpp/.traces/lesser_or_equal2 @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: lesser-or-equal ... run/0: instruction main/0 run/0: ingredient 0 is 33 -mem/0: storing in location 1 +mem/0: storing 33 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 33 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/lesser_or_equal3 b/cpp/.traces/lesser_or_equal3 index d81e0530..9c30cc23 100644 --- a/cpp/.traces/lesser_or_equal3 +++ b/cpp/.traces/lesser_or_equal3 @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: lesser-or-equal ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 diff --git a/cpp/.traces/lesser_than b/cpp/.traces/lesser_than index ccf85cfc..33bef26c 100644 --- a/cpp/.traces/lesser_than +++ b/cpp/.traces/lesser_than @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: lesser-than ... run/0: instruction main/0 run/0: ingredient 0 is 32 -mem/0: storing in location 1 +mem/0: storing 32 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 32 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/lesser_than2 b/cpp/.traces/lesser_than2 index f2a6d7dc..d82b89fc 100644 --- a/cpp/.traces/lesser_than2 +++ b/cpp/.traces/lesser_than2 @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: lesser-than ... run/0: instruction main/0 run/0: ingredient 0 is 34 -mem/0: storing in location 1 +mem/0: storing 34 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 33 -mem/0: storing in location 2 +mem/0: storing 33 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 34 run/0: ingredient 1 is 2 mem/0: location 2 is 33 run/0: product 0 is 0 -mem/0: storing in location 3 +mem/0: storing 0 in location 3 diff --git a/cpp/.traces/multiply b/cpp/.traces/multiply index e5c78165..c4e3d986 100644 --- a/cpp/.traces/multiply +++ b/cpp/.traces/multiply @@ -14,10 +14,10 @@ after-brace/0: copy ... after-brace/0: multiply ... run/0: instruction main/0 run/0: ingredient 0 is 4 -mem/0: storing in location 1 +mem/0: storing 4 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 6 -mem/0: storing in location 2 +mem/0: storing 6 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 4 @@ -25,4 +25,4 @@ run/0: ingredient 1 is 2 mem/0: location 2 is 6 run/0: ingredient 1 is 6 run/0: product 0 is 24 -mem/0: storing in location 3 +mem/0: storing 24 in location 3 diff --git a/cpp/.traces/multiply_literal b/cpp/.traces/multiply_literal index 6822d54c..95134fea 100644 --- a/cpp/.traces/multiply_literal +++ b/cpp/.traces/multiply_literal @@ -9,4 +9,4 @@ run/0: ingredient 0 is 2 run/0: ingredient 1 is 3 run/0: ingredient 1 is 3 run/0: product 0 is 6 -mem/0: storing in location 1 +mem/0: storing 6 in location 1 diff --git a/cpp/.traces/next_ingredient b/cpp/.traces/next_ingredient index 5c77e068..03bee789 100644 --- a/cpp/.traces/next_ingredient +++ b/cpp/.traces/next_ingredient @@ -14,10 +14,10 @@ after-brace/0: add ... run/0: instruction main/0 run/0: instruction f/0 run/0: product 0 is 2 -mem/0: storing in location 12 +mem/0: storing 2 in location 12 run/0: instruction f/1 run/0: ingredient 0 is 1 run/0: ingredient 1 is 12 mem/0: location 12 is 2 run/0: product 0 is 3 -mem/0: storing in location 13 +mem/0: storing 3 in location 13 diff --git a/cpp/.traces/not b/cpp/.traces/not index ab7d4348..6a466f32 100644 --- a/cpp/.traces/not +++ b/cpp/.traces/not @@ -9,9 +9,9 @@ after-brace/0: copy ... after-brace/0: not ... run/0: instruction main/0 run/0: ingredient 0 is 1 -mem/0: storing in location 1 +mem/0: storing 1 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 1 mem/0: location 1 is 1 run/0: product 0 is 0 -mem/0: storing in location 2 +mem/0: storing 0 in location 2 diff --git a/cpp/.traces/or b/cpp/.traces/or index 17582d99..0cfbced4 100644 --- a/cpp/.traces/or +++ b/cpp/.traces/or @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: or ... run/0: instruction main/0 run/0: ingredient 0 is 1 -mem/0: storing in location 1 +mem/0: storing 1 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 0 -mem/0: storing in location 2 +mem/0: storing 0 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 1 run/0: ingredient 1 is 2 mem/0: location 2 is 0 run/0: product 0 is 1 -mem/0: storing in location 3 +mem/0: storing 1 in location 3 diff --git a/cpp/.traces/reply b/cpp/.traces/reply index 65f49f5b..e880d158 100644 --- a/cpp/.traces/reply +++ b/cpp/.traces/reply @@ -20,17 +20,17 @@ after-brace/0: reply ... run/0: instruction main/0 run/0: instruction f/0 run/0: product 0 is 2 -mem/0: storing in location 12 +mem/0: storing 2 in location 12 run/0: instruction f/1 run/0: ingredient 0 is 1 run/0: ingredient 1 is 12 mem/0: location 12 is 2 run/0: product 0 is 3 -mem/0: storing in location 13 +mem/0: storing 3 in location 13 run/0: instruction f/2 mem/0: location 12 is 2 mem/0: location 13 is 3 run/0: result 0 is 1[2...] -mem/0: storing in location 3 +mem/0: storing 2 in location 3 run/0: result 1 is 1[3...] -mem/0: storing in location 4 +mem/0: storing 3 in location 4 diff --git a/cpp/.traces/run_label b/cpp/.traces/run_label index 59dded7d..2a853c54 100644 --- a/cpp/.traces/run_label +++ b/cpp/.traces/run_label @@ -10,8 +10,8 @@ after-brace/0: copy ... after-brace/0: copy ... run/0: instruction main/1 run/0: ingredient 0 is 23 -mem/0: storing in location 1 +mem/0: storing 23 in location 1 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 23 -mem/0: storing in location 2 +mem/0: storing 23 in location 2 diff --git a/cpp/.traces/set_default_space b/cpp/.traces/set_default_space index e4a963a5..5c9d8cad 100644 --- a/cpp/.traces/set_default_space +++ b/cpp/.traces/set_default_space @@ -12,4 +12,4 @@ run/0: instruction main/0 run/0: ingredient 0 is 10 run/0: instruction main/1 run/0: ingredient 0 is 12 -mem/0: storing in location 11 +mem/0: storing 12 in location 11 diff --git a/cpp/.traces/store_indirect b/cpp/.traces/store_indirect index 2ac8aa81..165a8c07 100644 --- a/cpp/.traces/store_indirect +++ b/cpp/.traces/store_indirect @@ -9,8 +9,8 @@ after-brace/0: copy ... after-brace/0: copy ... run/0: instruction main/0 run/0: ingredient 0 is 2 -mem/0: storing in location 1 +mem/0: storing 2 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 mem/0: location 1 is 2 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 diff --git a/cpp/.traces/subtract b/cpp/.traces/subtract index f7bc4113..e6cddc03 100644 --- a/cpp/.traces/subtract +++ b/cpp/.traces/subtract @@ -14,14 +14,14 @@ after-brace/0: copy ... after-brace/0: subtract ... run/0: instruction main/0 run/0: ingredient 0 is 23 -mem/0: storing in location 1 +mem/0: storing 23 in location 1 run/0: instruction main/1 run/0: ingredient 0 is 34 -mem/0: storing in location 2 +mem/0: storing 34 in location 2 run/0: instruction main/2 run/0: ingredient 0 is 1 mem/0: location 1 is 23 run/0: ingredient 1 is 2 mem/0: location 2 is 34 run/0: product 0 is -11 -mem/0: storing in location 3 +mem/0: storing -11 in location 3 diff --git a/cpp/.traces/subtract_literal b/cpp/.traces/subtract_literal index 8e601f9b..f4f50afb 100644 --- a/cpp/.traces/subtract_literal +++ b/cpp/.traces/subtract_literal @@ -8,4 +8,4 @@ run/0: instruction main/0 run/0: ingredient 0 is 5 run/0: ingredient 1 is 2 run/0: product 0 is 3 -mem/0: storing in location 1 +mem/0: storing 3 in location 1 diff --git a/cpp/013run b/cpp/013run index 26436392..fa7e3468 100644 --- a/cpp/013run +++ b/cpp/013run @@ -5,7 +5,7 @@ recipe main [ ] +run: instruction main/0 +run: ingredient 0 is 23 -+mem: storing in location 1 ++mem: storing 23 in location 1 :(scenario copy) recipe main [ @@ -15,7 +15,7 @@ recipe main [ +run: instruction main/1 +run: ingredient 0 is 1 +mem: location 1 is 23 -+mem: storing in location 2 ++mem: storing 23 in location 2 :(before "End Types") // Book-keeping while running a recipe. @@ -139,7 +139,7 @@ void write_memory(reagent x, vector<int> data) { size_t size = size_of(x); if (size != data.size()) raise << "size mismatch in storing to " << x.to_string(); for (size_t offset = 0; offset < size; ++offset) { - trace("mem") << "storing in location " << base+offset; + trace("mem") << "storing " << data[offset] << " in location " << base+offset; Memory[base+offset] = data[offset]; } } diff --git a/cpp/014arithmetic b/cpp/014arithmetic index 846fdff3..915cd9ab 100644 --- a/cpp/014arithmetic +++ b/cpp/014arithmetic @@ -28,7 +28,7 @@ recipe main [ +run: ingredient 0 is 23 +run: ingredient 1 is 34 +run: product 0 is 57 -+mem: storing in location 1 ++mem: storing 57 in location 1 :(scenario "add") recipe main [ @@ -42,7 +42,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 34 +run: product 0 is 57 -+mem: storing in location 3 ++mem: storing 57 in location 3 :(before "End Globals") const int SUBTRACT = 3; @@ -73,7 +73,7 @@ recipe main [ +run: ingredient 0 is 5 +run: ingredient 1 is 2 +run: product 0 is 3 -+mem: storing in location 1 ++mem: storing 3 in location 1 :(scenario "subtract") recipe main [ @@ -87,7 +87,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 34 +run: product 0 is -11 -+mem: storing in location 3 ++mem: storing -11 in location 3 :(before "End Globals") const int MULTIPLY = 4; @@ -119,7 +119,7 @@ recipe main [ +run: ingredient 0 is 2 +run: ingredient 1 is 3 +run: product 0 is 6 -+mem: storing in location 1 ++mem: storing 6 in location 1 :(scenario "multiply") recipe main [ @@ -133,7 +133,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 6 +run: product 0 is 24 -+mem: storing in location 3 ++mem: storing 24 in location 3 :(before "End Globals") const int DIVIDE = 5; @@ -165,7 +165,7 @@ recipe main [ +run: ingredient 0 is 8 +run: ingredient 1 is 2 +run: product 0 is 4 -+mem: storing in location 1 ++mem: storing 4 in location 1 :(scenario "divide") recipe main [ @@ -179,7 +179,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 3 +run: product 0 is 9 -+mem: storing in location 3 ++mem: storing 9 in location 3 :(before "End Globals") const int DIVIDE_WITH_REMAINDER = 6; @@ -214,9 +214,9 @@ recipe main [ +run: ingredient 0 is 9 +run: ingredient 1 is 2 +run: product 0 is 4 -+mem: storing in location 1 ++mem: storing 4 in location 1 +run: product 1 is 1 -+mem: storing in location 2 ++mem: storing 1 in location 2 :(scenario "divide_with_remainder") recipe main [ @@ -230,6 +230,6 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 11 +run: product 0 is 2 -+mem: storing in location 3 ++mem: storing 2 in location 3 +run: product 1 is 5 -+mem: storing in location 4 ++mem: storing 5 in location 4 diff --git a/cpp/015boolean b/cpp/015boolean index e6dd12ba..2b85d9a4 100644 --- a/cpp/015boolean +++ b/cpp/015boolean @@ -32,7 +32,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 0 +run: product 0 is 0 -+mem: storing in location 3 ++mem: storing 0 in location 3 :(before "End Globals") const int OR = 8; @@ -67,7 +67,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 0 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(before "End Globals") const int NOT = 9; @@ -96,4 +96,4 @@ recipe main [ +run: ingredient 0 is 1 +mem: location 1 is 1 +run: product 0 is 0 -+mem: storing in location 2 ++mem: storing 0 in location 2 diff --git a/cpp/016jump b/cpp/016jump index 9d192e96..80f7aa8d 100644 --- a/cpp/016jump +++ b/cpp/016jump @@ -21,7 +21,7 @@ recipe main [ +run: instruction main/0 +run: ingredient 0 is 1 -run: instruction main/1 --mem: storing in location 1 +-mem: storing 1 in location 1 :(scenario "jump_backward") recipe main [ @@ -64,7 +64,7 @@ recipe main [ +run: ingredient 1 is 1 +run: jumping to instruction 2 -run: instruction main/1 --mem: storing in location 1 +-mem: storing 1 in location 1 :(scenario "jump_if_fallthrough") recipe main [ @@ -74,7 +74,7 @@ recipe main [ +run: instruction main/0 +run: jump-if fell through +run: instruction main/1 -+mem: storing in location 123 ++mem: storing 1 in location 123 :(before "End Globals") const int JUMP_UNLESS = 12; @@ -106,7 +106,7 @@ recipe main [ +run: ingredient 1 is 1 +run: jumping to instruction 2 -run: instruction main/1 --mem: storing in location 1 +-mem: storing 1 in location 1 :(scenario "jump_unless_fallthrough") recipe main [ @@ -117,4 +117,4 @@ recipe main [ +run: ingredient 0 is 999 +run: jump-unless fell through +run: instruction main/1 -+mem: storing in location 123 ++mem: storing 1 in location 123 diff --git a/cpp/017compare b/cpp/017compare index 57f70279..45deab06 100644 --- a/cpp/017compare +++ b/cpp/017compare @@ -30,7 +30,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 0 -+mem: storing in location 3 ++mem: storing 0 in location 3 :(scenario "equal2") recipe main [ @@ -44,7 +44,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 34 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(before "End Globals") const int GREATER_THAN = 14; @@ -79,7 +79,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(scenario "greater_than2") recipe main [ @@ -93,7 +93,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 34 +run: product 0 is 0 -+mem: storing in location 3 ++mem: storing 0 in location 3 :(before "End Globals") const int LESSER_THAN = 15; @@ -128,7 +128,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(scenario "lesser_than2") recipe main [ @@ -142,7 +142,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 0 -+mem: storing in location 3 ++mem: storing 0 in location 3 :(before "End Globals") const int GREATER_OR_EQUAL = 16; @@ -177,7 +177,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(scenario "greater_or_equal2") recipe main [ @@ -191,7 +191,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 34 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(scenario "greater_or_equal3") recipe main [ @@ -205,7 +205,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 35 +run: product 0 is 0 -+mem: storing in location 3 ++mem: storing 0 in location 3 :(before "End Globals") const int LESSER_OR_EQUAL = 17; @@ -240,7 +240,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(scenario "lesser_or_equal2") recipe main [ @@ -254,7 +254,7 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 1 -+mem: storing in location 3 ++mem: storing 1 in location 3 :(scenario "lesser_or_equal3") recipe main [ @@ -268,4 +268,4 @@ recipe main [ +run: ingredient 1 is 2 +mem: location 2 is 33 +run: product 0 is 0 -+mem: storing in location 3 ++mem: storing 0 in location 3 diff --git a/cpp/018record b/cpp/018record index c19718cb..8acad726 100644 --- a/cpp/018record +++ b/cpp/018record @@ -21,8 +21,8 @@ recipe main [ +run: ingredient 0 is 1 +mem: location 1 is 34 +mem: location 2 is 35 -+mem: storing in location 3 -+mem: storing in location 4 ++mem: storing 34 in location 3 ++mem: storing 35 in location 4 :(before "End Globals") // Operator to look at fields of records. @@ -71,7 +71,7 @@ recipe main [ +run: its type is 1 +mem: location 13 is 35 +run: product 0 is 35 -+mem: storing in location 15 ++mem: storing 35 in location 15 :(before "End Mu Types Initialization") // A more complex record, containing another record. @@ -99,7 +99,7 @@ recipe main [ +run: its type is 1 +mem: location 14 is 36 +run: product 0 is 36 -+mem: storing in location 15 ++mem: storing 36 in location 15 :(before "End Globals") // To write to fields of records, you need their address. @@ -140,4 +140,4 @@ recipe main [ +run: ingredient 0 is 12 +run: ingredient 1 is 1 +run: address to copy is 13 -+mem: storing in location 15 ++mem: storing 13 in location 15 diff --git a/cpp/019address b/cpp/019address index 9e9e1164..c487dac6 100644 --- a/cpp/019address +++ b/cpp/019address @@ -10,7 +10,7 @@ recipe main [ +run: instruction main/2 +mem: location 1 is 2 +mem: location 2 is 34 -+mem: storing in location 3 ++mem: storing 34 in location 3 :(replace{} "vector<int> read_memory(reagent x)") vector<int> read_memory(reagent x) { @@ -40,7 +40,7 @@ recipe main [ ] +run: instruction main/1 +mem: location 1 is 2 -+mem: storing in location 2 ++mem: storing 34 in location 2 :(replace{} "void write_memory(reagent x, vector<int> data)") void write_memory(reagent x, vector<int> data) { @@ -51,7 +51,7 @@ void write_memory(reagent x, vector<int> data) { if (!Type[x.types[0]].is_array && size_of(x) != data.size()) raise << "size mismatch in storing to " << x.to_string(); for (size_t offset = 0; offset < data.size(); ++offset) { - trace("mem") << "storing in location " << base+offset; + trace("mem") << "storing " << data[offset] << " in location " << base+offset; Memory[base+offset] = data[offset]; } } @@ -110,7 +110,7 @@ recipe main [ +run: instruction main/3 +run: address to copy is 2 +run: product 0 is 34 -+mem: storing in location 4 ++mem: storing 34 in location 4 :(scenario "include_nonderef_properties") recipe main [ @@ -122,7 +122,7 @@ recipe main [ +run: instruction main/3 +run: address to copy is 2 +run: product 0 is 34 -+mem: storing in location 4 ++mem: storing 34 in location 4 :(replace{} "case GET:") case GET: { diff --git a/cpp/020array b/cpp/020array index d5e0204c..4ee04e98 100644 --- a/cpp/020array +++ b/cpp/020array @@ -23,10 +23,10 @@ recipe main [ +mem: location 2 is 14 +mem: location 3 is 15 +mem: location 4 is 16 -+mem: storing in location 5 -+mem: storing in location 6 -+mem: storing in location 7 -+mem: storing in location 8 ++mem: storing 3 in location 5 ++mem: storing 14 in location 6 ++mem: storing 15 in location 7 ++mem: storing 16 in location 8 :(before "End size_of Cases") if (t.is_array) { @@ -80,7 +80,7 @@ recipe main [ +run: its type is 1 +mem: location 2 is 14 +run: product 0 is 14 -+mem: storing in location 5 ++mem: storing 14 in location 5 :(before "End Globals") // To write to fields of records, you need their address. @@ -119,4 +119,4 @@ recipe main [ +run: ingredient 0 is 1 +run: ingredient 1 is 0 +run: address to copy is 2 -+mem: storing in location 5 ++mem: storing 2 in location 5 diff --git a/cpp/021call b/cpp/021call index 2e0000c0..ad7c3ee3 100644 --- a/cpp/021call +++ b/cpp/021call @@ -6,7 +6,7 @@ recipe main [ recipe f [ 3:integer <- add 2:literal, 2:literal ] -+mem: storing in location 3 ++mem: storing 4 in location 3 :(before "struct routine {") // Everytime a recipe runs another, we interrupt it and start running the new diff --git a/cpp/022call_ingredient b/cpp/022call_ingredient index 0401d5b9..3736177a 100644 --- a/cpp/022call_ingredient +++ b/cpp/022call_ingredient @@ -10,7 +10,7 @@ recipe f [ ] +run: instruction f/1 +mem: location 12 is 2 -+mem: storing in location 13 ++mem: storing 3 in location 13 :(before "End Call Fields") vector<vector<int> > ingredient_atoms; diff --git a/cpp/023call_reply b/cpp/023call_reply index 17f2c463..0fd09fc2 100644 --- a/cpp/023call_reply +++ b/cpp/023call_reply @@ -10,9 +10,9 @@ recipe f [ ] +run: instruction main/0 +run: result 0 is 1[2...] -+mem: storing in location 3 ++mem: storing 2 in location 3 +run: result 1 is 1[3...] -+mem: storing in location 4 ++mem: storing 3 in location 4 :(before "End Globals") const int REPLY = 23; diff --git a/cpp/025name b/cpp/025name index e943ddf3..d36552d3 100644 --- a/cpp/025name +++ b/cpp/025name @@ -9,7 +9,7 @@ recipe main [ ] +name: assign x 1 +run: instruction main/0 -+mem: storing in location 1 ++mem: storing 0 in location 1 :(after "int main") Transform.push_back(transform_names); diff --git a/cpp/027space b/cpp/027space index b3b2f001..67092ca0 100644 --- a/cpp/027space +++ b/cpp/027space @@ -8,7 +8,7 @@ recipe main [ default-space:address:space <- copy 10:literal 1:integer <- copy 12:literal ] -+mem: storing in location 11 ++mem: storing 12 in location 11 :(before "End Call Fields") size_t default_space; |