From 22a2ca7685dcf29e9ddcc6e26443ea0277385fca Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 26 Mar 2007 01:54:14 -0400 Subject: [PATCH] update metagrammar darcs-hash:20070326055414-5007d-97de2063168e41120efefd98e8374def6bc81e24.gz --- tests/meta.g | 84 ++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 46 deletions(-) diff --git a/tests/meta.g b/tests/meta.g index abe03f3..b1552f1 100644 --- a/tests/meta.g +++ b/tests/meta.g @@ -1,44 +1,36 @@ -// use 'a'-'z' or 'a-z' instead of [a-z]? -// EOF token? -// #include (with renaming?) +s = ws Grammar ws -s = ws! Grammar ws! +Grammar:: = Declaration +/ ws -Grammar = Declaration +/ ws +Declaration = NonTerminal + | ^"#import" FileName /ws + | ^"#import" FileName "as" Word /ws -Declaration = NonTerminal - | ^"#import" ws! FileName (ws! "as" ws! Word)? +FileName:: = (~[\r\n ] | escaped)+ -> [\r\n ] -FileName = FileNameChar+ -> [\r\n ] -FileNameChar = Space:: "\\ " - | ~[\r\n ] - -NonTerminal = Word "=" RHS /ws - | Word "*" ws! ^"=" ws! RHS - | Word "*/" Word ws! ^"=" ws! RHS +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 +RHS:: = ("|":: Sequence +/ (ws "|" ws)) +/ (ws ">" ws) -Sequence = psx:: PreSequence - | Sequence ^"&" Elements /ws - | Sequence ^"&~" Elements /ws +Elements:: = e*/ws -ec = ~[\-\]\\] - | escaped +PreSequence = Elements + | (Quoted|Word) ^"::" PreSequence /ws + > PreSequence ^"/" e /ws + | PreSequence ^"->" e /ws -Range = ec - | ec "-" ec +Sequence = PreSequence + | Sequence ^"&" Elements /ws + | Sequence ^"&~" Elements /ws -e = (Quoted|Word) ^":" e - > NonTerminalReference - | Literal +e = e ^"!" + > (Quoted|Word) ^":" e + > NonTerminalReference:: Word + | Literal:: Quoted | ^"()" | ^"{" PreSequence "}" /ws | ^"[" Range* "]" @@ -50,26 +42,26 @@ e = (Quoted|Word) ^":" e | e ^"*" /ws -> ~[*] | e ^"**/" e /ws | e ^"*/" e /ws - | e ^"!" | e ^"?" /ws | ^"^" Quoted + | "(" Word ^")" > ^"(" RHS ")" /ws | ^"~" e | ^"\\{" | ^"\\}" -NonTerminalReference = Word -Literal = Quoted -Word = [.a-zA-Z0-9_]++ -Quoted = "\"" ((~[\"\\] | escaped)+) "\"" - | EmptyString - EmptyString = "\"\"" +Word:: = [.a-zA-Z0-9_]++ +Quoted:: = "\"" (~[\"\\] | escaped)+ "\"" + | "\"\"" + +Range:: = ec + | ec "-" ec + +ec = ~[\-\]\\] + | escaped +escaped = "\n":: "\\n" + | "\r":: "\\r" + | "\\" ~[nr] -escaped = "\n":: "\\n" - | "\r":: "\\r" - | "\\" ~[nr] +ws! = [ \r\n]** ("//" ~[\n]* "\n" ws)? -w = " " | "\n" | "\r" -ws = w** - | w** "//" (~[\n])*! "\n" ws! -wp = w++ -- 1.7.10.4