libcdecl: Simplify cdecl__explain_specs.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 8fffd24af2e8129455e9e07f5e2ee4da356a2956..a8d7ea5ade969fef29be01855623105106e57dfe 100644 (file)
--- 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,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);
@@ -78,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);
-}