From a70ce311134a98add10a2f7d4fe4919c3d64439b Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Fri, 4 Mar 2016 19:22:09 -0800
Subject: 2728 - don't ignore /space: while checking types

---
 060immutable.cc | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to '060immutable.cc')

diff --git a/060immutable.cc b/060immutable.cc
index d1b133c4..3017a6d0 100644
--- a/060immutable.cc
+++ b/060immutable.cc
@@ -251,7 +251,7 @@ recipe run-closure x:address:shared:number, s:address:shared:array:location [
   local-scope
   load-ingredients
   0:address:shared:array:location/names:new-closure <- copy s
-  *x/space:1 <- copy 34
+  *x:address:number/space:1 <- copy 34
 ]
 $error: 0
 
@@ -431,21 +431,6 @@ set<long long int> ingredient_indices(const instruction& inst, const set<reagent
   return result;
 }
 
-// reagent comparison just for this layer; assumes reagents are in the same recipe
-bool operator==(const reagent& a, const reagent& b) {
-  if (a.name != b.name) return false;
-  if (property(a, "space") != property(b, "space")) return false;
-  return true;
-}
-
-bool operator<(const reagent& a, const reagent& b) {
-  long long int aspace = 0, bspace = 0;
-  if (has_property(a, "space")) aspace = to_integer(property(a, "space")->value);
-  if (has_property(b, "space")) bspace = to_integer(property(b, "space")->value);
-  if (aspace != bspace) return aspace < bspace;
-  return a.name < b.name;
-}
-
 //: Sometimes you want to pass in two addresses, one pointing inside the
 //: other. For example, you want to delete a node from a linked list. You
 //: can't pass both pointers back out, because if a caller tries to make both
-- 
cgit 1.4.1-2-gfad0