fix gdbinit; postprocessing macros

[m6w6/ext-psi] / src / types / let_exp.c

diff --git a/src/types/let_exp.c b/src/types/let_exp.c
index 31750604abb26e01c13b7028b54e2a898d25de14..55bf5769cbcc46bb9dcf1065d1cc85766baba30f 100644 (file)
--- a/src/types/let_exp.c
+++ b/src/types/let_exp.c
@@ -30,6 +30,8 @@
 
 #include <assert.h>
 
+#include <Zend/zend_smart_str.h>
+
 struct psi_let_exp *psi_let_exp_init_ex(struct psi_decl_var *var,
                enum psi_let_exp_kind kind, void *data)
 {
@@ -40,7 +42,7 @@ struct psi_let_exp *psi_let_exp_init_ex(struct psi_decl_var *var,
 
 struct psi_let_exp *psi_let_exp_init(enum psi_let_exp_kind kind, void *data)
 {
-       struct psi_let_exp *let = calloc(1, sizeof(*let));
+       struct psi_let_exp *let = pecalloc(1, sizeof(*let), 1);
        switch (let->kind = kind) {
        case PSI_LET_NULL:
                assert(!data);
@@ -100,42 +102,42 @@ void psi_let_exp_free(struct psi_let_exp **let_ptr)
        }
 }
 
-void psi_let_exp_dump(int fd, struct psi_let_exp *val, unsigned level, int last)
+void psi_let_exp_dump(struct psi_dump *dump, struct psi_let_exp *val, unsigned level, int last)
 {
        if (level > 1) {
                /* only if not directly after `set ...` */
-               dprintf(fd, "%s", psi_t_indent(level));
+               PSI_DUMP(dump, "%s", psi_t_indent(level));
        }
 
        if (val->var) {
                if (val->var->token) {
-                       psi_decl_var_dump(fd, val->var);
-                       dprintf(fd, " = ");
+                       psi_decl_var_dump(dump, val->var);
+                       PSI_DUMP(dump, " = ");
                }
        }
        if (val->is_reference) {
-               dprintf(fd, "&");
+               PSI_DUMP(dump, "&");
        }
 
        switch (val->kind) {
        case PSI_LET_NULL:
-               dprintf(fd, "NULL");
+               PSI_DUMP(dump, "NULL");
                break;
        case PSI_LET_TMP:
-               psi_decl_var_dump(fd, val->data.var);
-               dprintf(fd, "\t/* fqn=%s */", val->data.var->fqn);
+               psi_decl_var_dump(dump, val->data.var);
+               PSI_DUMP(dump, "\t/* fqn=%s */", val->data.var->fqn->val);
                break;
        case PSI_LET_CALLOC:
-               psi_let_calloc_dump(fd, val->data.alloc);
+               psi_let_calloc_dump(dump, val->data.alloc);
                break;
        case PSI_LET_CALLBACK:
-               psi_let_callback_dump(fd, val->data.callback, level);
+               psi_let_callback_dump(dump, val->data.callback, level);
                break;
        case PSI_LET_FUNC:
-               psi_let_func_dump(fd, val->data.func, level);
+               psi_let_func_dump(dump, val->data.func, level);
                break;
        case PSI_LET_NUMEXP:
-               psi_num_exp_dump(fd, val->data.num);
+               psi_num_exp_dump(dump, val->data.num);
                break;
 
        default:
@@ -143,15 +145,15 @@ void psi_let_exp_dump(int fd, struct psi_let_exp *val, unsigned level, int last)
        }
 
        if (val->var) {
-               dprintf(fd, "\t/* fqn=%s */", val->var->fqn);
+               PSI_DUMP(dump, "\t/* fqn=%s */", val->var->fqn->val);
        }
 
        if (level > 1) {
                if (!last) {
-                       dprintf(fd, ",");
+                       PSI_DUMP(dump, ",");
                }
        } else {
-               dprintf(fd, ";");
+               PSI_DUMP(dump, ";");
        }
 }
 
@@ -165,7 +167,7 @@ bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
                if (!psi_decl_var_validate(data, val->data.var, scope)) {
                        data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
                                        PSI_WARNING, "Unknown variable '%s' in temp let statment of implementation '%s'",
-                                       dvar->name, scope->impl->func->name);
+                                       dvar->name->val, scope->impl->func->name->val);
                        return false;
                }
                break;
@@ -174,7 +176,7 @@ bool psi_let_exp_validate(struct psi_data *data, struct psi_let_exp *val,
                if (!psi_decl_var_validate(data, dvar, scope)) {
                        data->error(data, dvar->token ? : **(struct psi_token ***) &val->data,
                                        PSI_WARNING, "Unknown variable '%s' in let statement of implementation '%s'",
-                                       dvar->name, scope->impl->func->name);
+                                       dvar->name->val, scope->impl->func->name->val);
                        return false;
                }
                break;
@@ -322,10 +324,11 @@ struct psi_let_func* psi_let_exp_get_func(struct psi_let_exp* exp)
 struct psi_decl_var *psi_let_exp_get_decl_var(struct psi_let_exp *val)
 {
        if (!val->var) {
-               const char *name = psi_let_exp_get_decl_var_name(val);
+               zend_string *name = psi_let_exp_get_decl_var_name(val);
 
                if (name) {
                        val->var = psi_decl_var_init(name, 0, 0);
+                       zend_string_release(name);
                }
        }
        return val->var;
@@ -337,15 +340,22 @@ struct psi_impl_var *psi_let_exp_get_impl_var(struct psi_let_exp *val)
        return fn ? fn->var : NULL;
 }
 
-const char* psi_let_exp_get_decl_var_name(struct psi_let_exp* val)
+zend_string *psi_let_exp_get_decl_var_name(struct psi_let_exp* val)
 {
        struct psi_impl_var* var;
+
        if (val->var) {
-               return val->var->name;
+               return zend_string_copy(val->var->name);
        }
+
        var = psi_let_exp_get_impl_var(val);
        if (var) {
-               return &var->name[1];
+               smart_str name = {0};
+
+               smart_str_appendl_ex(&name, &var->name->val[1], var->name->len - 1, 1);
+
+               return smart_str_extract(&name);
        }
+
        return NULL;
 }