X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Fmeta.g;h=638fa71a19a21366e750b497ea9c13703e460d62;hp=110964f90f33671d255319d8b195f691c07b2edb;hb=1d5f76f8144b739719737bfe75f321caf67cfa19;hpb=445e76a3d7bad5831a9d66665c027c83d4504079

diff --git a/tests/meta.g b/tests/meta.g
index 110964f..638fa71 100644
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -1,61 +1,71 @@
-s         ::=  Grammar ws                  => "gram"
-w       !::= " "
-           | "\n"
-           | "\r"
-ws       !::=  w** | w** "//" (~[\n]*) "\n" !ws
-wp       !::=  w++
-Grammar   ::=  r +/ ws                        => "grammar"
-
-r         ::=  word  ^"::=" alternatives /ws
-            |  word ^"!::=" alternatives /ws
-
-alternatives  ::=  (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
-
-Conjuncts  ::=  Sequence
-             |  Sequence ^"&"  e*/ws   /ws
-             |  Sequence ^"&~" e*/ws   /ws
-
-ps         ::= e*/ws                              => "ps"
-             | (e+/ws !ws)? "^" Quoted (!ws e+/ws)? => "ps2"
-psy        ::= ps
-             | ps wp ^"/" !ws e
-psx        ::= psy                   => "psy"
-//             | e "<-" psy        /ws => "psyl"
-             |        psy "->" e /ws => "psyr"
-//             | e "<-" psy "->" e /ws => "psylr"
-Sequence   ::= Quoted => "qprod"
-             > psx => "psx"
-             | psx  "=>" ^"[]"         /ws
-             | psx ^"=>" (word|Quoted) /ws
-
-ec       ::= ~[\-\]\\]
-           | escaped
-
-Range    ::= ec          => "range"
-           | ec ^"-" ec
-
-e        ::=  word                          => "nonTerminal"
-           |  Quoted                        => "literal"
-           |    ^"()"
-           |    ^"{" Sequence "}"       /ws
-           |    ^"["  Range* "]"
-
-           |  (e ^"++"    /ws > e ^"+"    /ws)
-           |  (e ^"++/" e /ws > e ^"+/" e /ws)
-           |  (e ^"**"    /ws > e ^"*"    /ws)
-           |  (e ^"**/" e /ws > e ^"*/" e /ws)
-           |  ^"!" e                    /ws
-           |  e ^"?"                    /ws
-
-           |     "(" word         ^")"  /ws
-           >    ^"(" alternatives  ")"  /ws
-           |    ^"~" e
-
-word     ::= [a-zA-Z0-9_]++
-Quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
-           | "\"\"" => ""
-escaped  ::= "\\n" => "\n"
-           | "\\r" => "\r"
-           | "\\" ~[nr]
+//funkanomitron
+s             = ws Grammar ws
 
+Grammar::     = Declaration +/ ws
 
+Declaration   = NonTerminal
+              | ^"#import" FileName            /ws
+              | ^"#import" FileName "as" Word  /ws
+
+FileName::    = (~[\r\n ] | escaped)+ -> [\r\n ]
+
+NonTerminal   = NonTerminal:: Word            ws  "=" ws RHS
+              | DropNT::      Word  "!"       ws  "=" ws RHS
+              | Colons::      Word  "::"      ws  "=" ws RHS
+              |               Word  "*"       ws ^"=" ws RHS
+              |               Word  "*/" Word ws ^"=" ws RHS
+       
+RHS::         = ("|":: Sequence +/ (ws "|" ws)) +/ (ws ">" ws)
+
+Elements::    = e*/ws
+
+PreSequence   = Elements
+              | (Quoted|Word)   ^"::" PreSequence /ws
+              > PreSequence     ^"/"      e       /ws
+              | PreSequence     ^"->"     e       /ws
+
+Sequence      = PreSequence
+              | Sequence ^"&"  Elements /ws
+              | ^"~~"  Elements /ws
+              | Sequence ^"&~" Elements /ws
+
+e             =                                   e ^"!"
+              >                (Quoted|Word) ^":" e
+              >                NonTerminalReference:: Word
+              |                Literal:: Quoted
+              |                  ^"()"
+              |                  ^"{" PreSequence "}"    /ws
+              |                  ^"["  Range* "]"
+              |                e ^"++"                   /ws -> ~[/]
+              |                e ^"+"                    /ws -> ~[+]
+              |                e ^"++/" e                /ws        
+              |                e ^"+/"  e                /ws        
+              |                e ^"**"                   /ws -> ~[/]
+              |                e ^"*"                    /ws -> ~[*]
+              |                e ^"**/" e                /ws        
+              |                e ^"*/"  e                /ws        
+              |                e ^"?"                    /ws
+              |                  ^"^"   Quoted
+              |                  ^"`"   e
+              |                  ^"..."
+              |                   "(" Word  ^")"
+              >                  ^"(" RHS  ")"           /ws
+              |                 "~":: ("~" -> ~"~")!  e
+              |                  ^"\\{"
+              |                  ^"\\}"
+
+Word::        = [.a-zA-Z0-9_]++ &~ "."+
+Quoted::      = "\"" (~[\"\\] | escaped)+ "\""
+              | "\"\""
+
+Range::       = ec
+              | ec "-" ec
+
+ec            = ~[\-\]\\]
+              | escaped
+escaped       = "\n"::  "\\n"
+              | "\r"::  "\\r"
+              |         "\\" ~[nr]
+
+ws!          = [ \r\n]**
+             | [ \r\n]** "//" ~[\n]* "\n" ws