X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fcpp_macro_decl.c;h=40e6c97efb7afb73389d325a5c318fdef26d7eb5;hb=698841dfdd4d70d24e0b7af25ac7100bc2cb26a4;hp=42ed0f4208bbad931b8879dc6b575e370cc048e4;hpb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2;p=m6w6%2Fext-psi

diff --git a/src/types/cpp_macro_decl.c b/src/types/cpp_macro_decl.c
index 42ed0f4..40e6c97 100644
--- a/src/types/cpp_macro_decl.c
+++ b/src/types/cpp_macro_decl.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 "cpp.h"
 #include "data.h"
@@ -31,7 +35,7 @@
 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;
@@ -44,9 +48,7 @@ void psi_cpp_macro_decl_free(struct psi_cpp_macro_decl **macro_ptr)
 		struct psi_cpp_macro_decl *macro = *macro_ptr;
 
 		*macro_ptr = NULL;
-		if (macro->token) {
-			free(macro->token);
-		}
+		psi_token_free(&macro->token);
 		if (macro->exp) {
 			psi_num_exp_free(&macro->exp);
 		}
@@ -60,30 +62,42 @@ void psi_cpp_macro_decl_free(struct psi_cpp_macro_decl **macro_ptr)
 	}
 }
 
-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)) {
-			dprintf(fd, " %s", tok->text);
+			switch (tok->type) {
+			case PSI_T_QUOTED_STRING:
+				PSI_DUMP(dump, " \"%s\"", tok->text->val);
+				break;
+			case PSI_T_QUOTED_CHAR:
+				PSI_DUMP(dump, " '%s'", tok->text->val);
+				break;
+			default:
+				PSI_DUMP(dump, " %s", tok->text->val);
+			}
 		}
 	}
 }
@@ -102,7 +116,7 @@ static inline bool cmp_token_list(struct psi_plist *l1, struct psi_plist *l2)
 		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;
 		}
 	}
@@ -120,6 +134,8 @@ bool psi_cpp_macro_decl_equal(struct psi_cpp_macro_decl *d1, struct psi_cpp_macr
 		if (!cmp_token_list(d1->sig, d2->sig)) {
 			return false;
 		}
+	} else if (d2->sig) {
+		return false;
 	}
 
 	if (d1->tokens) {
@@ -130,6 +146,8 @@ bool psi_cpp_macro_decl_equal(struct psi_cpp_macro_decl *d1, struct psi_cpp_macr
 		if (!cmp_token_list(d1->tokens, d2->tokens)) {
 			return false;
 		}
+	} else if (d2->tokens) {
+		return false;
 	}
 
 	/* FIXME compare num_exps */