#include <assert.h>
#include <errno.h>
#include <stdarg.h>
+#include <time.h>
#include <Zend/zend_smart_str.h>
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);
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);
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)
{
}
} 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);
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;
}
psi_parser_postprocess(P);
psi_plist_free(preproc);
+ P->input = NULL;
return true;
}