- if (strlen (ccl_token_and)==last->len &&
- !memcmp (ccl_token_and, last->name, last->len))
- last->kind = CCL_TOK_AND;
- else if (strlen (ccl_token_or)==last->len &&
- !memcmp (ccl_token_or, last->name, last->len))
- last->kind = CCL_TOK_OR;
- else if (strlen (ccl_token_not)==last->len &&
- !memcmp (ccl_token_not, last->name, last->len))
- last->kind = CCL_TOK_NOT;
- else if (strlen (ccl_token_set)==last->len &&
- !memcmp (ccl_token_set, last->name, last->len))
- last->kind = CCL_TOK_SET;
+ if (token_cmp (ccl_token_and, last))
+ last->kind = CCL_TOK_AND;
+ else if (token_cmp (ccl_token_or, last))
+ last->kind = CCL_TOK_OR;
+ else if (token_cmp (ccl_token_not, last))
+ last->kind = CCL_TOK_NOT;
+ else if (token_cmp (ccl_token_set, last))
+ last->kind = CCL_TOK_SET;