Ported to ANTLR 3.5
Lexer for notation fix