updated grammar (uncompiled)

Integrating Irene's grammar to the current version. You may look at it
for implementation