clean up Fountain.Concat, add Fountain.Util

[org.ibex.io.git] / src / org / ibex / io / Fountain.java

diff --git a/src/org/ibex/io/Fountain.java b/src/org/ibex/io/Fountain.java
index 8e2561c..dd21658 100644 (file)
--- a/src/org/ibex/io/Fountain.java
+++ b/src/org/ibex/io/Fountain.java
@@ -54,14 +54,56 @@ public interface Fountain {
     }
 
     public static class Concatenate implements Fountain {
-        Fountain f1, f2;
-        public Concatenate(Fountain f1, Fountain f2)     { this.f1 = f1; this.f2 = f2; }
-        public Stream getStream()                        { return f1.getStream().appendStream(f2.getStream()); }
-        public int getLength()                           { return f1.getLength()+f2.getLength(); }
-        public int getNumLines()                         { return f1.getNumLines()+f2.getNumLines(); }
+        private Fountain[] founts;
+        public Concatenate(Fountain f1, Fountain f2)     { this(new Fountain[] { f1, f2 }); }
+        public Concatenate(Fountain[] f)                 { this.founts = f; }
+        public Stream getStream() {
+            Stream ret = null;
+            for(int i=founts.length-1; i>=0; i--)
+                ret = ret==null ? founts[i].getStream() : founts[i].getStream().appendStream(ret);
+            return ret;
+        }
+        public long getLength() {
+            long ret = 0;
+            for(int i=0; i<founts.length; i++)
+                ret += founts[i].getLength();
+            return ret;
+        }
+        public int getNumLines() {
+            int ret = 0;
+            for(int i=0; i<founts.length; i++)
+                ret += founts[i].getNumLines();
+            return ret;
+        }
     }
 
     //public static class LazyCachingStreamFountain implements Fountain {
     //}
 
+    /*
+    public static interface Transformer {
+        public Fountain transform(Fountain in);
+
+        public static class Lift implements Fountain.Transformer {
+            private final Stream.Transformer func;
+            public Lift(Stream.Transformer func) { this.func = func; }
+            public Fountain transform(final Fountain in) {
+                return new Fountain() {
+                        public Stream getStream() {
+                            return func.transform(in.getStream()); } };
+            }
+        }
+    }
+    */
+
+    public static class Util {
+        public static Fountain create(String s) { return new StringFountain(s); }
+        public static Fountain concat(Fountain[] f) { return new Concatenate(f); }
+        public static Fountain concat(Fountain f1, Fountain f2) {
+            return new Concatenate(f1, f2);
+        }
+        public static Fountain concat(Fountain f1, Fountain f2, Fountain f3) {
+            return new Concatenate(f1, new Concatenate(f2, f3));
+        }
+    }
 }