Browse Source

Remove dependency on Sequence for Pair

Billy Barrow 3 năm trước cách đây
mục cha
commit
ccd2e7c346

+ 0 - 15
src/lib/Concrete/Sequence.vala

@@ -17,17 +17,6 @@ namespace Invercargill {
 
         public Sequence() {}
 
-        //  public override bool iterate_if (PredicateDelegate<T> handler) {
-        //      var current = root;
-        //      while(current != null) {
-        //          if(!handler(current.value)) {
-        //              return false;
-        //          }
-        //          current = current.next;
-        //      }
-        //      return true;
-        //  }
-
         public override Tracker<T> get_tracker() {
             var current = root;
 
@@ -68,10 +57,6 @@ namespace Invercargill {
             return n_items;
         }
 
-        public override Enumerable<Pair<T, Tother>> pair<Tother>(Enumerable<Tother> other) {
-            return new PairEnumerable<T, Tother>(this, other.to_sequence());
-        }
-
     }
 
 }

+ 0 - 12
src/lib/Concrete/ZipperEnumerable.vala

@@ -10,18 +10,6 @@ namespace Invercargill {
             e2 = en2;
         }
 
-        //  public override bool iterate_if (PredicateDelegate<T> handler) {
-        //      return inputs.iterate_if (i => {
-        //          if(i.value1_is_set) {
-        //              if(!handler(i.value1)) { return false; }
-        //          }
-        //          if(i.value2_is_set) {
-        //              if(!handler(i.value2)) { return false; }
-        //          }
-        //          return true;
-        //      });
-        //  }
-
         public override Tracker<T> get_tracker() {
             var t1 = e1.get_tracker();
             var t2 = e2.get_tracker();

+ 1 - 1
src/lib/Enumerable.vala

@@ -112,7 +112,7 @@ namespace Invercargill {
         }
 
         public virtual Enumerable<Pair<T, Tother>> pair<Tother>(Enumerable<Tother> other) {
-            return to_sequence().pair(other);
+            return new PairEnumerable<T, Tother>(this, other);
         }
 
         public virtual Enumerable<T> zip(Enumerable<T> other) {