From: adam Date: Mon, 26 Mar 2007 07:13:40 +0000 (-0400) Subject: fix bug that caused hang when parsing comments in grammar files X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=b910ad546f02d07664d32a70ce9acf6f049a64b1;hp=8ed318cb9c9f27861adf519522cbe9d95f094dab fix bug that caused hang when parsing comments in grammar files darcs-hash:20070326071340-5007d-8173dbb2b56d8425161830a65cdbb96289edcc78.gz --- diff --git a/src/edu/berkeley/sbp/meta/GrammarBuilder.java b/src/edu/berkeley/sbp/meta/GrammarBuilder.java index c7ef44a..5e1d3d9 100644 --- a/src/edu/berkeley/sbp/meta/GrammarBuilder.java +++ b/src/edu/berkeley/sbp/meta/GrammarBuilder.java @@ -100,7 +100,7 @@ public class GrammarBuilder { if (head.equals("Quoted")) return stringifyChildren(t); if (head.equals("Literal")) return new LiteralNode((String)walk(t.child(0))); if (head.equals("->")) return arrow((Seq)walk(t.child(0)), (ElementNode)walk(t.child(1))); - if (head.equals("DropNT")) return new NonTerminalNode((String)walk(t.child(0)), (Seq[][])walk(t.child(1)), true, null, true); + if (head.equals("DropNT")) return new NonTerminalNode((String)walk(t.child(0)), (Seq[][])walkChildren(t.child(1)), false, null, true); if (head.equals("=") && t.size()==2) return new NonTerminalNode((String)walk(t.child(0)), (Seq[][])walk(t.child(1)), true, null, false); if (head.equals("=")) return new NonTerminalNode((String)walk(t.child(0)), (Seq[][])walk(t.child(2)), true, (String)walk(t.child(1)), false); if (head.equals("&")) return and2((Seq)walk(t.child(0)), (Seq)walk(t.child(1)));