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
5103b5b
..
f709a77
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-1,21
+1,21
@@
s ::= ws grammar ws => "gram"
ws !::= w**
s ::= ws grammar ws => "gram"
ws !::= 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) => "alternatives"
+alternatives ::= equiAlt +/ (ws ">" ws)
+equiAlt ::= conjuncts +/ (ws "|" ws) => "alternatives"
sequence ::= es
> es ws ^"/" e
sequence ::= es
> es ws ^"/" e
-es ::= e %% (w**)
+es ::= e */ (w**)
ss ::= es | es ^"/" e /ws
conjuncts ::= rewrite
ss ::= es | es ^"/" e /ws
conjuncts ::= rewrite
- | rewrite ^"&" e%%ws /ws
- | rewrite ^"&~" e%%ws /ws
+ | rewrite ^"&" e*/ws /ws
+ | rewrite ^"&~" e*/ws /ws
rewrite ::= sequence /ws => "rewrite"
| sequence ^"=>" word /ws
rewrite ::= sequence /ws => "rewrite"
| sequence ^"=>" word /ws
@@
-25,16
+25,14
@@
rewrite ::= sequence /ws => "rewrite"
ec ::= [~\-\]\\\~]
| escaped
ec ::= [~\-\]\\\~]
| escaped
-range ::= ec => "range0"
- | ec ^"-" ec => "range1"
+range ::= ec => "range"
+ | ec ^"-" ec
e ::= word => "nonTerminalY"
| [(][)] => "epsilon"
| ^"{" alternatives "}" /ws
e ::= word => "nonTerminalY"
| [(][)] => "epsilon"
| ^"{" alternatives "}" /ws
- | "[" (range*) "]" => "range"
- | "[~" (range*) "]" => "rangex"
- | e ^"%%" e /ws
- | e ^"$$" e /ws
+ | "[" (range*) "]" => "ranges"
+ | "[~" (range*) "]" => "rangesx"
| e ^"+/" e /ws
| e ^"*/" e /ws
| e ^"?" /ws
| e ^"+/" e /ws
| e ^"*/" e /ws
| e ^"?" /ws