-s ::= ws grammar ws => "gram"
-ws !::= w**
-grammar ::= r +/ ws => "grammar"
-
-r ::= word ^"::=" alternatives /ws
- | word ^"!::=" alternatives /ws
-
-alternatives ::= (conjuncts +/ (ws "|" ws)) +/ (ws ">" ws)
-
-conjuncts ::= sequence
- | sequence ^"&" e*/ws /ws
- | sequence ^"&~" e*/ws /ws
-
-ps ::= e*/ws => "ps"
- | (e+/ws ws)? "^" quoted (ws e+/ws)? => "ps2"
-psx ::= ps
- > ps ^"/" e /ws
-sequence ::= psx
- | psx ^"=>" (word|quoted) /ws
-
-ec ::= [~\-\]\\\~]
+s ::= Grammar ws => "gram"
+Grammar ::= NonTerminal +/ ws => "grammar"
+NonTerminal ::= word ^"::=" RHS /ws
+
+w ::= " " | "\n" | "\r"
+ws ::= w** => ()
+ | w** "//" (~[\n]*) "\n" ws => ()
+wp ::= w++
+
+RHS ::= (Conjuncts +/ (!ws "|" !ws)) +/ (!ws ">" !ws)
+
+Conjuncts ::= Sequence
+ | Sequence ^"&" e*/ws /ws
+ | Sequence ^"&~" e*/ws /ws
+
+ps ::= e*/ws => "ps"
+ | (e+/ws !ws)? ^"^" Quoted (!ws e+/ws)?
+psy ::= ps
+ | ps !wp ^"/" !ws e
+psx ::= psy => "psy"
+ | psy ^"->" e /ws
+Sequence ::= Quoted => "qprod"
+ > psx => "psx"
+ | psx "=>" ^"[]" /ws
+ | psx ^"=>" ("()"|word|Quoted) /ws
+
+ec ::= ~[\-\]\\]