making parser compatible with new lexer