X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.h;h=a5cc552b9de8237cf6dd22180cf8e771375528dc;hp=cf9423fba8320d573e870cd1f848fffc11bbf6dd;hb=4fd6435041048363289eb7b9243cee39b6901e4e;hpb=ba906e039ffe9e57842ce5135aa43efa00b8a4c6

diff --git a/src/token.h b/src/token.h
index cf9423f..a5cc552 100644
--- a/src/token.h
+++ b/src/token.h
@@ -47,13 +47,50 @@ 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_LONG_DOUBLE	(PSI_T_DOUBLE << 16)
-#define PSI_T_BSLASH		(PSI_T_SLASH << 16)
-#define PSI_T_WHITESPACE	-PSI_T_NO_WHITESPACE
+#if SIZEOF_CHAR == SIZEOF_INT8_T
+# 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 ALIGNOF_INT16_T ALIGNOF_SHORT
+# define ALIGNOF_UINT16_T ALIGNOF_SHORT
+#else
+# error SIZEOF_SHORT != 16
+#endif
+#if SIZEOF_INT == SIZEOF_INT32_T
+# define ALIGNOF_INT32_T ALIGNOF_INT
+# define ALIGNOF_UINT32_T ALIGNOF_INT
+#elif SIZEOF_LONG == SIZEOF_INT32_T
+# 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 ALIGNOF_INT64_T ALIGNOF_LONG
+# define ALIGNOF_UINT64_T ALIGNOF_LONG
+# elif HAVE_LONG_LONG_INT && SIZEOF_LONG_LONG_INT == SIZEOF_INT64_T
+# 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
 
-typedef int token_t;
+#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 enum psi_token_type token_t;
 
 static inline size_t psi_t_alignment(token_t t)
 {
@@ -67,6 +104,10 @@ static inline size_t psi_t_alignment(token_t t)
 	PSI_ALIGNOF(UINT32);
 	PSI_ALIGNOF(INT64);
 	PSI_ALIGNOF(UINT64);
+#if HAVE_INT128
+	PSI_ALIGNOF(INT128);
+	PSI_ALIGNOF(UINT128);
+#endif
 	case PSI_T_FLOAT:
 		return ALIGNOF_FLOAT;
 	case PSI_T_DOUBLE:
@@ -98,6 +139,10 @@ static inline size_t psi_t_size(token_t t)
 	PSI_SIZEOF(UINT32);
 	PSI_SIZEOF(INT64);
 	PSI_SIZEOF(UINT64);
+#if HAVE_INT128
+	PSI_SIZEOF(INT128);
+	PSI_SIZEOF(UINT128);
+#endif
 	case PSI_T_FLOAT:
 		return SIZEOF_FLOAT;
 	case PSI_T_DOUBLE: