lexer fixed, COMPARATOR and LOGIC tokens added