X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTib.java;h=167ad8b60deacb81085cd4662b8f456b230d8e36;hp=df568553580204d1519ee30c80f23a8b5a19260b;hb=2724e3d1df836f6ce40bc4227f1509e777de2e48;hpb=5cf6851e385edfdec4955120e03bf7e282dc8a68

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index df56855..167ad8b 100644
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -25,15 +25,14 @@ import java.io.*;
  *   possible (it is unclear whether or not the associated grammar is
  *   context-free).
  */
-public class Tib /*implements Token.Stream<TibToken>*/ {
+public class Tib /*implements Token.Stream<TreeToken<String>>*/ {
     /*
+    public final String str;
 
-    private String str;
-
+    public Tib(String s) { this(new StringReader(s)); }
+    public Tib(Reader r) { this(new BufferedReader(r)); }
     public Tib(InputStream is) { this(new BufferedReader(new InputStreamReader(is))); }
-    public Tib(BufferedReader br) {
-        Block b = parse(br);
-    }
+    public Tib(BufferedReader br) { str = parse(br).toString(0,-1); }
 
     public Token next() throws IOException {
         if (pos >= str.length()) return Atom.EOF;
@@ -241,6 +240,6 @@ public class Tib /*implements Token.Stream<TibToken>*/ {
         }
         return ret.toString();
     }
-    */    
+    */
 }