X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/3a3760ad26782403f6686183be3faa8b22cf849b..7031fb3bec5bbef1d14686ba0434442a4ebf5ebd:/src/cdecl-internal.h

diff --git a/src/cdecl-internal.h b/src/cdecl-internal.h
index c85ca61..a1e8a96 100644
--- a/src/cdecl-internal.h
+++ b/src/cdecl-internal.h
@@ -20,10 +20,30 @@
 
 #include <stddef.h>
 #include <gettext.h>
+#include "cdecl.h"
+
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 #define _(s) dgettext(PACKAGE, s)
 #define N_(s) s
 
+/* Pack the 4 "kind" bits of a valid cdecl specifier value into two bits. */
+#define PACK_KIND(x) ((( ((x>>8) - ((x)>>11)) ) >> 1) & 3)
+
+/* Expand a packed "kind" to its original value. */
+#define UNPACK_KIND(x) (0x100 << (x))
+
+/*
+ * Pack a valid cdecl specifier value (CDECL_TYPE_xxx, CDECL_STOR_xxx, etc.)
+ * into 8 bits.  We do this by encoding the specifier kind in the upper two
+ * bits, and the enumerated sequence in the lower 6 bits. */
+#define PACK_SPEC(x) (((x) & 0x3f) | (PACK_KIND(x) << 6))
+
+/*
+ * Expand a packed specifier to its original value.
+ */
+#define UNPACK_SPEC(x) (UNPACK_KIND((x) >> 6) | ((x) & 0x3f))
+
 /*
  * Pack a parser token into 7 bits.
  *
@@ -63,11 +83,38 @@ struct output_state {
 
 size_t cdecl__advance(struct output_state *dst, size_t amount);
 size_t cdecl__emit(struct output_state *dst, const char *src);
+size_t cdecl__emit_uint(struct output_state *dst, uintmax_t val);
+size_t cdecl__strlcpy(char *dst, const char *src, size_t len);
 
 const char *cdecl__emit_specs(struct output_state *dst,
                               struct cdecl_declspec *s,
                               unsigned mask);
 
-int cdecl__to_keyword(const char *s, int len, int english_mode);
+/*
+ * If s is a (len bytes long) string corresponding to a declaration
+ * specifier, then:
+ *
+ *   - bits 7:0 (LSB) of the return value is the packed specifier type, and
+ *   - bits 15:8 of the return value is the packed parser token.
+ *
+ * Otherwise, if english_mode is nonzero and s is an "english keyword",
+ * returns the appropriate packed parser token in bits 15:8.
+ *
+ * Otherwise, PACK_TOKEN(T_IDENT) is returned in bits 15:8.
+ */
+unsigned cdecl__to_keyword(const char *s, int len, int english_mode);
+
+/* Container for an allocated parser token's value */
+struct parse_item {
+	union {
+		struct cdecl_declarator declarator;
+		struct cdecl_declspec   declspec;
+		struct cdecl            decl;
+	} u;
+
+	char s[FLEXIBLE_ARRAY_MEMBER];
+};
+
+struct parse_item *cdecl__alloc_item(size_t s_sz);
 
 #endif