X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.h;h=5f6c7c71820bce2ee4a9dbbc95d3aa1d3fb26d00;hp=fcf3f4e49f5b3ced600063831438944539db3cb3;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=2f5af21b263403997e154658635d6b6e6eaab453

diff --git a/src/token.h b/src/token.h
index fcf3f4e..5f6c7c7 100644
--- a/src/token.h
+++ b/src/token.h
@@ -45,24 +45,69 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 }
 
 #include "parser_proc.h"
+#undef YYDEBUG
 
-#define PSI_T_POINTER PSI_T_ASTERISK
-#define PSI_T_LONG_DOUBLE (PSI_T_DOUBLE << 16)
+#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 == 2
+# define ALIGNOF_INT16_T ALIGNOF_SHORT
+# define ALIGNOF_UINT16_T ALIGNOF_SHORT
+#else
+# error SIZEOF_SHORT != 16
+#endif
+#if SIZEOF_INT == 4
+# define ALIGNOF_INT32_T ALIGNOF_INT
+# define ALIGNOF_UINT32_T ALIGNOF_INT
+#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 == 8
+# define ALIGNOF_INT64_T ALIGNOF_LONG
+# define ALIGNOF_UINT64_T ALIGNOF_LONG
+# 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
+# error SIZEOF_LONG != 64 and SIZEOF_LONG_LONG != 64
+#endif
+
+#if HAVE_INT128
+# define SIZEOF_INT128_T SIZEOF___INT128
+# define SIZEOF_UINT128_T SIZEOF_UNSIGNED___INT128
+# define ALIGNOF_INT128_T ALIGNOF___INT128
+# define ALIGNOF_UINT128_T ALIGNOF___INT128
+# define INT128_MAX ((__int128) (UINT128_MAX >> 1))
+# define INT128_MIN (-INT128_MAX-1)
+# define UINT128_MAX ((unsigned __int128) ~ 0)
+typedef __int128 int128_t;
+typedef unsigned __int128 uint128_t;
+#endif
 
-typedef int token_t;
+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(INT,128);
+	PSI_ALIGNOF(UINT,128);
+#endif
 	case PSI_T_FLOAT:
 		return ALIGNOF_FLOAT;
 	case PSI_T_DOUBLE:
@@ -72,6 +117,10 @@ static inline size_t psi_t_alignment(token_t t)
 		return ALIGNOF_VOID_P;
 	case PSI_T_ENUM:
 		return ALIGNOF_INT;
+#ifdef HAVE_LONG_DOUBLE
+	case PSI_T_LONG_DOUBLE:
+		return ALIGNOF_LONG_DOUBLE;
+#endif
 	default:
 		assert(0);
 	}
@@ -80,27 +129,36 @@ 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(INT,128);
+	PSI_SIZEOF(UINT,128);
+#endif
 	case PSI_T_FLOAT:
 		return SIZEOF_FLOAT;
 	case PSI_T_DOUBLE:
 		return SIZEOF_DOUBLE;
+	case PSI_T_VOID:
 	case PSI_T_POINTER:
 	case PSI_T_FUNCTION:
 		return SIZEOF_VOID_P;
 	case PSI_T_ENUM:
 		return SIZEOF_INT;
+#ifdef HAVE_LONG_DOUBLE
+	case PSI_T_LONG_DOUBLE:
+		return SIZEOF_LONG_DOUBLE;
+#endif
 	default:
-		assert(0);
+		assert(!t);
 	}
 	return 0;
 }
@@ -108,29 +166,34 @@ static inline size_t psi_t_size(token_t t)
 static inline const char *psi_t_indent(unsigned level) {
 	static const char indent[] =
 			"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
-	return &indent[32 - MAX(0, MIN(32, level))];
+	return &indent[32 - MIN(32, level)];
 }
 
 static inline const char *psi_t_indirection(unsigned pointer_level) {
 	static const char indir[] = "********************************";
-	return &indir[32 - MAX(0, MIN(32, pointer_level))];
+	return &indir[32 - MIN(32, pointer_level)];
 }
 
 struct psi_token {
 	token_t type;
-	unsigned size, line, col;
+	unsigned size, line, col, flags;
 	char *text, *file;
 	char buf[1];
 };
 
 struct psi_parser;
 
-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);
 size_t psi_token_alloc_size(size_t token_len, size_t fname_len);
 struct psi_token *psi_token_copy(struct psi_token *src);
-struct psi_token *psi_token_cat(unsigned argc, ...);
-struct psi_token *psi_token_append(struct psi_token *T, unsigned argc, ...);
+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_free(struct psi_token **token);
 
 #endif