OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*******************************************************************************/
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
#include <sys/mman.h>
#include <assert.h>
#include <errno.h>
memset(fb->buffer + sb.st_size, 0, psi_parser_maxfill());
fb->length = sb.st_size;
- fb->file = zend_string_init_interned(filename, strlen(filename), 1);
+ fb->file = psi_string_init_interned(filename, strlen(filename), 1);
return fb;
}
memset(sb->buffer + length, 0, psi_parser_maxfill());
sb->length = length;
- sb->file = zend_string_init_interned("<stdin>", strlen("<stdin>"), 1);
+ sb->file = psi_string_init_interned("<stdin>", strlen("<stdin>"), 1);
return sb;
}
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)
{
smart_str str = {0};
-
size_t i = 0;
struct psi_token *tok;
+#if PSI_THREADED_PARSER
+ int persistent = 1;
+#else
+ int persistent = 0;
+#endif
- smart_str_append_printf(&str, "const psi\\%s = ", name->val);
+ psi_smart_str_printf(&str, "const psi\\%s = ", name->val);
if (scope->macro->exp) {
struct psi_dump dump = {{.hn = &str},
- .fun = (psi_dump_cb) smart_str_append_printf};
+ .fun = (psi_dump_cb) psi_smart_str_printf};
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, '"');
+ smart_str_appendc_ex(&str, '"', persistent);
}
- smart_str_append(&str, tok->text);
+ smart_str_append_ex(&str, tok->text, persistent);
if (tok->type == PSI_T_QUOTED_STRING) {
- smart_str_appendc(&str, '"');
+ smart_str_appendc_ex(&str, '"', persistent);
}
- smart_str_appendc(&str, ' ');
+ smart_str_appendc_ex(&str, ' ', persistent);
}
- smart_str_appendl(&str, ";\n", 2);
+ smart_str_appendl_ex(&str, ";\n", 2, persistent);
return smart_str_extract(&str);
}