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
0f69022
..
b1fb352
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-1,29
+1,28
@@
-s ::= Grammar ws => "gram"
-ws !::= w** | w** "//" (~[\n]*) "\n" ws
-wp !::= w++
-Grammar ::= r +/ ws => "grammar"
+s ::= Grammar ws => "gram"
+Grammar ::= NonTerminal +/ ws => "grammar"
+NonTerminal ::= word ^"::=" RHS /ws
-r ::= word ^"::=" alternatives /ws
- | word ^"!::=" alternatives /ws
+w ::= " " | "\n" | "\r"
+ws ::= w** => ()
+ | w** "//" (~[\n]*) "\n" ws => ()
+wp ::= w++
-alternatives ::= (Conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
+RHS ::= (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
-Conjuncts ::= Sequence
- | Sequence ^"&" e*/ws /ws
- | Sequence ^"&~" e*/ws /ws
+Conjuncts ::= Sequence
+ | Sequence ^"&" e*/ws /ws
+ | Sequence ^"&~" e*/ws /ws
ps ::= e*/ws => "ps"
ps ::= e*/ws => "ps"
- | (e+/ws ws)? "^" Quoted (ws e+/ws)? => "ps2"
+ | (e+/ws !ws)? ^"^" Quoted (!ws e+/ws)?
psy ::= ps
psy ::= ps
- | ps wp ^"/" ws e
+ | ps !wp ^"/" !ws e
psx ::= psy => "psy"
psx ::= psy => "psy"
- | e "<-" psy /ws => "psyl"
- | psy "->" e /ws => "psyr"
- | e "<-" psy "->" e /ws => "psylr"
+ | psy ^"->" e /ws
Sequence ::= Quoted => "qprod"
Sequence ::= Quoted => "qprod"
- > psx
+ > psx => "psx"
| psx "=>" ^"[]" /ws
| psx "=>" ^"[]" /ws
- | psx ^"=>" (word|Quoted) /ws
+ | psx ^"=>" ("()"|word|Quoted) /ws
ec ::= ~[\-\]\\]
| escaped
ec ::= ~[\-\]\\]
| escaped
@@
-37,19
+36,21
@@
e ::= word => "nonTerminal"
| ^"{" Sequence "}" /ws
| ^"[" Range* "]"
| ^"{" Sequence "}" /ws
| ^"[" Range* "]"
- | (e ^"++" /ws > e ^"+" /ws)
- | (e ^"++/" e /ws > e ^"+/" e /ws)
- | (e ^"**" /ws > e ^"*" /ws)
- | (e ^"**/" e /ws > e ^"*/" e /ws)
+ | e ^"++" /ws -> ~[/]
+ | e ^"+" /ws -> ~[+]
+ | e ^"++/" e /ws
+ | e ^"+/" e /ws
+ | e ^"**" /ws -> ~[/]
+ | e ^"*" /ws -> ~[*]
+ | e ^"**/" e /ws
+ | e ^"*/" e /ws
+ | ^"!" e /ws
| e ^"?" /ws
| "(" word ^")" /ws
| e ^"?" /ws
| "(" word ^")" /ws
- > ^"(" alternatives ")" /ws
+ > ^"(" RHS ")" /ws
| ^"~" e
| ^"~" e
-w !::= " "
- | "\n"
- | "\r"
word ::= [a-zA-Z0-9_]++
Quoted ::= "\"" ((~[\"\\] | escaped)+) "\""
| "\"\"" => ""
word ::= [a-zA-Z0-9_]++
Quoted ::= "\"" ((~[\"\\] | escaped)+) "\""
| "\"\"" => ""