797 - comparison instructions

13 files changed, 542 insertions, 0 deletions

diff --git a/cpp/.traces/equal b/cpp/.traces/equal
new file mode 100644
index 00000000..6d03ccfb
--- /dev/null
+++ b/cpp/.traces/equal
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 13
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/equal2 b/cpp/.traces/equal2
new file mode 100644
index 00000000..bb52e968
--- /dev/null
+++ b/cpp/.traces/equal2
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 13
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 34
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/greater_or_equal b/cpp/.traces/greater_or_equal
new file mode 100644
index 00000000..d01859ca
--- /dev/null
+++ b/cpp/.traces/greater_or_equal
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 16
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/greater_or_equal2 b/cpp/.traces/greater_or_equal2
new file mode 100644
index 00000000..6ce24011
--- /dev/null
+++ b/cpp/.traces/greater_or_equal2
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 16
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 34
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/greater_or_equal3 b/cpp/.traces/greater_or_equal3
new file mode 100644
index 00000000..7cba95fb
--- /dev/null
+++ b/cpp/.traces/greater_or_equal3
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "35", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 16
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 35
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/greater_than b/cpp/.traces/greater_than
new file mode 100644
index 00000000..aea0dbda
--- /dev/null
+++ b/cpp/.traces/greater_than
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 14
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/greater_than2 b/cpp/.traces/greater_than2
new file mode 100644
index 00000000..52c4019b
--- /dev/null
+++ b/cpp/.traces/greater_than2
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 14
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 34
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/lesser_or_equal b/cpp/.traces/lesser_or_equal
new file mode 100644
index 00000000..df518a0a
--- /dev/null
+++ b/cpp/.traces/lesser_or_equal
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "32", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 17
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 32
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/lesser_or_equal2 b/cpp/.traces/lesser_or_equal2
new file mode 100644
index 00000000..d87c8a37
--- /dev/null
+++ b/cpp/.traces/lesser_or_equal2
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 17
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 33
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/lesser_or_equal3 b/cpp/.traces/lesser_or_equal3
new file mode 100644
index 00000000..9576ddf9
--- /dev/null
+++ b/cpp/.traces/lesser_or_equal3
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 17
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/lesser_than b/cpp/.traces/lesser_than
new file mode 100644
index 00000000..5583f5fa
--- /dev/null
+++ b/cpp/.traces/lesser_than
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "32", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 15
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 32
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/.traces/lesser_than2 b/cpp/.traces/lesser_than2
new file mode 100644
index 00000000..735b78b0
--- /dev/null
+++ b/cpp/.traces/lesser_than2
@@ -0,0 +1,23 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "34", type: 0}
+parse/0:   product: {name: "1", type: 1}
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "33", type: 0}
+parse/0:   product: {name: "2", type: 1}
+parse/0: instruction: 15
+parse/0:   ingredient: {name: "1", type: 1}
+parse/0:   ingredient: {name: "2", type: 1}
+parse/0:   product: {name: "3", type: 1}
+run/0: instruction 0
+run/0: ingredient 0 is 34
+mem/0: storing in location 1
+run/0: instruction 1
+run/0: ingredient 0 is 33
+mem/0: storing in location 2
+run/0: instruction 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
diff --git a/cpp/016compare b/cpp/016compare
new file mode 100644
index 00000000..7da3dd16
--- /dev/null
+++ b/cpp/016compare
@@ -0,0 +1,266 @@
+:(before "End Globals")
+// Comparison ops.
+const int EQUAL = 13;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["equal"] = EQUAL;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case EQUAL: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  vector<int> arg0 = read_memory(instructions[pc].ingredients[0]);
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  vector<int> arg1 = read_memory(instructions[pc].ingredients[1]);
+  vector<int> result;
+  result.push_back(equal(arg0.begin(), arg0.end(), arg1.begin()));
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "equal")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 33:literal
+  3:integer <- equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 0
++mem: storing in location 3
+
+:(scenario "equal2")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 34:literal
+  3:integer <- equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 34
++run: product 0 is 1
++mem: storing in location 3
+
+:(before "End Globals")
+const int GREATER_THAN = 14;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["greater-than"] = GREATER_THAN;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case GREATER_THAN: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  vector<int> arg0 = read_memory(instructions[pc].ingredients[0]);
+  assert(arg0.size() == 1);
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  vector<int> arg1 = read_memory(instructions[pc].ingredients[1]);
+  assert(arg1.size() == 1);
+  vector<int> result;
+  result.push_back(arg0[0] > arg1[0]);
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "greater_than")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 33:literal
+  3:integer <- greater-than 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 1
++mem: storing in location 3
+
+:(scenario "greater_than2")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 34:literal
+  3:integer <- greater-than 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 34
++run: product 0 is 0
++mem: storing in location 3
+
+:(before "End Globals")
+const int LESSER_THAN = 15;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["lesser-than"] = LESSER_THAN;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case LESSER_THAN: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  vector<int> arg0 = read_memory(instructions[pc].ingredients[0]);
+  assert(arg0.size() == 1);
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  vector<int> arg1 = read_memory(instructions[pc].ingredients[1]);
+  assert(arg1.size() == 1);
+  vector<int> result;
+  result.push_back(arg0[0] < arg1[0]);
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "lesser_than")
+recipe main [
+  1:integer <- copy 32:literal
+  2:integer <- copy 33:literal
+  3:integer <- lesser-than 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 32
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 1
++mem: storing in location 3
+
+:(scenario "lesser_than2")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 33:literal
+  3:integer <- lesser-than 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 0
++mem: storing in location 3
+
+:(before "End Globals")
+const int GREATER_OR_EQUAL = 16;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["greater-or-equal"] = GREATER_OR_EQUAL;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case GREATER_OR_EQUAL: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  vector<int> arg0 = read_memory(instructions[pc].ingredients[0]);
+  assert(arg0.size() == 1);
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  vector<int> arg1 = read_memory(instructions[pc].ingredients[1]);
+  assert(arg1.size() == 1);
+  vector<int> result;
+  result.push_back(arg0[0] >= arg1[0]);
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "greater_or_equal")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 33:literal
+  3:integer <- greater-or-equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 1
++mem: storing in location 3
+
+:(scenario "greater_or_equal2")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 34:literal
+  3:integer <- greater-or-equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 34
++run: product 0 is 1
++mem: storing in location 3
+
+:(scenario "greater_or_equal3")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 35:literal
+  3:integer <- greater-or-equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 35
++run: product 0 is 0
++mem: storing in location 3
+
+:(before "End Globals")
+const int LESSER_OR_EQUAL = 17;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["lesser-or-equal"] = LESSER_OR_EQUAL;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case LESSER_OR_EQUAL: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  vector<int> arg0 = read_memory(instructions[pc].ingredients[0]);
+  assert(arg0.size() == 1);
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  vector<int> arg1 = read_memory(instructions[pc].ingredients[1]);
+  assert(arg1.size() == 1);
+  vector<int> result;
+  result.push_back(arg0[0] <= arg1[0]);
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "lesser_or_equal")
+recipe main [
+  1:integer <- copy 32:literal
+  2:integer <- copy 33:literal
+  3:integer <- lesser-or-equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 32
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 1
++mem: storing in location 3
+
+:(scenario "lesser_or_equal2")
+recipe main [
+  1:integer <- copy 33:literal
+  2:integer <- copy 33:literal
+  3:integer <- lesser-or-equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 33
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 1
++mem: storing in location 3
+
+:(scenario "lesser_or_equal3")
+recipe main [
+  1:integer <- copy 34:literal
+  2:integer <- copy 33:literal
+  3:integer <- lesser-or-equal 1:integer, 2:integer
+]
++run: instruction 2
++run: ingredient 0 is 1
++mem: location 1 is 34
++run: ingredient 1 is 2
++mem: location 2 is 33
++run: product 0 is 0
++mem: storing in location 3