added the '&&' and '||' tokens
added the CHAR token