diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2015-02-22 00:17:18 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2015-02-22 00:17:18 -0800 |
| commit | 333777c693463e56f6560bf184db8eca832834d1 (patch) | |
| tree | 020353a158307591a62c9cf606e6a039b8d90441 /cpp | |
| parent | 6cc4621602ac00effcfedeeb01593d5e619db0f9 (diff) | |
| download | mu-333777c693463e56f6560bf184db8eca832834d1.tar.gz | |
815
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/.traces/get_address | 2 | ||||
| -rw-r--r-- | cpp/010vm | 5 | ||||
| -rw-r--r-- | cpp/017record | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/cpp/.traces/get_address b/cpp/.traces/get_address index 680b230b..296fd6c0 100644 --- a/cpp/.traces/get_address +++ b/cpp/.traces/get_address @@ -16,8 +16,6 @@ run/0: ingredient 0 is 35 mem/0: storing in location 13 run/0: instruction 2 run/0: ingredient 0 is 12 -run/0: base address 12 -run/0: base type is 4 run/0: ingredient 1 is 1 run/0: address to copy is 13 run/0: product 0 is 13 diff --git a/cpp/010vm b/cpp/010vm index 526d4593..e3cb9c30 100644 --- a/cpp/010vm +++ b/cpp/010vm @@ -134,15 +134,12 @@ void setup_recipes() { // Reagents have the form <name>:<type>:<type>:.../<property>/<property>/... reagent::reagent(string s) { -//? cout << s << '\n'; //? 1 istringstream in(s); name = slurp_until(in, ':'); istringstream ts(slurp_until(in, '/')); string t; - while (!(t = slurp_until(ts, ':')).empty()) { + while (!(t = slurp_until(ts, ':')).empty()) types.push_back(Type_number[t]); - } -//? cout << types.size() << '\n'; //? 1 // properties while (!in.eof()) { istringstream prop(slurp_until(in, '/')); diff --git a/cpp/017record b/cpp/017record index 8dd02643..3f5d9889 100644 --- a/cpp/017record +++ b/cpp/017record @@ -109,9 +109,6 @@ Next_recipe_number++; case GET_ADDRESS: { trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name; int base_address = to_int(instructions[pc].ingredients[0].name); - trace("run") << "base address " << base_address; - int base_type = instructions[pc].ingredients[0].types[0]; - trace("run") << "base type is " << base_type; trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name; assert(instructions[pc].ingredients[1].types.size() == 1); assert(instructions[pc].ingredients[1].types[0] == 0); // must be literal @@ -133,7 +130,6 @@ recipe main [ ] +run: instruction 2 +run: ingredient 0 is 12 -+run: base address 12 +run: ingredient 1 is 1 +run: address to copy is 13 +mem: storing in location 15 |