remove more Tib junk

[sbp.git] / src / edu / berkeley / sbp / tib / Tib.java

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index 4b4a247..c2f3468 100644 (file)
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -1,10 +1,9 @@
-// Copyright 2005 the Contributors, as shown in the revision logs.
-// Licensed under the Apache Public Source License 2.0 ("the License").
-// You may not use this file except in compliance with the License.
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
 
 package edu.berkeley.sbp.tib;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.misc.*;
+import edu.berkeley.sbp.chr.*;
 import java.util.*;
 import java.io.*;
 
@@ -23,7 +22,9 @@ import java.io.*;
  *   experimentation with the TIB spec.  Once the spec is finalized it
  *   should probably be rewritten.
  */
-public class Tib implements Token.Stream<Character> {
+public class Tib implements Input<Character> {
+
+    public String showRegion(Region<Character> r) { return ""; }
 
     public Tib(String s) throws IOException { this(new StringReader(s)); }
     public Tib(Reader r) throws IOException { this(new BufferedReader(r)); }
@@ -41,28 +42,32 @@ public class Tib implements Token.Stream<Character> {
 
     int _row = 1;
     int _col = 0;
-    public Token.Location getLocation() { return new CartesianInput.Location(_row, _col); }
+    int _scalar = 0;
+    public Input.Location getLocation() { return new Cartesian.Location(_col, _row, _scalar); }
     private BufferedReader br;
 
-    char left = CharRange.left;
-    char right = CharRange.right;
+    char left = CharAtom.left;
+    char right = CharAtom.right;
 
     boolean waiting = false;
     char waitingChar = ' ';
     boolean indenting = true;
     int indentation = 0;
     private ArrayList<Integer> istack = new ArrayList<Integer>();
-    public Character next(int numstates, int resets, int waits) throws IOException {
-        Character ret = nextc(numstates, resets);
-        if      (ret==left)  System.out.print("\033[31m{\033[0m");
-        else if (ret==right) System.out.print("\033[31m}\033[0m");
-        else if (ret==null) return null;
-        else System.out.print(ret);
+    private static boolean debug = "true".equals(System.getProperty("tib.debug", "false"));
+    public Character next() throws IOException {
+        Character ret = nextc();
+        if (debug) {
+            if      (ret==null) return null;
+            else if (ret==left)  System.out.print("\033[31m{\033[0m");
+            else if (ret==right) System.out.print("\033[31m}\033[0m");
+            else System.out.print(ret);
+        }
         return ret;
     }
 
     Character waitingBrace = null;
-    public Character nextc(int numstates, int resets) throws IOException {
+    public Character nextc() throws IOException {
         char c;
         if (waitingBrace != null) {
             Character ret = waitingBrace;
@@ -82,12 +87,13 @@ public class Tib implements Token.Stream<Character> {
                 return null;
             }
             c = (char)i;
+            _scalar++;
+            if (c=='\n') { _row++; _col=0; }
+            else         _col++;
         }
-        if (c=='\n') { _row++; _col=0; }
-        else         _col++;
         if (indenting) {
             if (c==' ') { indentation++; return done(c); }
-            if (c=='\n') { indentation = 0; if (blank) return nextc(numstates, resets); blank = true; waiting = true; waitingChar='\n'; return '\n'; }
+            if (c=='\n') { indentation = 0; if (blank) return nextc(); blank = true; waiting = true; waitingChar='\n'; return '\n'; }
             int last = istack.size()==0 ? -1 : istack.get(istack.size()-1);
             if (indentation==last) {
                 if (blank) {
@@ -134,35 +140,33 @@ public class Tib implements Token.Stream<Character> {
 
     // Grammar //////////////////////////////////////////////////////////////////////////////
 
-    public static class Grammar extends MetaGrammar {
+    /*
+    public static class Grammar extends ReflectiveGrammar {
         private int anon = 0;
-        private final Element ws = Repeat.maximal0(nonTerminal("w"));
-        public Grammar() { dropAll.add(ws); }
+        private final Element ws = Sequence.maximal0(getNonTerminal("w"));
+        public Grammar(Class c) { super(c); 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 u = new Union("???");
                 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[] { CharRange.leftBrace,
-                                                                           ws,
-                                                                           u2,
-                                                                           ws,
-                                                                           CharRange.rightBrace
-                                           })
-                                       }
-                                   },
-                                   false,
-                                   false);
+                u2.add(Sequence.singleton(new Element[] { u }, 0));
+                return anonymousNonTerminal(new Sequence[][] {
+                    new Sequence[] {
+                        Sequence.singleton(new Element[] { CharAtom.leftBrace,
+                                                           ws,
+                                                           u2,
+                                                           ws,
+                                                           CharAtom.rightBrace
+                        }, 2)
+                    }
+                });
             }
             return super.walk(tree);
         }
     }
+    */
 
     /*
 public class Braces extends Union {