removed macros from lexer source