fixed shift/reduce parser errors in parser.mly, updated map unit tests