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

diff --git a/src/token.h b/src/token.h
index c7ce751..cf9423f 100644
--- a/src/token.h
+++ b/src/token.h
@@ -1,15 +1,57 @@
-#ifndef _PSI_TOKEN_H
-#define _PSI_TOKEN_H
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
+#ifndef PSI_TOKEN_H
+#define PSI_TOKEN_H
 
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <assert.h>
+#include <sys/param.h>
+
+static inline size_t psi_align(size_t s, size_t a) {
+	return ((s - 1) | (a - 1)) + 1;
+}
+
+static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
+	if (diff && diff <= psi_align(diff, alignment)) {
+		diff = 0;
+	}
+
+	return diff;
+}
 
 #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;
 
@@ -34,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);
 	}
@@ -56,32 +102,53 @@ 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;
 }
 
+static inline const char *psi_t_indent(unsigned level) {
+	static const char indent[] =
+			"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+	return &indent[32 - MIN(32, level)];
+}
+
+static inline const char *psi_t_indirection(unsigned pointer_level) {
+	static const char indir[] = "********************************";
+	return &indir[32 - MIN(32, 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