added TAnd to parser and enabled TOr and TNot in the lexer