X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftoken.h;h=322843b109b7bfa2edfba5d0e7725aeedc92b630;hb=6ebcb60416cad353f5aeacebe919cb6990ef5a7d;hp=413a14c6e236f4c9853c11a7b91228394c27af6f;hpb=dfc032e7e195fc09c5ad2cda81d00a8958b80a66;p=m6w6%2Fext-psi

diff --git a/src/token.h b/src/token.h
index 413a14c..322843b 100644
--- a/src/token.h
+++ b/src/token.h
@@ -48,6 +48,8 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 
 #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
 
 typedef int token_t;
 
@@ -72,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);
 	}
@@ -94,13 +100,18 @@ static inline size_t psi_t_size(token_t t)
 		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;
 }
@@ -128,9 +139,13 @@ struct psi_parser;
 struct psi_token *psi_token_alloc(struct psi_parser *P);
 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