X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/54ca2ed1ca173c7818792b6b06d12b8536acb6f3..9786185611c072036751fdfcc1731158a0c2d20c:/src/output.c?ds=inline
diff --git a/src/output.c b/src/output.c
index 8c2cd0b..634b79e 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,27 +1,113 @@
+/*
+ * Helper functions for outputting text.
+ * Copyright © 2011, 2021, 2023-2024 Nick Bowler
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include
#include
-#include "output.h"
+#include
+#include
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
+#include "cdecl.h"
+#include "cdecl-internal.h"
+
+#include "parse.h"
+#include "specstr.h"
+
+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__advance(char **buf, size_t *n, size_t 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 = cdecl__strlcpy(dst->dst, src, dst->dstlen);
+ return cdecl__advance(dst, rc);
+}
+
+enum {
+ /*
+ * upper bound on number of decimal digits required to convert
+ * cdecl_uintmax.
+ */
+ MAX_UINT_DIGITS = (CHAR_BIT * sizeof (cdecl_uintmax) + 2)/3
+};
+
+size_t cdecl__emit_uint(struct output_state *dst, cdecl_uintmax val)
{
- size_t ret, rc;
+ char buf[MAX_UINT_DIGITS + 1], *p = &buf[sizeof buf];
- if (!amount)
- return 0;
+ *(--p) = 0;
+ while (val > 0) {
+ *(--p) = '0' + val % 10;
+ val /= 10;
+ }
+
+ 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);
+ }
+}
+
+/*
+ * Render a list of declaration specifiers. Only the declaration specifiers
+ * listed in mask, which is the bitwise OR of the desired specifier kinds, are
+ * printed.
+ */
+const char *cdecl__emit_specs(struct output_state *dst,
+ struct cdecl_declspec *s,
+ unsigned mask)
+{
+ const char *sep = " ";
+ int empty = 1;
+
+ for (; s; s = s->next) {
+ if (!(s->type & mask))
+ continue;
+
+ cdecl__emit(dst, sep + empty);
+ explain_spec(dst, s);
+ empty = 0;
+ }
- ret = cdecl__advance_(buf, n, amount);
- rc = snprintf(*buf, *n, " ");
- return ret + cdecl__advance_(buf, n, rc);
+ return sep + empty;
}