make grammar more Haskell-like
Merge branch 'issue80'
Issue#80 should be settled with this change.
In addition, the Grammar is now more like Haskell's, at the expenso of 6 shift/reduce conflicts.