X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.h;h=5f6c7c71820bce2ee4a9dbbc95d3aa1d3fb26d00;hp=6fc78753ea8c9264b3982ab7f98584cc6141bd4d;hb=02e801eabbe26a129ea05e6723c94e10bb653dab;hpb=6ec1a060415f860bc3eb4c74fbce1c43f5aa7e55

diff --git a/src/token.h b/src/token.h
index 6fc7875..5f6c7c7 100644
--- a/src/token.h
+++ b/src/token.h
@@ -47,50 +47,31 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 #include "parser_proc.h"
 #undef YYDEBUG
 
-#define PSI_T_CAST			PSI_T_EQUALS
-#define PSI_T_POINTER		PSI_T_ASTERISK
-
-#define PSI_T_WHITESPACE	-PSI_T_NO_WHITESPACE
-#define PSI_T_BSLASH		-PSI_T_SLASH
-#define PSI_T_LONG_DOUBLE	-PSI_T_DOUBLE
-
-#if SIZEOF_CHAR == SIZEOF_INT8_T
-# define PSI_T_INT8 PSI_T_CHAR
-# define PSI_T_UINT8 -PSI_T_CHAR
+#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
-# define PSI_T_INT16 PSI_T_SHORT
-# define PSI_T_UINT16 -PSI_T_SHORT
+#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
-# define PSI_T_INT32 PSI_T_INT
-# define PSI_T_UINT32 -PSI_T_INT
+#if SIZEOF_INT == 4
 # define ALIGNOF_INT32_T ALIGNOF_INT
 # define ALIGNOF_UINT32_T ALIGNOF_INT
-#elif SIZEOF_LONG == SIZEOF_INT32_T
-# define PSI_T_INT32 PSI_T_LONG
-# define PSI_T_UINT32 -PSI_T_LONG
+#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
-# define PSI_T_INT64 PSI_T_LONG
-# define PSI_T_UINT64 -PSI_T_LONG
+#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
-# define PSI_T_INT64 (PSI_T_LONG << 0xa)
-# define PSI_T_UINT64 -(PSI_T_LONG << 0xa)
+# 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
@@ -98,8 +79,6 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 #endif
 
 #if HAVE_INT128
-# define PSI_T_INT128 (PSI_T_LONG << 0xb)
-# define PSI_T_UINT128 -(PSI_T_LONG << 0xb)
 # define SIZEOF_INT128_T SIZEOF___INT128
 # define SIZEOF_UINT128_T SIZEOF_UNSIGNED___INT128
 # define ALIGNOF_INT128_T ALIGNOF___INT128
@@ -111,23 +90,23 @@ typedef __int128 int128_t;
 typedef unsigned __int128 uint128_t;
 #endif
 
-typedef int64_t 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(INT128);
-	PSI_ALIGNOF(UINT128);
+	PSI_ALIGNOF(INT,128);
+	PSI_ALIGNOF(UINT,128);
 #endif
 	case PSI_T_FLOAT:
 		return ALIGNOF_FLOAT;
@@ -150,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;