X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/31ac11cc668bb8ecc1317fd2e8bd79b7925bceeb..6f166c6c36bda84191ed916a52b311ab417a4890:/src/output.c

diff --git a/src/output.c b/src/output.c
index 3b4fa9f..a8d7ea5 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /*
  *  Helper functions for outputting text.
- *  Copyright © 2011 Nick Bowler
+ *  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
@@ -19,9 +19,8 @@
 #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)
 {
@@ -48,66 +47,17 @@ size_t cdecl__advance(char **buf, size_t *n, size_t amount)
 	return ret + cdecl__advance_(buf, n, rc);
 }
 
+#include "specstr.h"
+
 static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
 {
-	switch (s->type) {
-	/* Function specifiers */
-	case CDECL_FUNC_INLINE:
-		return snprintf(buf, n, "inline");
-	/* Storage-class specifiers */
-	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");
-	/* Type qualifiers */
-	case CDECL_QUAL_RESTRICT:
-		return snprintf(buf, n, "restrict");
-	case CDECL_QUAL_VOLATILE:
-		return snprintf(buf, n, "volatile");
-	case CDECL_QUAL_CONST:
-		return snprintf(buf, n, "const");
-	/* Type specifiers */
-	case CDECL_TYPE_VOID:
-		return snprintf(buf, n, "void");
-	case CDECL_TYPE_CHAR:
-		return snprintf(buf, n, "char");
-	case CDECL_TYPE_SHORT:
-		return snprintf(buf, n, "short");
-	case CDECL_TYPE_INT:
-		return snprintf(buf, n, "int");
-	case CDECL_TYPE_LONG:
-		return snprintf(buf, n, "long");
-	case CDECL_TYPE_FLOAT:
-		return snprintf(buf, n, "float");
-	case CDECL_TYPE_DOUBLE:
-		return snprintf(buf, n, "double");
-	case CDECL_TYPE_SIGNED:
-		return snprintf(buf, n, "signed");
-	case CDECL_TYPE_UNSIGNED:
-		return snprintf(buf, n, "unsigned");
-	case CDECL_TYPE_BOOL:
-		return snprintf(buf, n, "_Bool");
-	case CDECL_TYPE_COMPLEX:
-		return snprintf(buf, n, "_Complex");
-	case CDECL_TYPE_IMAGINARY:
-		return snprintf(buf, n, "_Imaginary");
-	case CDECL_TYPE_STRUCT:
-		return snprintf(buf, n, "struct %s", s->ident);
-	case CDECL_TYPE_UNION:
-		return snprintf(buf, n, "union %s", s->ident);
-	case CDECL_TYPE_ENUM:
-		return snprintf(buf, n, "enum %s", s->ident);
-	case CDECL_TYPE_IDENT:
+	const char *keyword = spec_string(s->type);
+
+	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);
-	default:
-		assert(0);
-	}
+	return snprintf(buf, n, "%s", keyword);
 }
 
 /*
@@ -120,28 +70,13 @@ size_t cdecl__explain_specs(char *buf, size_t n, struct cdecl_declspec *s,
 {
 	size_t ret = 0, rc = 0;
 
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		switch (cdecl_spec_kind(c) & mask) {
-		case CDECL_SPEC_FUNC:
-		case CDECL_SPEC_STOR:
-		case CDECL_SPEC_QUAL:
-		case CDECL_SPEC_TYPE:
-			ret += cdecl__advance(&buf, &n, rc);
-			rc = explain_spec(buf, n, c);
-		}
+	for (; s; s = s->next) {
+		if (!(s->type & mask))
+			continue;
+
+		ret += cdecl__advance(&buf, &n, rc);
+		rc = explain_spec(buf, n, s);
 	}
 
 	return ret + 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)
-{
-	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)
-{
-	return cdecl__explain_specs(buf, n, s, CDECL_SPEC_QUAL|CDECL_SPEC_TYPE);
-}