grammar: fix Parser documentation

The Parser documentation defines pvars a couple of times but it doesn't pass it to the Parser object itself. Fix the examples so that they handle it.

While we are at it, simplify the dictionary generation.