X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.h;h=e87a16df2b872aaed257d3f2c28fa18c76355850;hp=a5cc552b9de8237cf6dd22180cf8e771375528dc;hb=69da9075d8a72c094e0bb977226d975365431f55;hpb=cffcbdd1df9f6d5dcf78f49a3d1b44cefe21b2f5

diff --git a/src/token.h b/src/token.h
index a5cc552..e87a16d 100644
--- a/src/token.h
+++ b/src/token.h
@@ -47,31 +47,31 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 #include "parser_proc.h"
 #undef YYDEBUG
 
-#if SIZEOF_CHAR == SIZEOF_INT8_T
+#if SIZEOF_CHAR == 1
 # define ALIGNOF_INT8_T ALIGNOF_CHAR
 # define ALIGNOF_UINT8_T ALIGNOF_CHAR
 #else
 # error SIZEOF_CHAR != 8
 #endif
-#if SIZEOF_SHORT == SIZEOF_INT16_T
+#if SIZEOF_SHORT == 2
 # define ALIGNOF_INT16_T ALIGNOF_SHORT
 # define ALIGNOF_UINT16_T ALIGNOF_SHORT
 #else
 # error SIZEOF_SHORT != 16
 #endif
-#if SIZEOF_INT == SIZEOF_INT32_T
+#if SIZEOF_INT == 4
 # define ALIGNOF_INT32_T ALIGNOF_INT
 # define ALIGNOF_UINT32_T ALIGNOF_INT
-#elif SIZEOF_LONG == SIZEOF_INT32_T
+#elif SIZEOF_LONG == 4
 # define ALIGNOF_INT32_T ALIGNOF_LONG
 # define ALIGNOF_UINT32_T ALIGNOF_LONG
 #else
 # error SIZEOF_INT != 32 and SIZEOF_LONG != 32
 #endif
-#if SIZEOF_LONG == SIZEOF_INT64_T
+#if SIZEOF_LONG == 8
 # define ALIGNOF_INT64_T ALIGNOF_LONG
 # define ALIGNOF_UINT64_T ALIGNOF_LONG
-# elif HAVE_LONG_LONG_INT && SIZEOF_LONG_LONG_INT == SIZEOF_INT64_T
+# elif HAVE_LONG_LONG_INT && SIZEOF_LONG_LONG_INT == 8
 # define ALIGNOF_INT64_T ALIGNOF_LONG_LONG
 # define ALIGNOF_UINT64_T ALIGNOF_LONG_LONG
 #else
@@ -94,19 +94,19 @@ typedef enum psi_token_type token_t;
 
 static inline size_t psi_t_alignment(token_t t)
 {
-#define PSI_ALIGNOF(T) case PSI_T_## T: return ALIGNOF_## T ##_T;
+#define PSI_ALIGNOF(T,S) case PSI_T_## T ##S: return S/8;
 	switch (t) {
-	PSI_ALIGNOF(INT8);
-	PSI_ALIGNOF(UINT8);
-	PSI_ALIGNOF(INT16);
-	PSI_ALIGNOF(UINT16);
-	PSI_ALIGNOF(INT32);
-	PSI_ALIGNOF(UINT32);
-	PSI_ALIGNOF(INT64);
-	PSI_ALIGNOF(UINT64);
+	PSI_ALIGNOF(INT,8);
+	PSI_ALIGNOF(UINT,8);
+	PSI_ALIGNOF(INT,16);
+	PSI_ALIGNOF(UINT,16);
+	PSI_ALIGNOF(INT,32);
+	PSI_ALIGNOF(UINT,32);
+	PSI_ALIGNOF(INT,64);
+	PSI_ALIGNOF(UINT,64);
 #if HAVE_INT128
-	PSI_ALIGNOF(INT128);
-	PSI_ALIGNOF(UINT128);
+	PSI_ALIGNOF(INT,128);
+	PSI_ALIGNOF(UINT,128);
 #endif
 	case PSI_T_FLOAT:
 		return ALIGNOF_FLOAT;
@@ -129,19 +129,19 @@ static inline size_t psi_t_alignment(token_t t)
 
 static inline size_t psi_t_size(token_t t)
 {
-#define PSI_SIZEOF(T) case PSI_T_## T : return SIZEOF_## T ##_T;
+#define PSI_SIZEOF(T,S) case PSI_T_## T ##S : return S/8;
 	switch (t) {
-	PSI_SIZEOF(INT8);
-	PSI_SIZEOF(UINT8);
-	PSI_SIZEOF(INT16);
-	PSI_SIZEOF(UINT16);
-	PSI_SIZEOF(INT32);
-	PSI_SIZEOF(UINT32);
-	PSI_SIZEOF(INT64);
-	PSI_SIZEOF(UINT64);
+	PSI_SIZEOF(INT,8);
+	PSI_SIZEOF(UINT,8);
+	PSI_SIZEOF(INT,16);
+	PSI_SIZEOF(UINT,16);
+	PSI_SIZEOF(INT,32);
+	PSI_SIZEOF(UINT,32);
+	PSI_SIZEOF(INT,64);
+	PSI_SIZEOF(UINT,64);
 #if HAVE_INT128
-	PSI_SIZEOF(INT128);
-	PSI_SIZEOF(UINT128);
+	PSI_SIZEOF(INT,128);
+	PSI_SIZEOF(UINT,128);
 #endif
 	case PSI_T_FLOAT:
 		return SIZEOF_FLOAT;
@@ -174,26 +174,28 @@ static inline const char *psi_t_indirection(unsigned pointer_level) {
 	return &indir[32 - MIN(32, pointer_level)];
 }
 
+struct psi_dump;
+
 struct psi_token {
 	token_t type;
-	unsigned size, line, col, flags;
-	char *text, *file;
-	char buf[1];
+	unsigned line;
+	unsigned col;
+	unsigned flags;
+	zend_string *file;
+	zend_string *text;
 };
 
 struct psi_parser;
 
 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);
-size_t psi_token_alloc_size(size_t token_len, size_t fname_len);
+		size_t token_len, unsigned col, unsigned line, zend_string *file);
 struct psi_token *psi_token_copy(struct psi_token *src);
 void psi_token_copy_ctor(struct psi_token **src);
 struct psi_token *psi_token_cat(const char *sep, unsigned argc, ...);
-struct psi_token *psi_token_prepend(const char *sep, struct psi_token *T, unsigned argc, ...);
 struct psi_token *psi_token_append(const char *sep, struct psi_token *T, unsigned argc, ...);
 struct psi_token *psi_token_translit(struct psi_token *T, char *from, char *to);
 uint64_t psi_token_hash(struct psi_token *t, char *digest_buf);
-void psi_token_dump(int fd, struct psi_token *t);
+void psi_token_dump(struct psi_dump *dump, struct psi_token *t);
 void psi_token_free(struct psi_token **token);
 
 #endif