X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fmeta.g;h=807f15f080c93a0453c3a452db883844f3ec69ae;hb=5964a1161340a16d7dea471372737f2474576ceb;hp=c9f53a2701813254feee1d6ed3b73ec45134aaa8;hpb=0cbfa6761776083d952b492517ce9f5b866864f5;p=sbp.git

diff --git a/tests/meta.g b/tests/meta.g
index c9f53a2..807f15f 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -9,13 +9,12 @@ Conjuncts   ::=  Sequence
               |  Sequence ^"&~" Elements  /ws
 Elements    ::=  e*/ws
 
-psy         ::= Elements => "ps"
-              | psy !wp ^"/"  !ws e
-              | psy     ^"->"     e /ws
-Sequence    ::= Quoted => "qprod"
-              > psy => "psx"
-              | psy  "=>" ^"[]"              /ws
-              | psy ^"=>" ("()"|word|Quoted) /ws
+PreSequence ::= Elements => "ps"
+              | PreSequence !wp ^"/"  !ws e
+              | PreSequence     ^"->"     e /ws
+              | (Quoted|word)   ^"::" PreSequence /ws
+              | PreSequence     ^"=>" ("[]"|"()"|word|Quoted) /ws
+Sequence    ::= PreSequence    => "psx"
 
 ec          ::= ~[\-\]\\]
               | escaped
@@ -23,12 +22,13 @@ ec          ::= ~[\-\]\\]
 Range       ::= ec          => "range"
               | ec ^"-" ec
 
-e           ::=  word                          => "nonTerminal"
+e           ::=
+                (Quoted|word) ^":" e
+              >  word                          => "nonTerminal"
               |  Quoted                        => "literal"
               |    ^"()"
               |    ^"{" Sequence "}"       /ws
               |    ^"["  Range* "]"
-
               |  e ^"++"                   /ws -> ~[/]
               |  e ^"+"                    /ws -> ~[+]
               |  e ^"++/" e                /ws