Upgrade parser to Antlr 4