X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fimpl.c;h=1c4152a06f78c50c73cdf0b46f6d1c0362a63c25;hb=698841dfdd4d70d24e0b7af25ac7100bc2cb26a4;hp=e987147ac9848a2971234b6f631bb34e14707dcf;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e;p=m6w6%2Fext-psi

diff --git a/src/types/impl.c b/src/types/impl.c
index e987147..1c4152a 100644
--- a/src/types/impl.c
+++ b/src/types/impl.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 #include "data.h"
 
 #include <assert.h>
@@ -31,7 +35,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 +91,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,24 +100,24 @@ 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,
@@ -190,7 +194,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;
 				}
 			}
@@ -221,7 +225,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;
 		}
 	}
@@ -238,7 +242,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;