projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile changes
[sbp.git]
/
tests
/
meta.g
diff --git
a/tests/meta.g
b/tests/meta.g
index
7daac30
..
8a5b7e1
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-1,24
+1,23
@@
s ::= ws grammar ws => "gram"
ws !::= w**
s ::= ws grammar ws => "gram"
ws !::= w**
+wp !::= w++
grammar ::= r +/ ws => "grammar"
grammar ::= r +/ ws => "grammar"
+
r ::= word ^"::=" alternatives /ws
| word ^"!::=" alternatives /ws
r ::= word ^"::=" alternatives /ws
| word ^"!::=" alternatives /ws
-alternatives ::= equiAlt +/ (ws ">" ws)
-equiAlt ::= conjuncts +/ (ws "|" ws)
-
-sequence ::= e */ (w**)
- > es ws ^"/" e
-es ::= e */ (w**)
+alternatives ::= (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
-ss ::= es => "seq" | es ^"/" e /ws
+conjuncts ::= sequence
+ | sequence ^"&" e*/ws /ws
+ | sequence ^"&~" e*/ws /ws
-conjuncts ::= rewrite
- | rewrite ^"&" e*/ws /ws
- | rewrite ^"&~" e*/ws /ws
-
-rewrite ::= sequence /ws => "rewrite"
- | sequence ^"=>" (word|quoted) /ws
+ps ::= e*/ws => "ps"
+ | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
+psx ::= ps
+ | ps wp ^"/" ws e
+sequence ::= psx
+ | psx ^"=>" (word|quoted) /ws
ec ::= [~\-\]\\\~]
| escaped
ec ::= [~\-\]\\\~]
| escaped
@@
-26,13
+25,12
@@
ec ::= [~\-\]\\\~]
range ::= ec => "range"
| ec ^"-" ec
range ::= ec => "range"
| ec ^"-" ec
-e ::= word => "nonTerminal"
- | [(][)] => "epsilon"
- | ^"{" alternatives "}" /ws
- | ^"[" (range*) "]"
- | ^"[~" (range*) "]"
- | ^"^" quoted /ws
- | ^"!" e /ws
+e ::= word => "nonTerminal"
+ | quoted => "literal"
+ | ^"()"
+ | ^"{" sequence "}" /ws
+ | ^"[" range* "]"
+ | ^"[~" range* "]"
| (e ws ^"**" > e ws ^"*")
| e ^"*/" e /ws
| (e ws ^"**" > e ws ^"*")
| e ^"*/" e /ws
@@
-40,17
+38,13
@@
e ::= word => "nonTerminal"
| e ^"+/" e /ws
| e ^"?" /ws
| e ^"+/" e /ws
| e ^"?" /ws
- | quoted => "literal"
-
- | "(" word ^")" /ws
- > ^"(" alternatives ")" /ws
-
+ | "(" word ^")" /ws
+ > ^"(" alternatives ")" /ws
w !::= " "
| "//" ([~\n]*) "\n"
| "\n"
| "\r"
w !::= " "
| "//" ([~\n]*) "\n"
| "\n"
| "\r"
-an ::= [a-zA-Z0-9_]
-word ::= an++
+word ::= [a-zA-Z0-9_]++
quoted ::= "\"" (([~\"\\] | escaped)+) "\""
| "\"\"" => ""
escaped ::= "\\n" => "\n"
quoted ::= "\"" (([~\"\\] | escaped)+) "\""
| "\"\"" => ""
escaped ::= "\\n" => "\n"