From bbaa9a17a69d38895efeb7ae6ddf03d73e64fd63 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 21 Dec 2005 22:09:29 -0500 Subject: [PATCH] checkpoint darcs-hash:20051222030929-5007d-538a39bd062b7b7402c25e9196944ed8ef0e2512.gz --- src/edu/berkeley/sbp/misc/MetaGrammar.java | 1 + src/edu/berkeley/sbp/tib/Tib.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index 748bcf3..1f0d205 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -51,6 +51,7 @@ public class MetaGrammar extends StringWalker { // MetaGrammar ////////////////////////////////////////////////////////////////////////////// + public Union nonTerminal(String str) { return nonTerminal(str, null, false, false); } public Union nonTerminal(String str, PreSequence[][] s, boolean synthetic, boolean dropAll) { Union n = str.equals(startSymbol) ? g : nt.get(str); if (n == null) nt.put(str, n = new Union(str, synthetic)); diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java index 200544a..59336df 100644 --- a/src/edu/berkeley/sbp/tib/Tib.java +++ b/src/edu/berkeley/sbp/tib/Tib.java @@ -297,7 +297,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"))), CharToken.rightBrace }) } -- 1.7.10.4