struct psi_cpp_macro_decl *psi_cpp_macro_decl_init(struct psi_plist *sig,
struct psi_plist *tokens, struct psi_num_exp *exp)
{
- struct psi_cpp_macro_decl *macro = calloc(1, sizeof(*macro));
+ struct psi_cpp_macro_decl *macro = pecalloc(1, sizeof(*macro), 1);
macro->exp = exp;
macro->sig = sig;
macro->tokens = tokens;
struct psi_cpp_macro_decl *macro = *macro_ptr;
*macro_ptr = NULL;
- if (macro->token) {
- free(macro->token);
- }
+ psi_token_free(¯o->token);
if (macro->exp) {
psi_num_exp_free(¯o->exp);
}
}
}
-void psi_cpp_macro_decl_dump(int fd, struct psi_cpp_macro_decl *macro)
+void psi_cpp_macro_decl_dump(struct psi_dump *dump, struct psi_cpp_macro_decl *macro)
{
- dprintf(fd, "%s", macro->token->text);
+ PSI_DUMP(dump, "%s", macro->token->text->val);
if (macro->sig) {
size_t i = 0;
struct psi_token *tok;
- dprintf(fd, "(");
+ PSI_DUMP(dump, "(");
while (psi_plist_get(macro->sig, i++, &tok)) {
- dprintf(fd, "%s%s", i>1?",":"", tok->text);
+ PSI_DUMP(dump, "%s%s", i>1?",":"", tok->text->val);
}
- dprintf(fd, ")");
+ PSI_DUMP(dump, ")");
}
if (macro->exp) {
- dprintf(fd, " ");
- psi_num_exp_dump(fd, macro->exp);
+ PSI_DUMP(dump, " ");
+ psi_num_exp_dump(dump, macro->exp);
+
+ assert(macro->tokens);
+
} else if (macro->tokens) {
size_t i = 0;
struct psi_token *tok;
while (psi_plist_get(macro->tokens, i++, &tok)) {
switch (tok->type) {
case PSI_T_QUOTED_STRING:
- dprintf(fd, " \"%s\"", tok->text);
+ PSI_DUMP(dump, " \"%s\"", tok->text->val);
break;
case PSI_T_QUOTED_CHAR:
- dprintf(fd, " '%s'", tok->text);
+ PSI_DUMP(dump, " '%s'", tok->text->val);
break;
default:
- dprintf(fd, " %s", tok->text);
+ PSI_DUMP(dump, " %s", tok->text->val);
}
}
}
psi_plist_get(l1, i, &t1);
psi_plist_get(l2, i, &t2);
- if (strcmp(t1->text, t2->text)) {
+ if (!zend_string_equals(t1->text, t2->text)) {
return false;
}
}
if (!cmp_token_list(d1->sig, d2->sig)) {
return false;
}
+ } else if (d2->sig) {
+ return false;
}
if (d1->tokens) {
if (!cmp_token_list(d1->tokens, d2->tokens)) {
return false;
}
+ } else if (d2->tokens) {
+ return false;
}
/* FIXME compare num_exps */