+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#else
# include "php_config.h"
#endif
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#include <sys/param.h>
+#include <ctype.h>
+
+#include <Zend/zend_smart_str.h>
-#include "parser_proc.h"
#include "token.h"
#include "parser.h"
-size_t psi_token_alloc_size(size_t token_len, size_t fname_len) {
- return sizeof(struct psi_token) + token_len + fname_len + 2;
-}
+#ifndef PSI_DEBUG_TOKEN_ALLOC
+# define PSI_DEBUG_TOKEN_ALLOC 0
+#endif
-struct psi_token *psi_token_alloc(struct psi_parser *P) {
+struct psi_token *psi_token_init(token_t token_typ, const char *token_txt,
+ size_t token_len, unsigned col, unsigned line, zend_string *file)
+{
struct psi_token *T;
- size_t token_len, fname_len;
- token_t token_typ;
- if (P->cur < P->tok) {
- return NULL;
- }
-
- token_typ = P->num;
- token_len = P->cur - P->tok;
- fname_len = strlen(P->psi.file.fn);
-
- T = calloc(1, psi_token_alloc_size(token_len, fname_len));
+ T = pecalloc(1, sizeof(*T), 1);
T->type = token_typ;
- T->size = token_len;
- T->text = &T->buf[0];
- T->file = &T->buf[token_len + 1];
- T->line = P->line;
- T->col = P->col;
-
- memcpy(T->text, P->tok, token_len);
- memcpy(T->file, P->psi.file.fn, fname_len);
-
+ T->col = col;
+ T->line = line;
+ T->file = zend_string_copy(file);
+ T->text = psi_string_init_interned(token_txt, token_len, 1);
+#if PSI_DEBUG_TOKEN_ALLOC
+ fprintf(stderr, "PSI: token_init %p\t", T);
+ psi_token_dump(NULL, T);
+#endif
return T;
}
-struct psi_token *psi_token_copy(struct psi_token *src) {
- size_t strct_len = psi_token_alloc_size(src->size, strlen(src->file));
- struct psi_token *ptr = malloc(strct_len);
+void psi_token_free(struct psi_token **token_ptr) {
+ if (*token_ptr) {
+ struct psi_token *token = *token_ptr;
+#if PSI_DEBUG_TOKEN_ALLOC
+ fprintf(stderr, "PSI: token_free %p\t", token);
+ psi_token_dump(NULL, token);
+#endif
+ *token_ptr = NULL;
+ zend_string_release(token->text);
+ zend_string_release(token->file);
+ free(token);
+ }
+}
- memcpy(ptr, src, strct_len);
+struct psi_token *psi_token_copy(struct psi_token *src) {
+ struct psi_token *ptr = pemalloc(sizeof(*ptr), 1);
- ptr->text = &ptr->buf[0];
- ptr->file = &ptr->buf[ptr->size + 1];
+ *ptr = *src;
+#if PSI_DEBUG_TOKEN_ALLOC
+ fprintf(stderr, "PSI: token_copy %p\t", ptr);
+ psi_token_dump(NULL, src);
+#endif
+ ptr->text = zend_string_copy(ptr->text);
+ ptr->file = zend_string_copy(ptr->file);
return ptr;
}
-struct psi_token *psi_token_cat(unsigned argc, ...) {
+void psi_token_copy_ctor(struct psi_token **tok) {
+ *tok = psi_token_copy(*tok);
+}
+
+/* concatenate `argc` number of tokens separated by `sep` into a newly allocated token */
+struct psi_token *psi_token_cat(const char *sep, unsigned argc, ...) {
va_list argv;
unsigned i;
- struct psi_token *T = NULL;
+ size_t sep_len = sep ? strlen(sep) : 0;
+ struct psi_token *T = pemalloc(sizeof(*T), 1);
+ smart_str text = {0};
va_start(argv, argc);
- for (i = 0; i < argc; ++i) {
+
+ *T = *(struct psi_token *) va_arg(argv, struct psi_token *);
+ T->type = PSI_T_NAME;
+ T->file = zend_string_copy(T->file);
+
+ smart_str_append_ex(&text, T->text, 1);
+
+ for (i = 1; i < argc; ++i) {
struct psi_token *arg = va_arg(argv, struct psi_token *);
- if (T) {
- size_t token_len = T->size, fname_len = strlen(T->file);
-
- T = realloc(T, psi_token_alloc_size(T->size += arg->size + 1, fname_len));
- T->text = &T->buf[0];
- T->file = &T->buf[T->size + 1];
- T->buf[token_len] = ' ';
- memmove(&T->buf[T->size + 1], &T->buf[token_len + 1], fname_len + 1);
- memcpy(&T->buf[token_len + 1], arg->text, arg->size + 1);
- } else {
- T = psi_token_copy(arg);
- T->type = PSI_T_NAME;
- }
+ smart_str_appendl_ex(&text, sep, sep_len, 1);
+ smart_str_append_ex(&text, arg->text, 1);
}
va_end(argv);
+ T->text = smart_str_extract(&text);
+
+#if PSI_DEBUG_TOKEN_ALLOC
+ fprintf(stderr, "PSI: token_cat %p\n", T);
+#endif
return T;
}
-struct psi_token *psi_token_append(struct psi_token *T, unsigned argc, ...) {
+/* append `argc` number of C strings separated by `sep` to token `T` */
+struct psi_token *psi_token_append(const char *sep, struct psi_token *T, unsigned argc, ...) {
va_list argv;
unsigned i;
+ size_t sep_len = sep ? strlen(sep) : 0;
+ smart_str text = {0};
+
+ smart_str_append_ex(&text, T->text, 1);
va_start(argv, argc);
for (i = 0; i < argc; ++i) {
char *str = va_arg(argv, char *);
- size_t str_len = strlen(str), token_len = T->size, fname_len = strlen(T->file);
-
- T = realloc(T, psi_token_alloc_size(T->size += str_len + 1, fname_len));
- T->text = &T->buf[0];
- T->file = &T->buf[T->size + 1];
- T->buf[token_len] = ' ';
- memmove(&T->buf[T->size + 1], &T->buf[token_len + 1], fname_len + 1);
- memcpy(&T->buf[token_len + 1], str, str_len + 1);
+ size_t str_len = strlen(str);
+
+ if (sep_len && text.a) {
+ smart_str_appendl_ex(&text, sep, sep_len, 1);
+ }
+
+ smart_str_appendl_ex(&text, str, str_len, 1);
}
va_end(argv);
+ zend_string_release(T->text);
+ T->text = smart_str_extract(&text);
+
return T;
}
char *php_strtr(char *str, size_t len, char *str_from, char *str_to, size_t trlen);
struct psi_token *psi_token_translit(struct psi_token *T, char *from, char *to) {
- php_strtr(T->text, T->size, from, to, MIN(strlen(from), strlen(to)));
+ zend_string *tmp = zend_string_init(T->text->val, T->text->len, 1);
+
+ zend_string_release(T->text);
+ T->text = tmp;
+
+ php_strtr(T->text->val, T->text->len, from, to, MIN(strlen(from), strlen(to)));
+ zend_string_forget_hash_val(T->text);
+
return T;
}
static inline uint64_t psi_hash(char *digest_buf, ...)
{
- uint64_t hash = 5381;
- uint8_t c;
- const uint8_t *ptr;
- va_list argv;
+ uint64_t hash = 5381;
+ uint8_t c;
+ const uint8_t *ptr;
+ va_list argv;
- va_start(argv, digest_buf);
- while ((ptr = va_arg(argv, const uint8_t *))) {
+ va_start(argv, digest_buf);
+ while ((ptr = va_arg(argv, const uint8_t *))) {
while ((c = *ptr++)) {
hash = ((hash << 5) + hash) + c;
}
- }
- va_end(argv);
+ }
+ va_end(argv);
- if (digest_buf) {
- sprintf(digest_buf, "%" PRIx64, hash);
- }
+ if (digest_buf) {
+ sprintf(digest_buf, "%" PRIx64, hash);
+ }
- return hash;
+ return hash;
}
uint64_t psi_token_hash(struct psi_token *t, char *digest_buf) {
char loc_buf[48];
sprintf(loc_buf, "%u%u", t->line, t->col);
- return psi_hash(digest_buf, t->file, loc_buf, NULL);
+ return psi_hash(digest_buf, t->file->val, loc_buf, (char *) NULL);
+}
+
+void psi_token_dump(struct psi_dump *dump, struct psi_token *t)
+{
+ size_t i;
+
+ PSI_DUMP(dump, "TOKEN %p (%u) ", t, t->type);
+ if (t->type == PSI_T_EOF) {
+ PSI_DUMP(dump, "EOF");
+ } else {
+ PSI_DUMP(dump, "\"");
+ for (i = 0; i < t->text->len; ++i) {
+ switch (t->text->val[i]) {
+ case '\0':
+ PSI_DUMP(dump, "\\0");
+ break;
+ case '\a':
+ PSI_DUMP(dump, "\\a");
+ break;
+ case '\b':
+ PSI_DUMP(dump, "\\b");
+ break;
+ case '\f':
+ PSI_DUMP(dump, "\\f");
+ break;
+ case '\n':
+ PSI_DUMP(dump, "\\n");
+ break;
+ case '\r':
+ PSI_DUMP(dump, "\\r");
+ break;
+ case '\t':
+ PSI_DUMP(dump, "\\t");
+ break;
+ case '\v':
+ PSI_DUMP(dump, "\\v");
+ break;
+ case '"':
+ PSI_DUMP(dump, "\\\"");
+ break;
+ default:
+ if (isprint(t->text->val[i])) {
+ PSI_DUMP(dump, "%c", t->text->val[i]);
+ } else {
+ PSI_DUMP(dump, "\\x%02hhX", t->text->val[i]);
+ }
+ break;
+ }
+ }
+ PSI_DUMP(dump, "\"");
+ }
+ PSI_DUMP(dump, " at col %u in %s on line %u\n", t->col, t->file->val, t->line);
}
projects / m6w6 / ext-psi / blobdiff