X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTib.java;h=401d9c0d5c28d190a699f962a3af80dc13968b81;hp=9ec8bd8225d694201fabafe26784a80e839d1006;hb=842f3c9b981b35721bb50d49e85c11085b2040a3;hpb=ebb5fe5647046306f415e31e4967b23169c9004e diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java index 9ec8bd8..401d9c0 100644 --- a/src/edu/berkeley/sbp/tib/Tib.java +++ b/src/edu/berkeley/sbp/tib/Tib.java @@ -50,8 +50,8 @@ public class Tib implements Token.Stream { boolean indenting = true; int indentation = 0; private ArrayList istack = new ArrayList(); - public CharToken next(int numstates) throws IOException { - CharToken ret = nextc(numstates); + public CharToken next(int numstates, int resets, int waits) throws IOException { + CharToken ret = nextc(numstates, resets); if (ret==CharToken.left) System.out.print("\033[31m{\033[0m"); else if (ret==CharToken.right) System.out.print("\033[31m}\033[0m"); else if (ret==null) return null; @@ -60,7 +60,7 @@ public class Tib implements Token.Stream { } CharToken waitingBrace = null; - public CharToken nextc(int numstates) throws IOException { + public CharToken nextc(int numstates, int resets) throws IOException { char c; if (waitingBrace != null) { CharToken ret = waitingBrace; @@ -85,7 +85,7 @@ public class Tib implements Token.Stream { else _col++; if (indenting) { if (c==' ') { indentation++; return done(c); } - if (c=='\n') { indentation = 0; if (blank) return nextc(numstates); blank = true; waiting = true; waitingChar='\n'; return new CharToken('\n'); } + if (c=='\n') { indentation = 0; if (blank) return nextc(numstates, resets); blank = true; waiting = true; waitingChar='\n'; return new CharToken('\n'); } int last = istack.size()==0 ? -1 : istack.get(istack.size()-1); if (indentation==last) { if (blank) {