cpp: fix dumping strings and chars

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

diff --git a/src/types/cpp_macro_decl.c b/src/types/cpp_macro_decl.c
index bfa230c3cf5963bb6a4edb0c7672cd41325a7543..e540131243761d44281744acddfbb7190ca249a9 100644 (file)
--- a/src/types/cpp_macro_decl.c
+++ b/src/types/cpp_macro_decl.c
@@ -74,4 +74,74 @@ void psi_cpp_macro_decl_dump(int fd, struct psi_cpp_macro_decl *macro)
                }
                dprintf(fd, ")");
        }
+
+       if (macro->exp) {
+               dprintf(fd, " ");
+               psi_num_exp_dump(fd, macro->exp);
+       } else if (macro->tokens) {
+               size_t i = 0;
+               struct psi_token *tok;
+
+               while (psi_plist_get(macro->tokens, i++, &tok)) {
+                       switch (tok->type) {
+                       case PSI_T_QUOTED_STRING:
+                               dprintf(fd, " \"%s\"", tok->text);
+                               break;
+                       case PSI_T_QUOTED_CHAR:
+                               dprintf(fd, " '%s'", tok->text);
+                               break;
+                       default:
+                               dprintf(fd, " %s", tok->text);
+                       }
+               }
+       }
+}
+
+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 (strcmp(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;
+               }
+       }
+
+       if (d1->tokens) {
+               if (!d2->tokens) {
+                       return false;
+               }
+
+               if (!cmp_token_list(d1->tokens, d2->tokens)) {
+                       return false;
+               }
+       }
+
+       /* FIXME compare num_exps */
+
+       return true;
 }