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
55bc02a
..
1a97296
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-1,18
+1,17
@@
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
-ec ::= [~\]\\\-\~] | escaped
-
-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+
sequence ::= Es
> Es ^"/" e /ws
Es ::= e+
-//es ::= E+/ws
+es ::= e %% ws
+
conjuncts ::= rewrite
| rewrite ^"&" sequence /ws
conjuncts ::= rewrite
| rewrite ^"&" sequence /ws
@@
-23,13
+22,19
@@
rewrite ::= sequence /ws => "rewrite"
| sequence ^"=>" quoted /ws
| sequence "=>" "()" /ws => "wrap"
| sequence ^"=>" quoted /ws
| sequence "=>" "()" /ws => "wrap"
-range ::= ec => "range0" | ec ^"-" ec => "range0"
+ec ::= [~\-\]\\\~]
+ | escaped
+
+range ::= ec => "range0"
+ | ec ^"-" ec => "range1"
+
e ::= word => "nonTerminalY"
| [(][)] => "epsilon"
| ^"{" alternatives "}" /ws
e ::= word => "nonTerminalY"
| [(][)] => "epsilon"
| ^"{" alternatives "}" /ws
- | "[" [\~]? range* "]" => "range"
- | e ^"*/" e /ws
- | e ^"+/" e /ws
+ | "[" ranges "]" => "range"
+ | "[~" ranges "]" => "rangex"
+ | e ^"%%" e /ws
+ | e ^"$$" e /ws
| e ^"?" /ws
| e ^"~/~" /ws
| e ^"?" /ws
| e ^"~/~" /ws
@@
-47,6
+52,8
@@
e ::= word => "nonTerminalY"
| "(" word ^")" /ws
> ^"(" alternatives ")" /ws
| "(" word ^")" /ws
> ^"(" alternatives ")" /ws
+ranges ::= range*
+
w !::= " "
| "//" [~\n]* "\n"
| "\n"
w !::= " "
| "//" [~\n]* "\n"
| "\n"
@@
-57,3
+64,5
@@
quoted ::= "\"" ([~\"\\] | escaped)* "\"" => "sify"
escaped ::= "\\n" => "\n"
| "\\r" => "\r"
| "\\" [~nr]
escaped ::= "\\n" => "\n"
| "\\r" => "\r"
| "\\" [~nr]
+
+