Sync cowang/antlr4 with antlr/antlr4