upgrade to antlr4