libcdecl: Improve specifier to string conversions.

[cdecl99.git] / src / explain.c

diff --git a/src/explain.c b/src/explain.c
index d50e45e208a3d171588bcbdcf58f7e2734e2f505..fe3ed7d9904ea4bc9f4bb127858a23e1d3965a30 100644 (file)
--- a/src/explain.c
+++ b/src/explain.c
@@ -1,6 +1,6 @@
 /*
  *  Render C declarations as English.
- *  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
@@ -15,41 +15,38 @@
  *  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 <stdlib.h>
 #include <stdarg.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <assert.h>
 
 #include "cdecl.h"
-#include "output.h"
+#include "cdecl-internal.h"
 
-/*
- * Renders the start of the thing being declared.  If top is true, print
- * the "declare" or "type" keywords at the front, as appropriate.
- */
-static size_t
-explain_prologue(char *buf, size_t n, struct cdecl_declarator *d, bool top)
+static size_t explain_pre_specs(char *buf, size_t n, struct cdecl_declspec *s)
 {
-       size_t ret = 0, rc = 0;
+       return cdecl__explain_specs(buf, n, s, CDECL_SPEC_FUNC|CDECL_SPEC_STOR);
+}
 
-       while (d) {
-               switch (d->type) {
-               case CDECL_DECL_NULL:
-                       if (top)
-                               return snprintf(buf, n, "type");
-                       return 0;
-               case CDECL_DECL_IDENT:
-                       if (top)
-                               rc = snprintf(buf, n, "declare");
-                       ret += cdecl__advance(&buf, &n, rc);
-                       return ret + snprintf(buf, n, "%s as", d->u.ident);
-               }
+static size_t 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);
+}
 
+static size_t
+explain_name(char *buf, size_t n, struct cdecl_declarator *d)
+{
+       while (d->child)
                d = d->child;
-       }
 
-       assert(0);
+       if (d->type != CDECL_DECL_IDENT)
+               return 0;
+
+       return snprintf(buf, n, "%s as", d->u.ident);
 }
 
 static size_t
@@ -57,7 +54,7 @@ explain_pointer(char *buf, size_t n, struct cdecl_pointer *p)
 {
        size_t ret = 0, rc;
 
-       rc = cdecl__explain_qualifiers(buf, n, p->qualifiers);
+       rc = cdecl__explain_specs(buf, n, p->qualifiers, CDECL_SPEC_QUAL);
        ret += cdecl__advance(&buf, &n, rc);
 
        return ret + snprintf(buf, n, "pointer to");
@@ -78,7 +75,7 @@ explain_array(char *buf, size_t n, struct cdecl_array *a)
                rc = snprintf(buf, n, "%s", a->vla);
                ret += cdecl__advance(&buf, &n, rc);
        } else if (a->length) {
-               rc = snprintf(buf, n, "%ju", a->length);
+               rc = snprintf(buf, n, "%" PRIuMAX, a->length);
                ret += cdecl__advance(&buf, &n, rc);
        }
 
@@ -88,20 +85,20 @@ explain_array(char *buf, size_t n, struct cdecl_array *a)
 static size_t
 explain_declarators(char *buf, size_t n, struct cdecl_declarator *decl);
 
-static size_t explain_decl(char *buf, size_t n, struct cdecl *decl, bool top)
+static size_t explain_decl(char *buf, size_t n, struct cdecl *decl)
 {
        size_t ret = 0, rc;
 
-       rc = explain_prologue(buf, n, decl->declarators, top);
+       rc = explain_name(buf, n, decl->declarators);
        ret += cdecl__advance(&buf, &n, rc);
 
-       rc = cdecl__explain_pre_specs(buf, n, decl->specifiers);
+       rc = explain_pre_specs(buf, n, decl->specifiers);
        ret += cdecl__advance(&buf, &n, rc);
 
        rc = explain_declarators(buf, n, decl->declarators);
        ret += cdecl__advance(&buf, &n, rc);
 
-       return ret + cdecl__explain_post_specs(buf, n, decl->specifiers);
+       return ret + explain_post_specs(buf, n, decl->specifiers);
 }
 
 static size_t explain_function(char *buf, size_t n, struct cdecl_function *f)
@@ -116,7 +113,7 @@ static size_t explain_function(char *buf, size_t n, struct cdecl_function *f)
                ret += cdecl__advance_(&buf, &n, rc);
 
                for (struct cdecl *p = f->parameters; p; p = p->next) {
-                       rc = explain_decl(buf, n, p, false);
+                       rc = explain_decl(buf, n, p);
                        ret += cdecl__advance_(&buf, &n, rc);
 
                        if (p->next)
@@ -157,5 +154,13 @@ explain_declarators(char *buf, size_t n, struct cdecl_declarator *d)
 
 size_t cdecl_explain(char *buf, size_t n, struct cdecl *decl)
 {
-       return explain_decl(buf, n, decl, true);
+       size_t ret, rc;
+
+       if (cdecl_is_abstract(decl->declarators))
+               rc = snprintf(buf, n, "type");
+       else
+               rc = snprintf(buf, n, "declare");
+       ret = cdecl__advance(&buf, &n, rc);
+
+       return ret + explain_decl(buf, n, decl);
 }