#include "cdecl.h"
#include "cdecl-internal.h"
+#include "parse.h"
#include "specstr.h"
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+size_t cdecl__advance(struct output_state *dst, size_t amount)
{
- if (amount >= *n) {
- *n = 0;
- *buf = 0;
- } else {
- *buf += amount;
- *n -= amount;
- }
+ size_t x = MIN(amount, dst->dstlen);
+
+ dst->dst += x;
+ dst->dstlen -= x;
+ dst->accum += amount;
return amount;
}
-size_t cdecl__emit(char **dst, size_t *dstlen, const char *src)
+size_t cdecl__strlcpy(char *dst, const char *src, size_t dstlen)
{
- size_t rc = snprintf(*dst, *dstlen, "%s", src);
- return cdecl__advance(dst, dstlen, rc);
+ size_t srclen = strlen(src);
+
+ if (dstlen > 0) {
+ memcpy(dst, src, MIN(dstlen, srclen+1));
+ if (dstlen <= srclen)
+ dst[dstlen-1] = 0;
+ }
+
+ return srclen;
}
-static size_t explain_spec(char **dst, size_t *dstlen, struct cdecl_declspec *s)
+size_t cdecl__emit(struct output_state *dst, const char *src)
{
- size_t ret;
+ size_t rc = cdecl__strlcpy(dst->dst, src, dst->dstlen);
+ return cdecl__advance(dst, rc);
+}
- ret = cdecl__emit(dst, dstlen, spec_string(s->type));
- if (s->ident) {
- ret += cdecl__emit(dst, dstlen, " " + !ret);
- ret += cdecl__emit(dst, dstlen, s->ident);
+/*
+ * 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)
+{
+ char buf[MAX_UINT_DIGITS + 1], *p = &buf[sizeof buf];
+
+ *(--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);
+ }
}
/*
* listed in mask, which is the bitwise OR of the desired specifier kinds, are
* printed.
*/
-size_t cdecl__emit_specs(char **dst, size_t *dstlen,
- 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, dstlen, " " + !ret);
- ret += explain_spec(dst, dstlen, s);
+ cdecl__emit(dst, sep + empty);
+ explain_spec(dst, s);
+ empty = 0;
}
- return ret;
+ return sep + empty;
}