checkpoint

darcs-hash:20051222033652-5007d-6e316b6c5a48c4844c355707590ab7f88a8fdbfe.gz

diff --git a/TODO b/TODO
index 0ec9353..f3b5856 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,13 @@
 _____________________________________________________________________________
 Immediately
 
+  - Sensible tree-printout
+  - make Tib.Block extend Tree<>
+  - refine TIB
+      - documentation markup
+
+  - more natural phrasing of metagrammar?
+
   - finalize metagrammar and rdp-op's
 
   - Lay down the law on the different kinds of Sequence productions

diff --git a/tests/meta.g b/tests/meta.g
index 64f18f9..8a5b7e1 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,5 +1,6 @@
 s         ::=  ws grammar ws                  => "gram"
 ws       !::=  w**
+wp       !::=  w++
 grammar   ::=  r +/ ws                        => "grammar"
 
 r         ::=  word  ^"::=" alternatives /ws
@@ -14,7 +15,7 @@ conjuncts     ::=  sequence
 ps          ::= e*/ws                              => "ps"
               | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
 psx         ::= ps
-              > ps ^"/" e /ws
+              | ps wp ^"/" ws e
 sequence    ::= psx
               | psx ^"=>" (word|quoted) /ws
 

diff --git a/tests/regression.tc b/tests/regression.tc
index 69dc06f..0d4b8d4 100644 (file)
--- a/tests/regression.tc
+++ b/tests/regression.tc
@@ -25,7 +25,7 @@ tibcase {
   hello 
     there
     how
-      are
+      { are }
 ";
     output "yep";