ANTLR updated to 3.5