X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fcpp_macro_decl.c;h=c26b70896564fac4160ae777afb9b42d233adf93;hp=d5e195c353fa0f35c442c064ceb79584ad4ef20c;hb=2fa436074ca9a5e87f39b696de832fa2188fcfc6;hpb=6ebcb60416cad353f5aeacebe919cb6990ef5a7d

diff --git a/src/types/cpp_macro_decl.c b/src/types/cpp_macro_decl.c
index d5e195c..c26b708 100644
--- a/src/types/cpp_macro_decl.c
+++ b/src/types/cpp_macro_decl.c
@@ -44,9 +44,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);
 		}
@@ -62,7 +60,7 @@ 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)
 {
-	dprintf(fd, "%s", macro->token->text);
+	dprintf(fd, "%s", macro->token->text->val);
 
 	if (macro->sig) {
 		size_t i = 0;
@@ -70,7 +68,7 @@ void psi_cpp_macro_decl_dump(int fd, struct psi_cpp_macro_decl *macro)
 
 		dprintf(fd, "(");
 		while (psi_plist_get(macro->sig, i++, &tok)) {
-			dprintf(fd, "%s%s", i>1?",":"", tok->text);
+			dprintf(fd, "%s%s", i>1?",":"", tok->text->val);
 		}
 		dprintf(fd, ")");
 	}
@@ -78,12 +76,77 @@ void psi_cpp_macro_decl_dump(int fd, struct psi_cpp_macro_decl *macro)
 	if (macro->exp) {
 		dprintf(fd, " ");
 		psi_num_exp_dump(fd, 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:
+				dprintf(fd, " \"%s\"", tok->text->val);
+				break;
+			case PSI_T_QUOTED_CHAR:
+				dprintf(fd, " '%s'", tok->text->val);
+				break;
+			default:
+				dprintf(fd, " %s", tok->text->val);
+			}
+		}
+	}
+}
+
+static inline bool cmp_token_list(struct psi_plist *l1, struct psi_plist *l2)
+{
+	size_t c = psi_plist_count(l1), i;
+
+	if (c != psi_plist_count(l2)) {
+		return false;
+	}
+
+	for (i = 0; i < c; ++i) {
+		struct psi_token *t1, *t2;
+
+		psi_plist_get(l1, i, &t1);
+		psi_plist_get(l2, i, &t2);
+
+		if (!zend_string_equals(t1->text, t2->text)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool psi_cpp_macro_decl_equal(struct psi_cpp_macro_decl *d1, struct psi_cpp_macro_decl *d2)
+{
+	if (d1->sig) {
+		if (!d2->sig) {
+			return false;
+		}
+
+		if (!cmp_token_list(d1->sig, d2->sig)) {
+			return false;
 		}
+	} else if (d2->sig) {
+		return false;
 	}
+
+	if (d1->tokens) {
+		if (!d2->tokens) {
+			return false;
+		}
+
+		if (!cmp_token_list(d1->tokens, d2->tokens)) {
+			return false;
+		}
+	} else if (d2->tokens) {
+		return false;
+	}
+
+	/* FIXME compare num_exps */
+
+	return true;
 }