X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTib.java;h=a86b3abd3e0db0de422483234709cba23e22ee1e;hp=6693600dc232c9fd6e9d0afb28d1aeb738427b26;hb=44f1ba1ec309f9be850bd9c9400dfc5289f85dd0;hpb=a7b84506c2e1ed63343db215f76afced082e2826

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index 6693600..a86b3ab 100644
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -1,6 +1,4 @@
-// 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.*;
@@ -9,10 +7,6 @@ import edu.berkeley.sbp.chr.*;
 import java.util.*;
 import java.io.*;
 
-// TODO: multiple {{ }} for superquotation
-// TODO: strings
-// TODO: comments
-
 /**
  *   A slow, ugly, inefficient, inelegant, ad-hoc parser for TIB files.
  *
@@ -26,44 +20,48 @@ import java.io.*;
  */
 public class Tib implements Input<Character> {
 
+    public String showRegion(Region<Character> r, int max) { return ""; }
+
     public Tib(String s) throws IOException { this(new StringReader(s)); }
     public Tib(Reader r) throws IOException { this(new BufferedReader(r)); }
     public Tib(InputStream is) throws IOException { this(new BufferedReader(new InputStreamReader(is))); }
     public Tib(BufferedReader br) throws IOException {
         this.br = br;
         istack.add(-1);
-        //cur = parse(br);
-        //System.out.println("\rparsing: \"" + cur.toString(0, -1) + "\"");
     }
-
+    public String getName() { return null; }
     private String s = "";
     int pos = 0;
     int spos = 0;
 
     int _row = 1;
     int _col = 0;
-    public Input.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.err.print("\033[31m{\033[0m");
+            else if (ret==right) System.err.print("\033[31m}\033[0m");
+            else System.err.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;
@@ -83,12 +81,13 @@ public class Tib implements Input<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) {
@@ -133,68 +132,5 @@ public class Tib implements Input<Character> {
     }
     boolean blank = false;
 
-    // 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[] { CharRange.leftBrace,
-                                                                           ws,
-                                                                           u2,
-                                                                           ws,
-                                                                           CharRange.rightBrace
-                                           })
-                                       }
-                                   },
-                                   false,
-                                   false);
-            }
-            return super.walk(tree);
-        }
-    }
-
-    /*
-public class Braces extends Union {
-
-    private static final Element left  = string("{");
-    private static final Element right = string("}");
-    
-    public static String join(Object[] e) {
-        StringBuffer ret = new StringBuffer();
-        for(int i=0; i<e.length; i++) {
-            if (i>0) ret.append(" ");
-            ret.append(e[i]);
-        }
-        return ret.toString();
-    }
-
-    public Braces(Element[] e, Element sep) {
-        super("{"+join(e)+"}");
-        Element[] e2 = new Element[sep == null ? e.length+2 : e.length + 4];
-        e2[0]           = left;
-        e2[e2.length-1] = right;
-        if (sep != null) {
-            e2[1] = sep;
-            e2[e2.length-2] = sep;
-        }
-        for(int i=0; i<e.length; i++) e2[i+(sep==null ? 1 : 2)] = e[i];
-        addAlternative(new Sequence.Singleton(e2));
-        addAlternative(new Sequence.Singleton(sep==null ? new Element[] { left, this, right} : new Element[] { left, sep, this, sep, right }));
-    }
-}
-                      */
-
 }