travis: update

[m6w6/ext-psi] / src / parser.c

diff --git a/src/parser.c b/src/parser.c
index 2a89068e74d2ca6ed65ccf2b7d35a32c4f5c2e89..9cb5add1d17ed7834a679eddfeda1ec9b3804ffd 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <time.h>
 
 #include <Zend/zend_smart_str.h>
 
@@ -101,6 +102,7 @@ struct psi_parser_input *psi_parser_open_file(struct psi_parser *P,
 
        memset(fb->buffer + sb.st_size, 0, psi_parser_maxfill());
 
+       fb->lmod = sb.st_mtime;
        fb->length = sb.st_size;
        fb->file = psi_string_init_interned(filename, strlen(filename), 1);
 
@@ -122,6 +124,7 @@ struct psi_parser_input *psi_parser_open_string(struct psi_parser *P,
        memcpy(sb->buffer, string, length);
        memset(sb->buffer + length, 0, psi_parser_maxfill());
 
+       sb->lmod = time(NULL);
        sb->length = length;
        sb->file = psi_string_init_interned("<stdin>", strlen("<stdin>"), 1);
 
@@ -146,26 +149,6 @@ bool psi_parser_process(struct psi_parser *P, struct psi_plist *tokens,
        return true;
 }
 
-#if PSI_THREADED_PARSER
-static void psi_smart_str_printf(smart_str *ss, const char *fmt, ...)
-{
-       va_list argv;
-       char *buf;
-       int len;
-
-       va_start(argv, fmt);
-       len = vasprintf(&buf, fmt, argv);
-       va_end(argv);
-
-       if (len != -1) {
-               smart_str_appendl_ex(ss, buf, len, 1);
-               free(buf);
-       }
-}
-#else
-# define psi_smart_str_printf smart_str_append_printf
-#endif
-
 static inline zend_string *macro_to_constant(struct psi_parser *parser,
                zend_string *name, struct psi_validate_scope *scope)
 {
@@ -232,6 +215,13 @@ void psi_parser_postprocess(struct psi_parser *P)
                        }
                } else if (!psi_num_exp_validate(PSI_DATA(P), scope.macro->exp, &scope)) {
                        continue;
+               } else if (psi_plist_count(scope.macro->tokens) == 1) {
+                       struct psi_token *tok;
+                       if (!psi_plist_get(scope.macro->tokens, 0, &tok)) {
+                               continue;
+                       } else if (zend_string_equals(name, tok->text)) {
+                               continue;
+                       }
                }
 
                cnst = macro_to_constant(P, name, &scope);
@@ -270,16 +260,21 @@ bool psi_parser_parse(struct psi_parser *P, struct psi_parser_input *I)
        struct psi_plist *scanned, *preproc;
        size_t processed = 0;
 
+       P->input = I;
+
        if (!(scanned = psi_parser_scan(P, I))) {
+               P->input = NULL;
                return false;
        }
 
        if (!(preproc = psi_parser_preprocess(P, &scanned))) {
+               P->input = NULL;
                psi_plist_free(scanned);
                return false;
        }
 
        if (!psi_parser_process(P, preproc, &processed)) {
+               P->input = NULL;
                psi_plist_free(preproc);
                return false;
        }
@@ -287,6 +282,7 @@ bool psi_parser_parse(struct psi_parser *P, struct psi_parser_input *I)
        psi_parser_postprocess(P);
 
        psi_plist_free(preproc);
+       P->input = NULL;
        return true;
 }