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

diff --git a/src/output.c b/src/output.c
index 22fc2e9..a8d7ea5 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /*
  *  Helper functions for outputting text.
- *  Copyright © 2011, 2021 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
@@ -47,18 +47,11 @@ size_t cdecl__advance(char **buf, size_t *n, size_t amount)
 	return ret + cdecl__advance_(buf, n, rc);
 }
 
-static const char *explain_spec_simple(struct cdecl_declspec *s)
-{
-	switch (s->type) {
-#	include "namespecs.h"
-	}
-
-	assert(0);
-}
+#include "specstr.h"
 
 static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
 {
-	const char *keyword = explain_spec_simple(s);
+	const char *keyword = spec_string(s->type);
 
 	if (keyword[0] && s->ident)
 		return snprintf(buf, n, "%s %s", keyword, s->ident);
@@ -77,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);
-}