Rename sequence to series to avoid conflicts

src/lib/Collections/BinaryData.vala

@@ -17,12 +17,12 @@ namespace Invercargill {
         }
 
         public BinaryData() {
-            chunks = new Sequence<Enumerable<uint8>>();
+            chunks = new Series<Enumerable<uint8>>();
             endianness = Endianness.Native;
         }
 
         public BinaryData.from_enumerable(Enumerable<uint8> data) {
-            chunks = Invercargill.single(data.to_sequence());
+            chunks = Invercargill.single(data.to_series());
             endianness = Endianness.Native;
         }
 

src/lib/Collections/Sequence.vala → src/lib/Collections/Series.vala

@@ -1,18 +1,18 @@
 namespace Invercargill {
 
-    public class Sequence<T> : Enumerable<T> {
+    public class Series<T> : Enumerable<T> {
      
-        internal class SequenceItem<T> {
-            public SequenceItem next = null;
+        internal class SeriesItem<T> {
+            public SeriesItem next = null;
             public T value;
 
-            public SequenceItem(T value) {
+            public SeriesItem(T value) {
                 this.value = value;
             }
 
-            // Carefully unlink sequence items when destructed.
-            // Very large sequences sometimes cause a segfault without this
-            ~SequenceItem() {
+            // Carefully unlink series items when destructed.
+            // Very large series sometimes cause a segfault without this
+            ~SeriesItem() {
                 var n = next;
                 while(n != null) {
                     var c = n;
@@ -22,11 +22,11 @@ namespace Invercargill {
             }
         }
 
-        internal SequenceItem<T> root;
-        internal SequenceItem<T> end;
+        internal SeriesItem<T> root;
+        internal SeriesItem<T> end;
         private int n_items = 0;
 
-        public Sequence() {}
+        public Series() {}
 
         public override Tracker<T> get_tracker() {
             var current = root;
@@ -53,7 +53,7 @@ namespace Invercargill {
         public void add(T item) {
             lock(root) {
                 n_items++;
-                var si = new SequenceItem<T>(item);
+                var si = new SeriesItem<T>(item);
                 if(root == null) {
                     root = si;
                     end = si;

src/lib/Enumerable.vala

@@ -24,10 +24,10 @@ namespace Invercargill {
             });
         }
 
-        public virtual Sequence<T> to_sequence() {
-            var sequence = new Sequence<T>();
-            iterate(i => sequence.add(i));
-            return sequence;
+        public virtual Series<T> to_series() {
+            var series = new Series<T>();
+            iterate(i => series.add(i));
+            return series;
         }
 
         public virtual Gee.Collection<T> to_collection() {
@@ -147,7 +147,7 @@ namespace Invercargill {
         }
 
         public virtual Enumerable<Tout> fork<Tout>(owned TransformDelegate<T, Tout> fork1, owned TransformDelegate<T, Tout> fork2) {
-            var seq = to_sequence();
+            var seq = to_series();
             return seq.select<Tout>((owned)fork1).zip(seq.select<Tout>((owned)fork2));
         }
 
@@ -160,7 +160,7 @@ namespace Invercargill {
         }
 
         public virtual Enumerable<T> with(T item) {
-            var seq = new Sequence<T>();
+            var seq = new Series<T>();
             seq.add(item);
             return concat(seq);
         }

src/lib/Invercargill.vala

@@ -33,7 +33,7 @@ namespace Invercargill {
     }
 
     public static Enumerable<T> single<T>(T item) {
-        var seq = new Invercargill.Sequence<T>();
+        var seq = new Invercargill.Series<T>();
         seq.add(item);
         return seq;
     }

src/lib/meson.build

@@ -35,7 +35,7 @@ sources += files('Concrete/ZipperEnumerable.vala')
 sources += files('Concrete/EmptyEnumerable.vala')
 sources += files('Concrete/Generator.vala')
 
-sources += files('Collections/Sequence.vala')
+sources += files('Collections/Series.vala')
 sources += files('Collections/Fifo.vala')
 sources += files('Collections/BinaryData.vala')
 

src/tests/Integration/Parallel.vala

@@ -15,7 +15,7 @@ void parallel_tests() {
             new ParallelObj(),
         });
 
-        var result = items.parallel_select<ParallelObj>(o => o.big_process(), 4).to_sequence();
+        var result = items.parallel_select<ParallelObj>(o => o.big_process(), 4).to_series();
         
         assert_true(result.all(o => o.processed));
     });