X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.c;h=cf576d59a9b8aa42d1c184ac9ac0e156dd5443dd;hp=9d3395cead126fa366552b0f434395e5b2880fde;hb=b1c7c64ca1d1d9dc79a59c0f612bd07e7a997a60;hpb=2d34b0c215608bc3eae007ce5f4e80eae3c1e147;ds=sidebyside

diff --git a/src/parser.c b/src/parser.c
index 9d3395c..cf576d5 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -147,14 +147,9 @@ static inline zend_string *macro_to_constant(struct psi_parser *parser,
 
 	smart_str_append_printf(&str, "const psi\\%s = ", name->val);
 	if (scope->macro->exp) {
-		impl_val res = {0};
-		token_t typ = psi_num_exp_exec(scope->macro->exp, &res, NULL, scope->cpp);
+		struct psi_dump dump = {{.hn = &str}, .fun = (psi_dump_cb) smart_str_append_printf};
 
-		switch (typ) {
-		CASE_IMPLVAL_NUM_PRINTF(smart_str_append_printf, &str, res, true);
-		default:
-			assert(0);
-		}
+		psi_num_exp_dump(&dump, scope->macro->exp);
 	} else while (psi_plist_get(scope->macro->tokens, i++, &tok)) {
 		if (tok->type == PSI_T_QUOTED_STRING) {
 			smart_str_appendc(&str, '"');