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
4f671c6
..
eba580e
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-8,16
+8,13
@@
Conjuncts ::= Sequence
| Sequence ^"&" Elements /ws
| Sequence ^"&~" Elements /ws
Elements ::= e*/ws
| Sequence ^"&" Elements /ws
| Sequence ^"&~" Elements /ws
Elements ::= e*/ws
+NamedElements ::= (e | word ^":" e) */ ws
-ps ::= Elements => "ps"
-psy ::= ps
- | ps !wp ^"/" !ws e
-psx ::= psy => "psy"
- | psy ^"->" e /ws
-Sequence ::= Quoted => "qprod"
- > psx => "psx"
- | psx "=>" ^"[]" /ws
- | psx ^"=>" ("()"|word|Quoted) /ws
+PreSequence ::= NamedElements => "ps"
+ | PreSequence !wp ^"/" !ws e
+ | PreSequence ^"->" e /ws
+ | PreSequence ^"=>" ("[]"|"()"|word|Quoted) /ws
+Sequence ::= PreSequence => "psx"
ec ::= ~[\-\]\\]
| escaped
ec ::= ~[\-\]\\]
| escaped
@@
-41,7
+38,7
@@
e ::= word => "nonTerminal"
| e ^"*/" e /ws
| ^"!" e /ws
| e ^"?" /ws
| e ^"*/" e /ws
| ^"!" e /ws
| e ^"?" /ws
- | "^" Quoted /ws => caret
+ | ^"^" Quoted /ws
| "(" word ^")" /ws
> ^"(" RHS ")" /ws
| "(" word ^")" /ws
> ^"(" RHS ")" /ws