X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/ce6fc53682acb605e6358e22b5eccf4780a61a22..8b40c60072c0549d18afb1e19fa28ee18036957c:/src/output.c

diff --git a/src/output.c b/src/output.c
index 8fffd24..f691765 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 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,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);