X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/8c4c37ecd2f04402c23b18c2e0a25f7bcc5bdce3..7df5e2a15f784ab786f56ca25d739c8b546ccde8:/src/output.c

diff --git a/src/output.c b/src/output.c
index 3d0a923..cf5e2ff 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,135 +1,78 @@
+/*
+ *  Helper functions for outputting text.
+ *  Copyright © 2011, 2021, 2023 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 <http://www.gnu.org/licenses/>.
+ */
+#include <config.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include "typemap.h"
-#include "output.h"
 #include "cdecl.h"
+#include "cdecl-internal.h"
 
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
-{
-	if (amount >= *n) {
-		*n   = 0;
-		*buf = 0;
-	} else {
-		*buf += amount;
-		*n   -= amount;
-	}
+#include "specstr.h"
 
-	return amount;
-}
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
 
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-	size_t ret, rc;
+	size_t x = MIN(amount, dst->dstlen);
 
-	if (!amount)
-		return 0;
+	dst->dst    += x;
+	dst->dstlen -= x;
 
-	ret = cdecl__advance_(buf, n, amount);
-	rc = snprintf(*buf, *n, " ");
-	return ret + cdecl__advance_(buf, n, rc);
+	return amount;
 }
 
-static size_t explain_storage(char *buf, size_t n, unsigned spec)
+size_t cdecl__emit(struct output_state *dst, const char *src)
 {
-	switch (spec) {
-	case CDECL_STOR_TYPEDEF:
-		return snprintf(buf, n, "typedef");
-	case CDECL_STOR_EXTERN:
-		return snprintf(buf, n, "extern");
-	case CDECL_STOR_STATIC:
-		return snprintf(buf, n, "static");
-	case CDECL_STOR_AUTO:
-		return snprintf(buf, n, "auto");
-	case CDECL_STOR_REGISTER:
-		return snprintf(buf, n, "register");
-	default:
-		assert(0);
-	}
+	size_t rc = snprintf(dst->dst, dst->dstlen, "%s", src);
+	return cdecl__advance(dst, rc);
 }
 
-/* Renders the storage-class and function specifiers in canonical form. */
-size_t cdecl__explain_pre_specs(char *buf, size_t n, struct cdecl_declspec *s)
+static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
 {
-	unsigned long funcmap = 0;
-	size_t ret = 0, rc = 0;
+	size_t ret;
 
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		switch (cdecl_spec_kind(c)) {
-		case CDECL_SPEC_FUNC:
-			funcmap |= 1ul << (c->type & 0xff);
-			break;
-		case CDECL_SPEC_STOR:
-			/* Valid C declarations have at most one
-			 * storage-class specifier. */
-			rc = explain_storage(buf, n, c->type);
-			break;
-		}
+	ret = cdecl__emit(dst, spec_string(s->type));
+	if (s->ident) {
+		ret += cdecl__emit(dst, " " + !ret);
+		ret += cdecl__emit(dst, s->ident);
 	}
 
-	if (funcmap & (1ul << (CDECL_FUNC_INLINE & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "inline");
-	}
-
-	return ret + rc;
+	return ret;
 }
 
-size_t cdecl__explain_qualifiers(char *buf, size_t n, struct cdecl_declspec *s)
+/*
+ * 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.
+ */
+size_t cdecl__emit_specs(struct output_state *dst,
+                         struct cdecl_declspec *s,
+                         unsigned mask)
 {
-	unsigned long qualmap = 0;
-	size_t ret = 0, rc = 0;
+	size_t ret = 0;
 
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		if (cdecl_spec_kind(c) != CDECL_SPEC_QUAL)
+	for (; s; s = s->next) {
+		if (!(s->type & mask))
 			continue;
-		qualmap |= 1ul << (c->type & 0xff);
-	}
-
-	if (qualmap & (1ul << (CDECL_QUAL_RESTRICT & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "restrict");
-	}
-	if (qualmap & (1ul << (CDECL_QUAL_VOLATILE & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "volatile");
-	}
-	if (qualmap & (1ul << (CDECL_QUAL_CONST & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "const");
-	}
-
-	return ret + rc;
-}
-
-/* Renders the type qualifiers and type specifiers in canonical form. */
-size_t cdecl__explain_post_specs(char *buf, size_t n, struct cdecl_declspec *s)
-{
-	const char *tag = NULL;
-	unsigned long typemap;
-	size_t ret = 0, rc;
-
-	typemap = cdecl__build_typemap(s);
-	if (typemap == -1)
-		return 0;
-
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		if (cdecl_spec_kind(c) != CDECL_SPEC_TYPE)
-			continue;
-
-		/* Valid C types have at most one identifier. */
-		if (c->ident)
-			tag = c->ident;
-	}
-
-	rc = cdecl__explain_qualifiers(buf, n, s);
-	ret += cdecl__advance(&buf, &n, rc);
 
-	rc = snprintf(buf, n, "%s", cdecl__explain_typemap(typemap));
-	if (tag) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "%s", tag);
+		ret += cdecl__emit(dst, " " + !ret);
+		ret += explain_spec(dst, s);
 	}
 
-	return ret + rc;
+	return ret;
 }