X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fcpp_exp.c;h=2288990fad8a04ecc6d18b00f6983c3728bf99e9;hp=ded4db5b614ea86a548d3aa0a3f7dfb6f5f7154c;hb=d2e0af1718294569a84c3c15616c74e4d55ea579;hpb=47dd00ab6df0a093b13d4f573ba01c79a6bcc72f

diff --git a/src/types/cpp_exp.c b/src/types/cpp_exp.c
index ded4db5..2288990 100644
--- a/src/types/cpp_exp.c
+++ b/src/types/cpp_exp.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 <assert.h>
 
@@ -32,7 +36,7 @@
 
 struct psi_cpp_exp *psi_cpp_exp_init(token_t type, void *data)
 {
-	struct psi_cpp_exp *exp = calloc(1, sizeof(*exp));
+	struct psi_cpp_exp *exp = pecalloc(1, sizeof(*exp), 1);
 
 	switch ((exp->type = type)) {
 	case PSI_T_WARNING:
@@ -101,9 +105,9 @@ void psi_cpp_exp_free(struct psi_cpp_exp **exp_ptr)
 	}
 }
 
-void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp)
+void psi_cpp_exp_dump(struct psi_dump *dump, struct psi_cpp_exp *exp)
 {
-	dprintf(fd, "#%s ", exp->token->text->val);
+	PSI_DUMP(dump, "#%s ", exp->token->text->val);
 	switch (exp->type) {
 	case PSI_T_WARNING:
 	case PSI_T_ERROR:
@@ -114,23 +118,23 @@ void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp)
 	case PSI_T_UNDEF:
 	case PSI_T_IFDEF:
 	case PSI_T_IFNDEF:
-		dprintf(fd, "%s", exp->data.tok->text->val);
+		PSI_DUMP(dump, "%s", exp->data.tok->text->val);
 		break;
 	case PSI_T_IMPORT:
 	case PSI_T_INCLUDE:
 	case PSI_T_INCLUDE_NEXT:
 		if (exp->data.tok->type == PSI_T_CPP_HEADER) {
-			dprintf(fd, "<%s>", exp->data.tok->text->val);
+			PSI_DUMP(dump, "<%s>", exp->data.tok->text->val);
 		} else {
-			dprintf(fd, "\"%s\"", exp->data.tok->text->val);
+			PSI_DUMP(dump, "\"%s\"", exp->data.tok->text->val);
 		}
 		break;
 	case PSI_T_DEFINE:
-		psi_cpp_macro_decl_dump(fd, exp->data.decl);
+		psi_cpp_macro_decl_dump(dump, exp->data.decl);
 		break;
 	case PSI_T_IF:
 	case PSI_T_ELIF:
-		psi_num_exp_dump(fd, exp->data.num);
+		psi_num_exp_dump(dump, exp->data.num);
 		break;
 	case PSI_T_ENDIF:
 	case PSI_T_ELSE:
@@ -140,7 +144,7 @@ void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp)
 		assert(0);
 		break;
 	}
-	dprintf(fd, "\n");
+	PSI_DUMP(dump, "\n");
 }
 
 
@@ -184,7 +188,8 @@ void psi_cpp_exp_exec(struct psi_cpp_exp *exp, struct psi_cpp *cpp, struct psi_d
 			exp->token->text->val, cpp->level, cpp->skip);
 
 #if PSI_CPP_DEBUG
-	psi_cpp_exp_dump(2, exp);
+	PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP exec -> ");
+	PSI_DEBUG_DUMP(cpp->parser, psi_cpp_exp_dump, exp);
 #endif
 
 	switch (exp->type) {
@@ -296,21 +301,24 @@ void psi_cpp_exp_exec(struct psi_cpp_exp *exp, struct psi_cpp *cpp, struct psi_d
 	case PSI_T_INCLUDE:
 		if (!cpp->skip) {
 			if (!psi_cpp_include(cpp, exp->data.tok, PSI_CPP_INCLUDE)) {
-				D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text->val);
+				D->error(D, exp->token, PSI_WARNING, "Failed to include %s: %s",
+						exp->data.tok->text->val, strerror(errno));
 			}
 		}
 		break;
 	case PSI_T_INCLUDE_NEXT:
 		if (!cpp->skip) {
 			if (!psi_cpp_include(cpp, exp->data.tok, PSI_CPP_INCLUDE_NEXT)) {
-				D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text->val);
+				D->error(D, exp->token, PSI_WARNING, "Failed to include next %s: %s",
+						exp->data.tok->text->val, strerror(errno));
 			}
 		}
 		break;
 	case PSI_T_IMPORT:
 		if (!cpp->skip) {
 			if (!psi_cpp_include(cpp, exp->data.tok, PSI_CPP_INCLUDE_ONCE)) {
-				D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text->val);
+				D->error(D, exp->token, PSI_WARNING, "Failed to include once %s: %s",
+						exp->data.tok->text->val, strerror(errno));
 			}
 		}
 		break;