First cut of Antlr4 migration
antlr4 migration test patch