X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/3dcdfd95595f10ed02caa09658bf1b629e987777..f78c5d06a8775b33890071166d56be82d9233c8b:/src/output.c

diff --git a/src/output.c b/src/output.c
index cb2a568..8fffd24 100644
--- a/src/output.c
+++ b/src/output.c
@@ -48,106 +48,58 @@ size_t cdecl__advance(char **buf, size_t *n, size_t amount)
 	return ret + cdecl__advance_(buf, n, rc);
 }
 
-static size_t explain_storage(char *buf, size_t n, unsigned spec)
+static const char *explain_spec_simple(struct cdecl_declspec *s)
 {
-	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);
+	switch (s->type) {
+#	include "namespecs.h"
 	}
+
+	assert(0);
 }
 
-/* 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(char *buf, size_t n, struct cdecl_declspec *s)
+{
+	const char *keyword = explain_spec_simple(s);
+
+	if (keyword[0] && s->ident)
+		return snprintf(buf, n, "%s %s", keyword, s->ident);
+	else if (s->ident)
+		return snprintf(buf, n, "%s", s->ident);
+	return snprintf(buf, n, "%s", keyword);
+}
+
+/*
+ * 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__explain_specs(char *buf, size_t n, struct cdecl_declspec *s,
+                                                 unsigned mask)
 {
-	unsigned long funcmap = 0;
 	size_t ret = 0, rc = 0;
 
 	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		switch (cdecl_spec_kind(c)) {
+		switch (cdecl_spec_kind(c) & mask) {
 		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;
+		case CDECL_SPEC_QUAL:
+		case CDECL_SPEC_TYPE:
+			ret += cdecl__advance(&buf, &n, rc);
+			rc = explain_spec(buf, n, c);
 		}
 	}
 
-	if (funcmap & (1ul << (CDECL_FUNC_INLINE & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "inline");
-	}
-
 	return ret + rc;
 }
 
-size_t cdecl__explain_qualifiers(char *buf, size_t n, struct cdecl_declspec *s)
+/* 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)
 {
-	unsigned long qualmap = 0;
-	size_t ret = 0, rc = 0;
-
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		if (cdecl_spec_kind(c) != CDECL_SPEC_QUAL)
-			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;
+	return cdecl__explain_specs(buf, n, s, CDECL_SPEC_FUNC|CDECL_SPEC_STOR);
 }
 
 /* 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);
-	}
-
-	return ret + rc;
+	return cdecl__explain_specs(buf, n, s, CDECL_SPEC_QUAL|CDECL_SPEC_TYPE);
 }