X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/056280bf2e3188551539d87852ddbdaf322eae52..e6c78ce32d1f4d737c0fe52661d8f5d56abe879d:/src/cdecl-internal.h

diff --git a/src/cdecl-internal.h b/src/cdecl-internal.h
index 0008c33..4c5ed0b 100644
--- a/src/cdecl-internal.h
+++ b/src/cdecl-internal.h
@@ -24,6 +24,38 @@
 #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.
+ *
+ * Bison normally numbers user-defined tokens sequentially starting from 258.
+ * If api.token,raw is used, then the numbering starts from 3.  As we have
+ * about 50 tokens, the latter case will fit in 7 bits easily; in the former
+ * case the upper bits are constant so we don't need to store them.
+ */
+#define PACK_TOKEN(x) ((x) & 0x7f)
+
+/*
+ * Expand a packed token to its original value.
+ */
+#define UNPACK_TOKEN(x) ((x) | ((T_IDENT > 256) << 8))
+
 struct cdecl_error;
 struct cdecl_declspec;
 
@@ -35,16 +67,36 @@ static inline void cdecl__init_i18n(void)
 }
 #endif
 
-void cdecl__err(unsigned code, const char *fmt, ...);
+void cdecl__err(unsigned code, const char *fmt, const char *arg);
 void cdecl__errmsg(unsigned msg);
 
 struct cdecl_declspec *cdecl__normalize_specs(struct cdecl_declspec *specs);
 
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount);
-size_t cdecl__advance(char **buf, size_t *n, size_t amount);
-size_t cdecl__explain_specs(char *buf, size_t n, struct cdecl_declspec *s,
-                                                 unsigned mask);
+struct output_state {
+	char *dst;
+	size_t dstlen;
+	size_t accum;
+};
+
+size_t cdecl__advance(struct output_state *dst, size_t amount);
+size_t cdecl__emit(struct output_state *dst, const char *src);
+
+const char *cdecl__emit_specs(struct output_state *dst,
+                              struct cdecl_declspec *s,
+                              unsigned mask);
 
-size_t cdecl__emit(char **dst, size_t *dstlen, const char *src);
+/*
+ * 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);
 
 #endif