X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.h;h=75f76fbed19c1b7c7f752093de92ea40102c0051;hp=e660a0cbb416af87cfaeef1452635a4a9eb1c5ce;hb=f15288e185e65bcdfde87c217fb6bd7ff12eb653;hpb=3b0b651ea1b555d8d023e45b43e5eb93b23d00a1

diff --git a/src/token.h b/src/token.h
index e660a0c..75f76fb 100644
--- a/src/token.h
+++ b/src/token.h
@@ -51,51 +51,7 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 
 typedef int token_t;
 
-static inline int psi_num_exp_op_cmp(token_t op1, token_t op2)
-{
-	assert(!op1 || op1 == PSI_T_LPAREN || (op1 <= PSI_T_NOT && op1 >= PSI_T_PIPE));
-	assert(!op2 || op2 == PSI_T_LPAREN || (op2 <= PSI_T_NOT && op2 >= PSI_T_PIPE));
-
-	if (PSI_T_LPAREN == op2) {
-		return -1;
-	} else if (PSI_T_LPAREN == op1) {
-		return 1;
-	} else if (op1 == op2) {
-		return 0;
-	} else if (!op1) {
-		return 1;
-	} else if (!op2) {
-		return -1;
-	}
-
-	switch (op1) {
-	case PSI_T_PIPE:
-		return op2 > PSI_T_PIPE ? 1 : (op2 < PSI_T_PIPE ? -1 : 0);
-	case PSI_T_CARET:
-		return op2 > PSI_T_CARET ? 1 : (op2 < PSI_T_CARET ? -1 : 0);
-	case PSI_T_AMPERSAND:
-		return op2 > PSI_T_AMPERSAND ? 1 : (op2 < PSI_T_AMPERSAND ? -1 : 0);
-
-	case PSI_T_LSHIFT:
-	case PSI_T_RSHIFT:
-		return op2 > PSI_T_RSHIFT ? 1 : (op2 < PSI_T_LSHIFT ? -1 : 0);
-
-	case PSI_T_PLUS:
-	case PSI_T_MINUS:
-		return op2 > PSI_T_MINUS ? 1 : (op2 < PSI_T_PLUS ? -1 : 0);
-
-	case PSI_T_ASTERISK:
-	case PSI_T_SLASH:
-	case PSI_T_MODULO:
-		return op2 > PSI_T_MODULO ? 1 : (op2 < PSI_T_ASTERISK ? -1 : 0);
-
-	case PSI_T_NOT:
-	case PSI_T_TILDE:
-		return op2 > PSI_T_TILDE ? 1 : (op2 < PSI_T_NOT ? -1 : 0);
-	}
-
-	return 0;
-}
+#include "token_oper_cmp.h"
 
 static inline size_t psi_t_alignment(token_t t)
 {
@@ -118,6 +74,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);
 	}
@@ -146,6 +106,10 @@ static inline size_t psi_t_size(token_t t)
 		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(!t);
 	}