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
5b69051
..
f709a77
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-1,22
+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 ^"/" e /ws
-Es ::= e+
-es ::= e %% ws
+sequence ::= es
+ > es ws ^"/" e
+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
@@
-26,16
+25,16
@@
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
- | "[" ranges "]" => "range"
- | "[~" ranges "]" => "rangex"
- | e ^"%%" e /ws
- | e ^"$$" e /ws
+ | "[" (range*) "]" => "ranges"
+ | "[~" (range*) "]" => "rangesx"
+ | e ^"+/" e /ws
+ | e ^"*/" e /ws
| e ^"?" /ws
| e ^"~/~" /ws
| e ^"?" /ws
| e ^"~/~" /ws
@@
-53,15
+52,13
@@
e ::= word => "nonTerminalY"
| "(" word ^")" /ws
> ^"(" alternatives ")" /ws
| "(" word ^")" /ws
> ^"(" alternatives ")" /ws
-ranges ::= range*
-
w !::= " "
w !::= " "
- | "//" [~\n]* "\n"
+ | "//" ([~\n]*) "\n"
| "\n"
| "\r"
an ::= [a-zA-Z0-9_]
word ::= an++ => "sify"
| "\n"
| "\r"
an ::= [a-zA-Z0-9_]
word ::= an++ => "sify"
-quoted ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
+quoted ::= "\"" (([~\"\\] | escaped)*) "\"" => "sify"
escaped ::= "\\n" => "\n"
| "\\r" => "\r"
| "\\" [~nr]
escaped ::= "\\n" => "\n"
| "\\r" => "\r"
| "\\" [~nr]