X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/54ca2ed1ca173c7818792b6b06d12b8536acb6f3..655528745c72b4a7d50aee1688c359dc069ee546:/src/explain.c?ds=inline
diff --git a/src/explain.c b/src/explain.c
index dadc65f..a22b4d0 100644
--- 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,246 +15,133 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
+
+#include
#include
-#include
-#include
-#include
+#include
#include
#include "cdecl.h"
-#include "typemap.h"
-#include "output.h"
-
-static size_t
-explain_qualifiers(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;
-}
-
-/* Renders the type qualifiers and type specifiers in canonical form. */
-static size_t
-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;
+#include "cdecl-internal.h"
- for (struct cdecl_declspec *c = s; c; c = c->next) {
- if (cdecl_spec_kind(c) != CDECL_SPEC_TYPE)
- continue;
+#define PRE_SPECS (CDECL_SPEC_FUNC|CDECL_SPEC_STOR)
+#define POST_SPECS (CDECL_SPEC_QUAL|CDECL_SPEC_TYPE)
- /* Valid C types have at most one identifier. */
- if (c->ident)
- tag = c->ident;
- }
-
- rc = 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;
-}
-
-static size_t explain_storage(char *buf, size_t n, unsigned spec)
+static void explain_specs(struct output_state *dst, struct cdecl_declspec *s, unsigned mask)
{
- 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);
- }
-}
-
-/* Renders the storage-class and function specifiers in canonical form. */
-static size_t explain_pre_specs(char *buf, size_t n, struct cdecl_declspec *s)
-{
- 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)) {
- 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;
- }
- }
-
- if (funcmap & (1ul << (CDECL_FUNC_INLINE & 0xff))) {
- ret += cdecl__advance(&buf, &n, rc);
- rc = snprintf(buf, n, "inline");
- }
-
- return ret + rc;
+ cdecl__emit(dst, cdecl__emit_specs(dst, s, mask));
}
/*
- * Renders the start of the thing being declared. If top is true, print
- * the "declare" or "type" keywords at the front, as appropriate.
+ * If declarator declares an identifier foo, then emit "foo as "; otherwise
+ * emit nothing.
*/
-static size_t
-explain_prologue(char *buf, size_t n, struct cdecl_declarator *d, bool top)
+static void
+explain_name(struct output_state *dst, struct cdecl_declarator *d)
{
- size_t ret = 0, rc = 0;
-
- 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);
- }
-
+ while (d->child)
d = d->child;
+
+ if (d->type == CDECL_DECL_IDENT) {
+ cdecl__emit(dst, d->u.ident);
+ cdecl__emit(dst, " as ");
}
}
-static size_t
-explain_pointer(char *buf, size_t n, struct cdecl_pointer *p)
+/*
+ * For a pointer declarator, emit "[QUAL ]pointer to ", where
+ * QUAL is the (possibly empty) list of qualifiers.
+ */
+static void
+explain_pointer(struct output_state *dst, struct cdecl_pointer *p)
{
- size_t ret = 0, rc;
-
- rc = explain_qualifiers(buf, n, p->qualifiers);
- ret += cdecl__advance(&buf, &n, rc);
-
- return ret + snprintf(buf, n, "pointer to");
+ explain_specs(dst, p->qualifiers, -1);
+ cdecl__emit(dst, "pointer to ");
}
-static size_t
-explain_array(char *buf, size_t n, struct cdecl_array *a)
+/*
+ * For an array declarator, emit "[variable-length ]array [X ]of ", where
+ * for a variable-length array X is the (possibly omitted) identifier name,
+ * and for normal arrays X is the (possibly omitted) length.
+ */
+static void
+explain_array(struct output_state *dst, struct cdecl_array *a)
{
- size_t ret = 0, rc = 0;
+ size_t rc = 0;
if (a->vla)
- rc = snprintf(buf, n, "variable-length array");
- else
- rc = snprintf(buf, n, "array");
- ret += cdecl__advance(&buf, &n, rc);
+ cdecl__emit(dst, "variable-length ");
+ cdecl__emit(dst, "array ");
if (a->vla) {
- rc = snprintf(buf, n, "%s", a->vla);
- ret += cdecl__advance(&buf, &n, rc);
- } else if (a->length) {
- rc = snprintf(buf, n, "%ju", a->length);
- ret += cdecl__advance(&buf, &n, rc);
+ rc = cdecl__emit(dst, a->vla);
+ } else {
+ rc = snprintf(dst->dst, dst->dstlen, "%.0" PRIuMAX, a->length);
+ cdecl__advance(dst, rc);
}
- return ret + snprintf(buf, n, "of");
+ cdecl__emit(dst, " of " + !rc);
}
-static size_t
-explain_declarators(char *buf, size_t n, struct cdecl_declarator *decl);
+static void
+explain_declarators(struct output_state *dst, struct cdecl_declarator *decl);
-static size_t explain_decl(char *buf, size_t n, struct cdecl *decl, bool top)
+static void explain_decl(struct output_state *dst, struct cdecl *decl)
{
- size_t ret = 0, rc;
-
- rc = explain_prologue(buf, n, decl->declarators, top);
- ret += cdecl__advance(&buf, &n, rc);
-
- 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 + explain_post_specs(buf, n, decl->specifiers);
+ explain_name(dst, decl->declarators);
+ explain_specs(dst, decl->specifiers, PRE_SPECS);
+ explain_declarators(dst, decl->declarators);
+ cdecl__emit_specs(dst, decl->specifiers, POST_SPECS);
}
-static size_t explain_function(char *buf, size_t n, struct cdecl_function *f)
+/*
+ * For a function declarator, emit "function [PARAM ]returning ", where
+ * PARAM is the (omitted in the case of an empty non-prototype identifier
+ * list) parameter or identifier lists enclosed in parentheses.
+ */
+static void
+explain_function(struct output_state *dst, struct cdecl_function *f)
{
- size_t ret = 0, rc = 0;
-
- rc = snprintf(buf, n, "function");
- ret += cdecl__advance(&buf, &n, rc);
+ cdecl__emit(dst, "function ");
if (f->parameters) {
- rc = snprintf(buf, n, "(");
- ret += cdecl__advance_(&buf, &n, rc);
+ struct cdecl *p;
- for (struct cdecl *p = f->parameters; p; p = p->next) {
- rc = explain_decl(buf, n, p, false);
- ret += cdecl__advance_(&buf, &n, rc);
+ cdecl__emit(dst, "(");
+ for (p = f->parameters; p; p = p->next) {
+ explain_decl(dst, p);
if (p->next)
- rc = snprintf(buf, n, ",");
- else if (f->variadic)
- rc = snprintf(buf, n, ", ...)");
- else
- rc = snprintf(buf, n, ")");
- ret += cdecl__advance(&buf, &n, rc);
+ cdecl__emit(dst, ", ");
}
+
+ if (f->variadic)
+ cdecl__emit(dst, ", ...) ");
+ else
+ cdecl__emit(dst, ") ");
}
- return ret + snprintf(buf, n, "returning");
+ cdecl__emit(dst, "returning ");
}
-static size_t
-explain_declarators(char *buf, size_t n, struct cdecl_declarator *d)
+static void
+explain_declarators(struct output_state *dst, struct cdecl_declarator *d)
{
- size_t ret = 0, rc;
-
if (d->type == CDECL_DECL_IDENT || d->type == CDECL_DECL_NULL)
- return 0;
+ return;
- rc = explain_declarators(buf, n, d->child);
- ret += cdecl__advance(&buf, &n, rc);
+ explain_declarators(dst, d->child);
switch (d->type) {
case CDECL_DECL_POINTER:
- return ret + explain_pointer(buf, n, &d->u.pointer);
+ explain_pointer(dst, &d->u.pointer);
+ return;
case CDECL_DECL_ARRAY:
- return ret + explain_array(buf, n, &d->u.array);
+ explain_array(dst, &d->u.array);
+ return;
case CDECL_DECL_FUNCTION:
- return ret + explain_function(buf, n, &d->u.function);
+ explain_function(dst, &d->u.function);
+ return;
default:
assert(0);
}
@@ -262,5 +149,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);
+ struct output_state dst = { buf, n };
+
+ if (cdecl_is_abstract(decl->declarators))
+ cdecl__emit(&dst, "type ");
+ else
+ cdecl__emit(&dst, "declare ");
+
+ explain_decl(&dst, decl);
+ return dst.accum;
}