Too much code error

- Added new rules to parser.cup
- TOFIX: too much code error in Parser.java, need to refactor grammar.