X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftoken.h;h=cf9423fba8320d573e870cd1f848fffc11bbf6dd;hp=413a14c6e236f4c9853c11a7b91228394c27af6f;hb=5dfa108dda56f36a5af5c83ebcd3e042c6d69a68;hpb=dfc032e7e195fc09c5ad2cda81d00a8958b80a66

diff --git a/src/token.h b/src/token.h
index 413a14c..cf9423f 100644
--- a/src/token.h
+++ b/src/token.h
@@ -45,9 +45,13 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 }
 
 #include "parser_proc.h"
+#undef YYDEBUG
 
-#define PSI_T_POINTER PSI_T_ASTERISK
-#define PSI_T_LONG_DOUBLE (PSI_T_DOUBLE << 16)
+#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
 
 typedef int token_t;
 
@@ -72,6 +76,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 +102,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;
 }
@@ -118,19 +131,24 @@ static inline const char *psi_t_indirection(unsigned pointer_level) {
 
 struct psi_token {
 	token_t type;
-	unsigned size, line, col;
+	unsigned size, line, col, flags;
 	char *text, *file;
 	char buf[1];
 };
 
 struct psi_parser;
 
-struct psi_token *psi_token_alloc(struct psi_parser *P);
+struct psi_token *psi_token_init(token_t token_typ, const char *token_txt,
+		size_t token_len, unsigned col, unsigned line, const char *file);
 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