Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / token.h

diff --git a/src/token.h b/src/token.h
index a5cc552b9de8237cf6dd22180cf8e771375528dc..5f6c7c71820bce2ee4a9dbbc95d3aa1d3fb26d00 100644 (file)
--- 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
 
 #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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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)
 {
 
 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) {
        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
 #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;
 #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)
 {
 
 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) {
        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
 #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;
 #endif
        case PSI_T_FLOAT:
                return SIZEOF_FLOAT;