projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[sbp.git]
/
tests
/
meta.g
diff --git
a/tests/meta.g
b/tests/meta.g
index
5347aeb
..
138ec62
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-1,23
+1,22
@@
-s ::= ws Grammar ws => "gram"
+s ::= ws grammar ws => "gram"
ws !::= w**
ws !::= w**
-grammar ::= R+/ws => "grammar"
-Grammar ::= R+ => "grammar"
-R ::= word ^"::=" Alternatives
- | word ^"!::=" Alternatives
+grammar ::= r+/ws => "grammar"
+r ::= word ^"::=" alternatives /ws
+ | word ^"!::=" alternatives /ws
ec ::= [~\]\\\-\~] | escaped
ec ::= [~\]\\\-\~] | escaped
-Alternatives ::= EquiAlt +/ ">"
-EquiAlt ::= Conjuncts +/ "|" => "alternatives"
+alternatives ::= equiAlt +/ (ws ">" ws)
+equiAlt ::= conjuncts +/ (ws "|" ws) => "alternatives"
sequence ::= Es
> Es ^"/" E /ws
Es ::= E+
//es ::= E+/ws
sequence ::= Es
> Es ^"/" E /ws
Es ::= E+
//es ::= E+/ws
-Conjuncts ::= rewrite
- | rewrite ^"&" sequence
- | rewrite ^"&~" sequence
+conjuncts ::= rewrite
+ | rewrite ^"&" sequence /ws
+ | rewrite ^"&~" sequence /ws
rewrite ::= sequence /ws => "rewrite"
| sequence ^"=>" word /ws
rewrite ::= sequence /ws => "rewrite"
| sequence ^"=>" word /ws
@@
-27,7
+26,7
@@
rewrite ::= sequence /ws => "rewrite"
range ::= ec => "range0" | ec ^"-" ec => "range0"
E ::= word => "nonTerminalY"
| [(][)] => "epsilon"
range ::= ec => "range0" | ec ^"-" ec => "range0"
E ::= word => "nonTerminalY"
| [(][)] => "epsilon"
- | ^"{" Alternatives "}"
+ | ^"{" alternatives "}"
| "[" [\~]? range* "]" => "range"
| E ^"*/" E
| E ^"+/" E
| "[" [\~]? range* "]" => "range"
| E ^"*/" E
| E ^"+/" E
@@
-46,7
+45,7
@@
E ::= word => "nonTerminalY"
| (E ^"++" > E ^"+")
| "(" word ^")"
| (E ^"++" > E ^"+")
| "(" word ^")"
- > ^"(" Alternatives ")"
+ > ^"(" alternatives ")"
w !::= " "
| "//" [~\n]* "\n"
w !::= " "
| "//" [~\n]* "\n"