X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.c;h=24028166df0c3eb310bb7185e12a6b4cc8b09d1a;hp=9475ff9bf029f65eed38221be97ad4e150dc34a8;hb=1df8639baf324038edd00ad15501ea3abb502cac;hpb=a0f437f26cd0f121ee911a55327a68a3544bf15f

diff --git a/src/parser.c b/src/parser.c
index 9475ff9..2402816 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -33,7 +33,8 @@
 
 #include "parser.h"
 
-struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, unsigned flags)
+struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error,
+		unsigned flags)
 {
 	if (!P) {
 		P = pemalloc(sizeof(*P), 1);
@@ -47,7 +48,8 @@ struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, uns
 	return P;
 }
 
-struct psi_parser_input *psi_parser_open_file(struct psi_parser *P, const char *filename, bool report_errors)
+struct psi_parser_input *psi_parser_open_file(struct psi_parser *P,
+		const char *filename, bool report_errors)
 {
 	struct stat sb;
 	FILE *fp;
@@ -101,7 +103,8 @@ struct psi_parser_input *psi_parser_open_file(struct psi_parser *P, const char *
 	return fb;
 }
 
-struct psi_parser_input *psi_parser_open_string(struct psi_parser *P, const char *string, size_t length)
+struct psi_parser_input *psi_parser_open_string(struct psi_parser *P,
+		const char *string, size_t length)
 {
 	struct psi_parser_input *sb;
 
@@ -121,7 +124,8 @@ struct psi_parser_input *psi_parser_open_string(struct psi_parser *P, const char
 	return sb;
 }
 
-struct psi_plist *psi_parser_preprocess(struct psi_parser *P, struct psi_plist **tokens)
+struct psi_plist *psi_parser_preprocess(struct psi_parser *P,
+		struct psi_plist **tokens)
 {
 	if (psi_cpp_process(P->preproc, tokens)) {
 		return *tokens;
@@ -129,7 +133,8 @@ struct psi_plist *psi_parser_preprocess(struct psi_parser *P, struct psi_plist *
 	return NULL;
 }
 
-bool psi_parser_process(struct psi_parser *P, struct psi_plist *tokens, size_t *processed)
+bool psi_parser_process(struct psi_parser *P, struct psi_plist *tokens,
+		size_t *processed)
 {
 	if (psi_plist_count(tokens)) {
 		return 0 == psi_parser_proc_parse(P, tokens, processed);
@@ -147,14 +152,10 @@ 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);
-		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, '"');
@@ -208,7 +209,7 @@ void psi_parser_postprocess(struct psi_parser *P)
 		if (!cnst) {
 			continue;
 		}
-
+//fprintf(stderr, "PARSE: %s", ZSTR_VAL(cnst));
 		I = psi_parser_open_string(P, ZSTR_VAL(cnst), ZSTR_LEN(cnst));
 		zend_string_release(cnst);