X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTib.java;h=eabc9eea863f799604972b4a0cb3d1f135979988;hp=59336df3787b36b744c4e0dc6a6f7ac0f3e666f3;hb=6bee7f519f499a92a92a459fd2c903d85de0759c;hpb=bbaa9a17a69d38895efeb7ae6ddf03d73e64fd63 diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java index 59336df..eabc9ee 100644 --- a/src/edu/berkeley/sbp/tib/Tib.java +++ b/src/edu/berkeley/sbp/tib/Tib.java @@ -289,6 +289,10 @@ public class Tib implements Token.Stream { public static class Grammar extends MetaGrammar { private int anon = 0; + private final Element ws = Repeat.maximal(Repeat.many0(nonTerminal("w"))); + public Grammar() { + dropAll.add(ws); + } public Object walk(Tree tree) { String head = tree.head(); if (tree.numChildren()==0) return super.walk(tree); @@ -297,9 +301,9 @@ public class Tib implements Token.Stream { new PreSequence[][] { new PreSequence[] { new PreSequence(new Element[] { CharToken.leftBrace, - Repeat.maximal(Repeat.many0(nonTerminal("w"))), - ((PreSequence)walk(tree, 0)).buildUnion(), - Repeat.maximal(Repeat.many0(nonTerminal("w"))), + ws, + ((PreSequence)walk(tree, 0)).sparse(ws).buildUnion(), + ws, CharToken.rightBrace }) }