fprintf(stderr, "NULL\n");
}
#endif
- if (cur && free_token) {
- free(cur);
+ if (free_token) {
+ psi_token_free(&cur);
}
count = psi_plist_count(cpp->tokens);
if (deleted && cpp->index >= count) {
if (free_tokens) {
while (num_eles--) {
- if (ptr[num_eles]) {
- free(ptr[num_eles]);
- }
+ psi_token_free(&ptr[num_eles]);
}
free(ptr);
}
struct psi_token *tmp_tok, *old_tok = exp_tokens[n - 1];
tmp_tok = psi_token_init(old_tok->type, "", 0,
- target->col, target->line, target->file?:"");
+ target->col, target->line,
+ target->file ? target->file : zend_empty_string);
new_tok = psi_token_cat(NULL, 3, tmp_tok, old_tok, tok);
- free(old_tok);
- free(tmp_tok);
+ psi_token_free(&old_tok);
+ psi_token_free(&tmp_tok);
exp_tokens[n - 1] = new_tok;
} else {
new_tok = psi_token_init(stringify ? PSI_T_QUOTED_STRING : tok->type,
- tok->text, tok->size, target->col, target->line, target->file?:"");
+ tok->text->val, tok->text->len, target->col, target->line,
+ target->file ?: zend_empty_string);
exp_tokens[n++] = new_tok;
}
struct psi_token *tok;
while (psi_plist_pop(arg_tokens_list[i], &tok)) {
- free(tok);
+ psi_token_free(&tok);
}
}
psi_plist_free(arg_tokens_list[i]);
struct psi_token *arg_name;
for (s = 0; psi_plist_get(macro->sig, s, &arg_name); ++s) {
- if (arg_name->size == tok->size) {
- if (!memcmp(arg_name->text, tok->text, tok->size)) {
- arg_tokens = arg_tokens_list[s];
- break;
- }
+ if (zend_string_equals(arg_name->text, tok->text)) {
+ arg_tokens = arg_tokens_list[s];
+ break;
}
}
}
/* back to where we took off */
psi_cpp_tokiter_seek(cpp, start);
- free(target);
+ psi_token_free(&target);
++cpp->expanded;
return true;
}
/* replace with tokens from macro */
psi_cpp_tokiter_expand_tokens(cpp, target, macro->tokens);
- free(target);
+ psi_token_free(&target);
++cpp->expanded;
return true;
}
psi_plist_get(m->tokens, 0, &r);
- return strcmp(r->text, t->text);
+ return !zend_string_equals(r->text, t->text);
}
return -1;
}
struct psi_token *current = psi_cpp_tokiter_current(cpp);
if (current) {
- struct psi_cpp_macro_decl *macro = zend_hash_str_find_ptr(
- &cpp->defs, current->text, current->size);
+ struct psi_cpp_macro_decl *macro = zend_hash_find_ptr(
+ &cpp->defs, current->text);
/* don't expand itself */
if (macro && macro->token != current) {