From f22d53e6ae3581e6c2dc096fd0cf93c18e2d2538 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 2 Jul 2006 14:04:51 -0400 Subject: [PATCH] checkpoint darcs-hash:20060702180451-5007d-fccdee589fbd97cb09acc0bf19cbce2902218e4e.gz --- src/edu/berkeley/sbp/chr/CharRange.java | 5 +++-- src/edu/berkeley/sbp/misc/Demo.java | 2 +- src/edu/berkeley/sbp/misc/MetaGrammar.java | 4 +++- tests/tibdoc.g | 11 ++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/edu/berkeley/sbp/chr/CharRange.java b/src/edu/berkeley/sbp/chr/CharRange.java index 8952536..6728012 100644 --- a/src/edu/berkeley/sbp/chr/CharRange.java +++ b/src/edu/berkeley/sbp/chr/CharRange.java @@ -19,8 +19,9 @@ public class CharRange extends Atom { public static final char left = (char)9998; public static final char right = (char)9999; - public static final Atom leftBrace = new CharRange(left,left) { public String toString() { return "{"; } }; - public static final Atom rightBrace = new CharRange(right,right) { public String toString() { return "}"; } }; + public static final Atom leftBrace = new CharRange(left,left) { public String toString() { return "[{]"; } }; + public static final Atom rightBrace = new CharRange(right,right) { public String toString() { return "[}]"; } }; + public static final Atom braces = new CharRange(left,right) { public String toString() { return "[{}]"; } }; public static Atom set(Range.Set r) { return new CharRange(new CharTopology(r)); } diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java index b3b9f4c..6b183e9 100644 --- a/src/edu/berkeley/sbp/misc/Demo.java +++ b/src/edu/berkeley/sbp/misc/Demo.java @@ -94,7 +94,7 @@ public class Demo { } public Object repeatTag() { return new Reducer() { - public String toString() { return "[**]"; } + public String toString() { return ""; } public Object reduce(Tree t) { Object[] ret = new Object[t.numChildren()]; for(int i=0; i t, Conjunct c) { this.element = makeMetaClause(t, c); } public String toString() { return "~"+element; } - public Element build(BuildContext bc) { return infer((Topology)Atom.toAtom(element.build(bc)).complement()); } + public Element build(BuildContext bc) { + return infer((Topology)Atom.toAtom(element.build(bc)).complement().minus(CharRange.braces)); + } } } diff --git a/tests/tibdoc.g b/tests/tibdoc.g index 2afac83..218274b 100644 --- a/tests/tibdoc.g +++ b/tests/tibdoc.g @@ -59,7 +59,7 @@ s = Doc Doc = head:{Header} body:Body /ws Header = "header" attrs:{ KeyVal */ ws } /ws Body = {Section}*/ws -Section = SectionHeader Paragraph* /ws +Section = SectionHeader Paragraphs /ws SectionHeader = "==" SectionHeaderBody "==" SectionHeaderBody = "=" SectionHeaderBody "=" > !ws alphanum++ !ws @@ -70,9 +70,10 @@ blank = !sp "\n" !sp "\n" !ws KeyVal = key:word "=" val:text /ws wp = w++ num = [0-9]++ -Paragraph = Blockquote:: { "\"\" " text } - > HR:: { "---" "-"* } - > P:: { text } +Paragraphs = "[]":: { Blockquote:: "\"\" " text } Paragraphs + > "[]":: { HR:: "---" "-"* } Paragraphs + > "[]":: { P:: text } Paragraphs + > () onums = nums !(". "|") ") any = ~[]* @@ -94,7 +95,7 @@ Item = blockquote > "[]":: "\"" text "\"" Itemx // > "[]":: symbol Itemx > "[]":: (Symbol:: sym++) Itemx - > "[]":: Paragraph Itemx +// > "[]":: Paragraph Itemx blockquote = Blockquote:: "\"\"" text "\"\"" | Blockquote:: "\"\"" block -- 1.7.10.4