X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/0b2a2978f09f5d9b56d8655dd60eaffbe9006b7a..9cb5aae31e1c126970843ef9b6e54036b185fd51:/src/explain.c diff --git a/src/explain.c b/src/explain.c index e6b4f16..10a7064 100644 --- a/src/explain.c +++ b/src/explain.c @@ -1,6 +1,6 @@ /* * Render C declarations as English. - * Copyright © 2011, 2021, 2023 Nick Bowler + * Copyright © 2011, 2021, 2023-2024 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 @@ -17,9 +17,7 @@ */ #include -#include #include -#include #include "cdecl.h" #include "cdecl-internal.h" @@ -27,50 +25,36 @@ #define PRE_SPECS (CDECL_SPEC_FUNC|CDECL_SPEC_STOR) #define POST_SPECS (CDECL_SPEC_QUAL|CDECL_SPEC_TYPE) -static size_t explain_specs(struct output_state *dst, struct cdecl_declspec *s, unsigned mask) +static void explain_specs(struct output_state *dst, struct cdecl_declspec *s, unsigned mask) { - size_t ret; - - ret = cdecl__emit_specs(dst, s, mask); - return ret + cdecl__emit(dst, " " + !ret); -} - -static size_t -explain_specs_post(struct output_state *dst, struct cdecl_declspec *s) -{ - return cdecl__emit_specs(dst, s, POST_SPECS); + cdecl__emit(dst, cdecl__emit_specs(dst, s, mask)); } /* * If declarator declares an identifier foo, then emit "foo as "; otherwise * emit nothing. */ -static size_t +static void explain_name(struct output_state *dst, struct cdecl_declarator *d) { - size_t ret; - while (d->child) d = d->child; - if (d->type != CDECL_DECL_IDENT) - return 0; - - ret = cdecl__emit(dst, d->u.ident); - return ret + cdecl__emit(dst, " as "); + if (d->type == CDECL_DECL_IDENT) { + cdecl__emit(dst, d->u.ident); + cdecl__emit(dst, " as "); + } } /* * For a pointer declarator, emit "[QUAL ]pointer to ", where * QUAL is the (possibly empty) list of qualifiers. */ -static size_t +static void explain_pointer(struct output_state *dst, struct cdecl_pointer *p) { - size_t ret; - - ret = explain_specs(dst, p->qualifiers, -1); - return ret + cdecl__emit(dst, "pointer to "); + explain_specs(dst, p->qualifiers, -1); + cdecl__emit(dst, "pointer to "); } /* @@ -78,39 +62,29 @@ explain_pointer(struct output_state *dst, struct cdecl_pointer *p) * for a variable-length array X is the (possibly omitted) identifier name, * and for normal arrays X is the (possibly omitted) length. */ -static size_t +static void explain_array(struct output_state *dst, struct cdecl_array *a) { - size_t ret = 0, rc = 0; - - if (a->vla) - ret += cdecl__emit(dst, "variable-length "); - ret += cdecl__emit(dst, "array "); + size_t rc = 0; + cdecl__emit(dst, "variable-length array " + (a->vla ? 0 : 16)); if (a->vla) { rc = cdecl__emit(dst, a->vla); - ret += rc; } else { - rc = snprintf(dst->dst, dst->dstlen, "%.0" PRIuMAX, a->length); - ret += cdecl__advance(dst, rc); + rc = cdecl__emit_uint(dst, a->length); } - - return ret + cdecl__emit(dst, " of " + !rc); + cdecl__emit(dst, " of " + !rc); } -static size_t +static void explain_declarators(struct output_state *dst, struct cdecl_declarator *decl); -static size_t explain_decl(struct output_state *dst, struct cdecl *decl) +static void explain_decl(struct output_state *dst, struct cdecl *decl) { - size_t ret; - - ret = explain_name(dst, decl->declarators); - ret += explain_specs(dst, decl->specifiers, PRE_SPECS); - ret += explain_declarators(dst, decl->declarators); - ret += explain_specs_post(dst, decl->specifiers); - - return ret; + 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); } /* @@ -118,64 +92,56 @@ static size_t explain_decl(struct output_state *dst, struct cdecl *decl) * PARAM is the (omitted in the case of an empty non-prototype identifier * list) parameter or identifier lists enclosed in parentheses. */ -static size_t +static void explain_function(struct output_state *dst, struct cdecl_function *f) { - size_t ret = 0; - - ret += cdecl__emit(dst, "function "); + int tail_offset = 7; + cdecl__emit(dst, "function "); if (f->parameters) { struct cdecl *p; - ret += cdecl__emit(dst, "("); + cdecl__emit(dst, "("); for (p = f->parameters; p; p = p->next) { - ret += explain_decl(dst, p); + explain_decl(dst, p); if (p->next) - ret += cdecl__emit(dst, ", "); + cdecl__emit(dst, ", "); } - if (f->variadic) - ret += cdecl__emit(dst, ", ...) "); - else - ret += cdecl__emit(dst, ") "); + tail_offset = f->variadic ? 0 : 5; } - - return ret + cdecl__emit(dst, "returning "); + cdecl__emit(dst, ", ...) returning " + tail_offset); } -static size_t +static void explain_declarators(struct output_state *dst, struct cdecl_declarator *d) { - size_t ret; - - if (d->type == CDECL_DECL_IDENT || d->type == CDECL_DECL_NULL) - return 0; - - ret = explain_declarators(dst, d->child); + if (d->child) + explain_declarators(dst, d->child); switch (d->type) { case CDECL_DECL_POINTER: - return ret + explain_pointer(dst, &d->u.pointer); + explain_pointer(dst, &d->u.pointer); + return; case CDECL_DECL_ARRAY: - return ret + explain_array(dst, &d->u.array); + explain_array(dst, &d->u.array); + return; case CDECL_DECL_FUNCTION: - return ret + explain_function(dst, &d->u.function); - default: - assert(0); + explain_function(dst, &d->u.function); + return; } } size_t cdecl_explain(char *buf, size_t n, struct cdecl *decl) { struct output_state dst = { buf, n }; - size_t ret; if (cdecl_is_abstract(decl->declarators)) - ret = cdecl__emit(&dst, "type "); + cdecl__emit(&dst, "type "); else - ret = cdecl__emit(&dst, "declare "); + cdecl__emit(&dst, "declare "); - return ret + explain_decl(&dst, decl); + explain_decl(&dst, decl); + return dst.accum; }