lots of updates to jison file

- make comments work
- add return statement
- add boolean and math expressions