hoisted getLocation() out of Token and into Token.Stream
[sbp.git] / src / edu / berkeley / sbp / tib / Tib.java
index df56855..8ee70ca 100644 (file)
@@ -3,8 +3,8 @@
 // You may not use this file except in compliance with the License.
 
 package edu.berkeley.sbp.tib;
-//import org.ibex.util.*;
-//import org.ibex.io.*;
+import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.misc.*;
 import java.util.*;
 import java.io.*;
 
@@ -21,26 +21,65 @@ import java.io.*;
  *
  *   This was written as an ad-hoc parser to facilitate
  *   experimentation with the TIB spec.  Once the spec is finalized it
- *   should probably be rewritten using a parser-generator, if
- *   possible (it is unclear whether or not the associated grammar is
- *   context-free).
+ *   should probably be rewritten.
  */
-public class Tib /*implements Token.Stream<TibToken>*/ {
-    /*
+public class Tib implements Token.Stream<CharToken> {
 
-    private String str;
-
-    public Tib(InputStream is) { this(new BufferedReader(new InputStreamReader(is))); }
-    public Tib(BufferedReader br) {
-        Block b = parse(br);
+    public Tib(String s) throws IOException, Invalid { this(new StringReader(s)); }
+    public Tib(Reader r) throws IOException, Invalid { this(new BufferedReader(r)); }
+    public Tib(InputStream is) throws IOException, Invalid { this(new BufferedReader(new InputStreamReader(is))); }
+    public Tib(BufferedReader br) throws IOException, Invalid {
+        cur = parse(br);
+        System.out.println("\rparsing: \"" + cur.toString(0, -1) + "\"");
     }
 
-    public Token next() throws IOException {
-        if (pos >= str.length()) return Atom.EOF;
-        return Atom.fromChar(str.charAt(pos++));
+    private Block cur;
+    private String s = null;
+    int pos = 0;
+    int spos = 0;
+
+    int _row = 0;
+    int _col = 0;
+    public Token.Location getLocation() { return new CharToken.CartesianLocation(_row, _col); }
+    public CharToken next() throws IOException {
+        if (cur==null) return null;
+        if (s != null) {
+            if (spos < s.length()) {
+                char c = s.charAt(spos++);
+                if (c=='\n') { _row++; _col = 0; }
+                else _col++;
+                return new CharToken(c);
+            }
+            s = null;
+        }
+        if (pos >= cur.size()) {
+            pos = cur.iip+1;
+            cur = cur.parent;
+            if (cur==null) return null;
+            return CharToken.right;
+        }
+        Object o = cur.child(pos++);
+        if (o instanceof String) {
+            spos = 0;
+            s = (String)o;
+            return next();
+        }
+        if (o instanceof Block) {
+            Block b = (Block)o;
+            _row = b.row;
+            _col = b.col;
+        }
+        if (((Block)o).isLiteral()) {
+            spos = 0;
+            s = ((Block.Literal)o).text();
+            return next();
+        }
+        cur = (Block)o;
+        pos = 0;
+        return CharToken.left;
     }
 
-    public static Block parse(BufferedReader br) throws Invalid {
+    public static Block parse(BufferedReader br) throws Invalid, IOException {
         int row=0, col=0;
         try {
             boolean blankLine = false;
@@ -89,26 +128,30 @@ public class Tib /*implements Token.Stream<TibToken>*/ {
         }
     }
 
-    public static class Block implements Token {
+    public static class Block {
                       Block  parent;
         public  final int    row;
         public  final int    col;
-        private final Vec    children = new Vec();
+        public final int iip;
+        private final Vector children = new Vector();
         private       String pending  = "";
 
-        public Tree<String> result() {
-            // FIXME
-        }
-
-        public Location getLocation() { return new Location.Cartesian(row, col); }
-        public boolean isEOF() { return false; }
-
         public int    size() { return children.size(); }
         public Object child(int i) { return children.elementAt(i); }
         public boolean isLiteral() {  return false; }
 
-        protected Block(int row, int col)                { this.row=row; this.col=col; parent = null; }
-        public    Block(Block parent, int row, int col)  { this.row=row; this.col=col; (this.parent = parent).add(this); }
+        protected Block(int row, int col)                {
+            this.row=row;
+            this.col=col;
+            this.iip = -1;
+            parent = null;
+        }
+        public    Block(Block parent, int row, int col)  {
+            this.row=row;
+            this.col=col;
+            this.iip = parent.size();
+            (this.parent = parent).add(this);
+        }
 
         public void    add(String s)        { children.addElement(s); }
         public void    add(char c)          {
@@ -189,6 +232,7 @@ public class Tib /*implements Token.Stream<TibToken>*/ {
             public    Block  close() { return parent; }
             public    Block  closeIndent() { return close(); }
             public    void   add(String s) { if (content.length()>0) content.append('\n'); content.append(s); }
+            public    String text() { return content.toString(); }
             protected String toString(int indent, int justificationLimit) {
                 StringBuffer ret = new StringBuffer();
                 String s = content.toString();
@@ -210,7 +254,7 @@ public class Tib /*implements Token.Stream<TibToken>*/ {
     // Exceptions //////////////////////////////////////////////////////////////////////////////
 
     private static class InternalException extends RuntimeException { public InternalException(String s) { super(s); } }
-    public static class Invalid extends IOException {
+    public static class Invalid extends /*IOException*/RuntimeException {
         public Invalid(InternalException ie, int row, int col) {
             super(ie.getMessage() + " at " + row + ":" + col);
         }
@@ -218,7 +262,7 @@ public class Tib /*implements Token.Stream<TibToken>*/ {
 
     // Testing //////////////////////////////////////////////////////////////////////////////
 
-    public static void main(String[] s) throws Exception { System.out.println(parse(new Stream(System.in)).toString(-1)); }
+    public static void main(String[] s) throws Exception { System.out.println(parse(new BufferedReader(new InputStreamReader(System.in))).toString(-1)); }
     
     // Utilities //////////////////////////////////////////////////////////////////////////////
 
@@ -241,6 +285,38 @@ public class Tib /*implements Token.Stream<TibToken>*/ {
         }
         return ret.toString();
     }
-    */    
+
+    // Grammar //////////////////////////////////////////////////////////////////////////////
+
+    public static class Grammar extends MetaGrammar {
+        private int anon = 0;
+        private final Element ws = Repeat.maximal0(nonTerminal("w"));
+        public Grammar() { dropAll.add(ws); }
+        public Object walk(Tree<String> tree) {
+            String head = tree.head();
+            if (tree.numChildren()==0) return super.walk(tree);
+            if ("{".equals(head)) {
+                String s = "braced"+(anon++);
+                Union u = nonTerminal(s);
+                Union u2 = ((PreSequence)walk(tree, 0)).sparse(ws).buildUnion();
+                u2.add(Sequence.singleton(new Element[] { u }, 0, null, null));
+                return nonTerminal(s,
+                                   new PreSequence[][] {
+                                       new PreSequence[] {
+                                           new PreSequence(new Element[] { CharToken.leftBrace,
+                                                                           ws,
+                                                                           u2,
+                                                                           ws,
+                                                                           CharToken.rightBrace
+                                           })
+                                       }
+                                   },
+                                   false,
+                                   false);
+            }
+            return super.walk(tree);
+        }
+    }
+
 }