X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.c;h=5f177c43c5d6af795f945e6bc37de9557dbb2677;hp=4860afd3a43cae9276ca4ec6ed7e96fc46bbd2e8;hb=848d77002c2c0451ccb76b9059cb352fabbdd8bc;hpb=2f5af21b263403997e154658635d6b6e6eaab453

diff --git a/src/token.c b/src/token.c
index 4860afd..5f177c4 100644
--- a/src/token.c
+++ b/src/token.c
@@ -23,19 +23,10 @@
  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 "parser_proc.h"
+#include "php_psi_stdinc.h"
+
+#include <ctype.h>
+
 #include "token.h"
 #include "parser.h"
 
@@ -43,33 +34,35 @@ size_t psi_token_alloc_size(size_t token_len, size_t fname_len) {
 	return sizeof(struct psi_token) + token_len + fname_len + 2;
 }
 
-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, const char *file)
+{
 	struct psi_token *T;
-	size_t token_len, fname_len;
-	token_t token_typ;
-
-	if (P->cur < P->tok) {
-		return NULL;
-	}
+	size_t file_len = strlen(file);
 
-	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 = calloc(1, psi_token_alloc_size(token_len, file_len));
 	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;
+	T->line = line;
+	T->col = col;
 
-	memcpy(T->text, P->tok, token_len);
-	memcpy(T->file, P->psi.file.fn, fname_len);
+	memcpy(T->text, token_txt, token_len);
+	memcpy(T->file, file, file_len);
 
 	return T;
 }
 
+void psi_token_free(struct psi_token **token_ptr) {
+	if (*token_ptr) {
+		struct psi_token *token = *token_ptr;
+
+		*token_ptr = NULL;
+		free(token);
+	}
+}
+
 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);
@@ -82,9 +75,14 @@ struct psi_token *psi_token_copy(struct psi_token *src) {
 	return ptr;
 }
 
-struct psi_token *psi_token_cat(unsigned argc, ...) {
+void psi_token_copy_ctor(struct psi_token **tok) {
+	*tok = psi_token_copy(*tok);
+}
+
+struct psi_token *psi_token_cat(const char *sep, unsigned argc, ...) {
 	va_list argv;
 	unsigned i;
+	size_t sep_len = sep ? strlen(sep) : 0;
 	struct psi_token *T = NULL;
 
 	va_start(argv, argc);
@@ -93,13 +91,21 @@ struct psi_token *psi_token_cat(unsigned argc, ...) {
 
 		if (T) {
 			size_t token_len = T->size, fname_len = strlen(T->file);
+			struct psi_token *tmp = realloc(T, psi_token_alloc_size(T->size += arg->size + sep_len, fname_len));
+
+			if (tmp) {
+				T = tmp;
+			} else {
+				free(T);
+				va_end(argv);
+				return NULL;
+			}
 
-			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);
+			memcpy(&T->buf[token_len], sep, sep_len);
+			memcpy(&T->buf[token_len + sep_len], arg->text, arg->size + 1);
 		} else {
 			T = psi_token_copy(arg);
 			T->type = PSI_T_NAME;
@@ -110,21 +116,44 @@ struct psi_token *psi_token_cat(unsigned argc, ...) {
 	return T;
 }
 
-struct psi_token *psi_token_append(struct psi_token *T, unsigned argc, ...) {
+struct psi_token *psi_token_prepend(const char *sep, struct psi_token *T, unsigned argc, ...) {
 	va_list argv;
 	unsigned i;
+	size_t sep_len = sep ? strlen(sep) : 0;
 
 	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 = realloc(T, psi_token_alloc_size(T->size += str_len + sep_len, fname_len));
+		T->text = &T->buf[0];
+		T->file = &T->buf[T->size + 1];
+		memmove(&T->buf[str_len + sep_len], &T->buf[0], token_len + 1 + fname_len + 1);
+		memcpy(&T->buf[0], str, str_len);
+		memcpy(&T->buf[str_len], sep, sep_len);
+		T->buf[T->size] = '\0';
+	}
+	va_end(argv);
+
+	return 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;
+
+	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 + sep_len, 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);
+		memcpy(&T->buf[token_len], sep, sep_len);
+		memcpy(&T->buf[token_len + sep_len], str, str_len + 1);
 	}
 	va_end(argv);
 
@@ -139,29 +168,81 @@ struct psi_token *psi_token_translit(struct psi_token *T, char *from, char *to)
 
 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, loc_buf, (char *) NULL);
+}
+
+void psi_token_dump(int fd, struct psi_token *t)
+{
+	size_t i;
+
+	dprintf(fd, "TOKEN %p (%d) ", t, t->type);
+	if (t->type == PSI_T_EOF) {
+		dprintf(fd, "EOF");
+	} else {
+		dprintf(fd, "\"");
+		for (i = 0; i < t->size; ++i) {
+			switch (t->text[i]) {
+			case '\0':
+				dprintf(fd, "\\0");
+				break;
+			case '\a':
+				dprintf(fd, "\\a");
+				break;
+			case '\b':
+				dprintf(fd, "\\b");
+				break;
+			case '\f':
+				dprintf(fd, "\\f");
+				break;
+			case '\n':
+				dprintf(fd, "\\n");
+				break;
+			case '\r':
+				dprintf(fd, "\\r");
+				break;
+			case '\t':
+				dprintf(fd, "\\t");
+				break;
+			case '\v':
+				dprintf(fd, "\\v");
+				break;
+			case '"':
+				dprintf(fd, "\\\"");
+				break;
+			default:
+				if (isprint(t->text[i])) {
+					dprintf(fd, "%c", t->text[i]);
+				} else {
+					dprintf(fd, "\\x%02hhX", t->text[i]);
+				}
+				break;
+			}
+		}
+		dprintf(fd, "\"");
+	}
+	dprintf(fd, " at col %u in %s on line %u\n", t->col, t->file, t->line);
 }