commit after reset fuckup

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

diff --git a/src/types/impl.c b/src/types/impl.c
index e9bd39bebec5723c636a5731e10e7043cca91e5e..c1b9b9a29fe65be234eeffdb1a7f9b3636811dc7 100644 (file)
--- a/src/types/impl.c
+++ b/src/types/impl.c
@@ -31,7 +31,7 @@
 struct psi_impl *psi_impl_init(struct psi_impl_func *func,
                struct psi_plist *stmts)
 {
-       struct psi_impl *impl = calloc(1, sizeof(*impl));
+       struct psi_impl *impl = pecalloc(1, sizeof(*impl), 1);
        size_t i = 0;
        struct psi_token **abstract_stmt;
 
@@ -87,7 +87,7 @@ void psi_impl_free(struct psi_impl **impl_ptr)
        }
 }
 
-void psi_impl_dump(int fd, struct psi_impl *impl)
+void psi_impl_dump(struct psi_dump *dump, struct psi_impl *impl)
 {
        size_t i;
        struct psi_return_stmt *ret;
@@ -96,44 +96,47 @@ void psi_impl_dump(int fd, struct psi_impl *impl)
        struct psi_free_stmt *fre;
        struct psi_assert_stmt *ass;
 
-       psi_impl_func_dump(fd, impl->func);
-       dprintf(fd, " {\n");
+       psi_impl_func_dump(dump, impl->func);
+       PSI_DUMP(dump, " {\n");
        for (i = 0; psi_plist_get(impl->stmts.let, i, &let); ++i) {
-               psi_let_stmt_dump(fd, let);
+               psi_let_stmt_dump(dump, let);
        }
        for (i = 0; psi_plist_get(impl->stmts.ass, i, &ass); ++i) {
-               psi_assert_stmt_dump(fd, ass);
+               psi_assert_stmt_dump(dump, ass);
        }
        for (i = 0; psi_plist_get(impl->stmts.ret, i, &ret); ++i) {
-               psi_return_stmt_dump(fd, ret);
+               psi_return_stmt_dump(dump, ret);
        }
        for (i = 0; psi_plist_get(impl->stmts.set, i, &set); ++i) {
-               psi_set_stmt_dump(fd, set);
+               psi_set_stmt_dump(dump, set);
        }
        for (i = 0; psi_plist_get(impl->stmts.fre, i, &fre); ++i) {
-               psi_free_stmt_dump(fd, fre);
+               psi_free_stmt_dump(dump, fre);
        }
-       dprintf(fd, "}\n");
+       PSI_DUMP(dump, "}\n");
 }
 
-bool psi_impl_validate(struct psi_data *data, struct psi_impl *impl)
+bool psi_impl_validate(struct psi_data *data, struct psi_impl *impl,
+               struct psi_validate_scope *scope)
 {
-       if (!psi_impl_func_validate(data, impl->func)) {
+       scope->impl = impl;
+
+       if (!psi_impl_func_validate(data, impl->func, scope)) {
                return false;
        }
-       if (!psi_return_stmt_validate(data, impl)) {
+       if (!psi_return_stmt_validate(data, scope)) {
                return false;
        }
-       if (!psi_let_stmts_validate(data, impl)) {
+       if (!psi_let_stmts_validate(data, scope)) {
                return false;
        }
-       if (!psi_set_stmts_validate(data, impl)) {
+       if (!psi_set_stmts_validate(data, scope)) {
                return false;
        }
-       if (!psi_assert_stmts_validate(data, impl)) {
+       if (!psi_assert_stmts_validate(data, scope)) {
                return false;
        }
-       if (!psi_free_stmts_validate(data, impl)) {
+       if (!psi_free_stmts_validate(data, scope)) {
                return false;
        }
        return true;
@@ -187,7 +190,7 @@ struct psi_decl_arg *psi_impl_get_decl_arg(struct psi_impl *impl,
                        struct psi_decl_var *arg;
 
                        while (psi_plist_get(ret->exp->args, i++, &arg)) {
-                               if (!strcmp(var->name, arg->name)) {
+                               if (zend_string_equals(var->name, arg->name)) {
                                        return var->arg = arg->arg;
                                }
                        }
@@ -218,7 +221,7 @@ struct psi_impl_arg *psi_impl_get_arg(struct psi_impl *impl,
        struct psi_impl_arg *iarg;
 
        while (psi_plist_get(impl->func->args, i++, &iarg)) {
-               if (!strcmp(var->name, iarg->var->name)) {
+               if (zend_string_equals(var->name, iarg->var->name)) {
                        return var->arg = iarg;
                }
        }
@@ -235,7 +238,7 @@ struct psi_decl_arg *psi_impl_get_temp_let_arg(struct psi_impl *impl,
                if (let->exp->kind != PSI_LET_TMP) {
                        continue;
                }
-               if (strcmp(let->exp->var->name, var->name)) {
+               if (!zend_string_equals(let->exp->var->name, var->name)) {
                        continue;
                }
                return var->arg = let->exp->var->arg;