Fix generation of thrift map constants

map constants generated from .thrift files only contained the last entry. rearranged the ANTLR rules for parsing map constants in .thrift files to fix this.