update lex, support NAME and other single char token