libcdecl: Fix parsing of int (x(*)()) etc.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index cf5e2ffa7ef076f062e78e04f1ce0a0f13057f32..c0438e602753fb0b37c4bdaeaba0be457481b5da 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -22,37 +22,83 @@
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
+#include "parse.h"
 #include "specstr.h"
 
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-
 size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
        size_t x = MIN(amount, dst->dstlen);
 
        dst->dst    += x;
        dst->dstlen -= x;
+       dst->accum  += amount;
 
        return amount;
 }
 
+size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
+{
+       size_t srclen = strlen(src);
+
+       if (dstlen > 0) {
+               memcpy(dst, src, MIN(dstlen, srclen+1));
+               if (dstlen <= srclen)
+                       dst[dstlen-1] = 0;
+       }
+
+       return srclen;
+}
+
 size_t cdecl__emit(struct output_state *dst, const char *src)
 {
-       size_t rc = snprintf(dst->dst, dst->dstlen, "%s", src);
+       size_t rc = cdecl__strlcpy(dst->dst, src, dst->dstlen);
        return cdecl__advance(dst, rc);
 }
 
-static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
+/*
+ * 31 decimal digits is enough for values up to 2^102 - 1.
+ * 63 decimal digits is enough for values up to 2^209 - 1.
+ *
+ * We can't portably write numbers this large in preprocessor conditionals,
+ * but since the maximum values of unsigned integer types are always one
+ * less than a power of two, we can use a sequence of small shifts to infer
+ * the bounds.
+ *
+ * All known implementations have 64-bit uintmax_t.  Leave some headroom
+ * to support a possible future implementatons with 128-bit uintmax_t.
+ */
+enum {
+#if (UINTMAX_MAX >> 27 >> 27 >> 26 >> 26) == 0
+       MAX_UINT_DIGITS = 31
+#elif (UINTMAX_MAX >> 27 >> 26 >> 26 >> 26 >> 26 >> 26 >> 26 >> 26) == 0
+       MAX_UINT_DIGITS = 63
+#else
+#      error UINTMAX_MAX is too large, please report a bug.
+#endif
+};
+
+size_t cdecl__emit_uint(struct output_state *dst, uintmax_t val)
 {
-       size_t ret;
+       char buf[MAX_UINT_DIGITS + 1], *p = &buf[sizeof buf];
 
-       ret = cdecl__emit(dst, spec_string(s->type));
-       if (s->ident) {
-               ret += cdecl__emit(dst, " " + !ret);
-               ret += cdecl__emit(dst, s->ident);
+       *(--p) = 0;
+       while (val > 0) {
+               *(--p) = '0' + val % 10;
+               val /= 10;
        }
 
-       return ret;
+       return cdecl__emit(dst, p);
+}
+
+static void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
+{
+       size_t rc;
+
+       rc = cdecl__emit(dst, spec_string(s->type));
+       if (s->ident) {
+               cdecl__emit(dst, " " + !rc);
+               cdecl__emit(dst, s->ident);
+       }
 }
 
 /*
@@ -60,19 +106,21 @@ static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
  * listed in mask, which is the bitwise OR of the desired specifier kinds, are
  * printed.
  */
-size_t cdecl__emit_specs(struct output_state *dst,
-                         struct cdecl_declspec *s,
-                         unsigned mask)
+const char *cdecl__emit_specs(struct output_state *dst,
+                              struct cdecl_declspec *s,
+                              unsigned mask)
 {
-       size_t ret = 0;
+       const char *sep = " ";
+       int empty = 1;
 
        for (; s; s = s->next) {
                if (!(s->type & mask))
                        continue;
 
-               ret += cdecl__emit(dst, " " + !ret);
-               ret += explain_spec(dst, s);
+               cdecl__emit(dst, sep + empty);
+               explain_spec(dst, s);
+               empty = 0;
        }
 
-       return ret;
+       return sep + empty;
 }