Generate specifier strings directly from cdecl.h

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 3d0a9236532a8953e05553cd22f3340f1fb43ef4..f691765ea592187d038b3d1dd16a2e080bef41b7 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,9 +1,26 @@
+/*
+ *  Helper functions for outputting text.
+ *  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
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <config.h>
 #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)
 {
@@ -30,106 +47,51 @@ 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)
+#include "specstr.h"
+
+static size_t explain_spec(char *buf, size_t n, 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);
-       }
+       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);
+       return snprintf(buf, n, "%s", keyword);
 }
 
-/* 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)
+/*
+ * 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);
 }