From 7ec517ce4d3b660e64133c2e67ef7686daec74e2 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 22 Jun 2023 22:00:34 -0400 Subject: [PATCH] libcdecl: Rework specifier output logic. With both the explain and declare code paths using cdecl__emit, we can give the same treatment to cdecl__explain_specs (now called cdecl__emit_specs) to simplify things a bit. This removes the last caller of cdecl__advance, so we can remove that function (and use this better name for cdecl__advance_). --- src/cdecl-internal.h | 6 +++--- src/declare.c | 16 +++++++-------- src/explain.c | 13 +++++------- src/output.c | 49 ++++++++++++++++++-------------------------- t/normalize.c | 7 +++++-- 5 files changed, 40 insertions(+), 51 deletions(-) diff --git a/src/cdecl-internal.h b/src/cdecl-internal.h index 0008c33..e0052bd 100644 --- a/src/cdecl-internal.h +++ b/src/cdecl-internal.h @@ -40,11 +40,11 @@ void cdecl__errmsg(unsigned msg); struct cdecl_declspec *cdecl__normalize_specs(struct cdecl_declspec *specs); -size_t cdecl__advance_(char **buf, size_t *n, size_t amount); size_t cdecl__advance(char **buf, size_t *n, size_t amount); -size_t cdecl__explain_specs(char *buf, size_t n, struct cdecl_declspec *s, - unsigned mask); size_t cdecl__emit(char **dst, size_t *dstlen, const char *src); +size_t cdecl__emit_specs(char **dst, size_t *dstlen, + struct cdecl_declspec *s, + unsigned mask); #endif diff --git a/src/declare.c b/src/declare.c index 8f7d607..318ccac 100644 --- a/src/declare.c +++ b/src/declare.c @@ -30,13 +30,11 @@ declare_declarator(char **dst, size_t *dstlen, struct cdecl_declarator *d); static size_t declare_decl(char **dst, size_t *dstlen, struct cdecl *decl) { - size_t ret, rc; + size_t ret; - rc = cdecl__explain_specs(*dst, *dstlen, decl->specifiers, -1); + ret = cdecl__emit_specs(dst, dstlen, decl->specifiers, -1); if (decl->declarators->type != CDECL_DECL_NULL) - ret = cdecl__advance(dst, dstlen, rc); - else - ret = cdecl__advance_(dst, dstlen, rc); + ret += cdecl__emit(dst, dstlen, " "); return ret + declare_declarator(dst, dstlen, decl->declarators); } @@ -63,11 +61,11 @@ declare_pointer(char **dst, size_t *dstlen, struct cdecl_pointer *p) struct cdecl_declspec *q = p->qualifiers; if (q) { - size_t ret, rc; + size_t ret; ret = cdecl__emit(dst, dstlen, "* "); - rc = cdecl__explain_specs(*dst, *dstlen, q, -1); - return ret + cdecl__advance(dst, dstlen, rc); + ret += cdecl__emit_specs(dst, dstlen, q, -1); + return ret + cdecl__emit(dst, dstlen, " "); } return cdecl__emit(dst, dstlen, "*"); @@ -84,7 +82,7 @@ static size_t declare_array(char **dst, size_t *dstlen, struct cdecl_array *a) ret += cdecl__emit(dst, dstlen, s); } else { size_t rc = snprintf(*dst, *dstlen, "%.0" PRIuMAX, a->length); - ret += cdecl__advance_(dst, dstlen, rc); + ret += cdecl__advance(dst, dstlen, rc); } return ret + cdecl__emit(dst, dstlen, "]"); diff --git a/src/explain.c b/src/explain.c index 4deadac..fa34095 100644 --- a/src/explain.c +++ b/src/explain.c @@ -29,19 +29,16 @@ static size_t explain_specs(char **dst, size_t *dstlen, struct cdecl_declspec *s, unsigned mask) { - size_t rc; + size_t ret; - rc = cdecl__explain_specs(*dst, *dstlen, s, mask); - return cdecl__advance(dst, dstlen, rc); + ret = cdecl__emit_specs(dst, dstlen, s, mask); + return ret + cdecl__emit(dst, dstlen, " " + !ret); } static size_t explain_specs_post(char **dst, size_t *dstlen, struct cdecl_declspec *s) { - size_t rc; - - rc = cdecl__explain_specs(*dst, *dstlen, s, POST_SPECS); - return cdecl__advance_(dst, dstlen, rc); + return cdecl__emit_specs(dst, dstlen, s, POST_SPECS); } /* @@ -95,7 +92,7 @@ explain_array(char **dst, size_t *dstlen, struct cdecl_array *a) ret += rc; } else { rc = snprintf(*dst, *dstlen, "%.0" PRIuMAX, a->length); - ret += cdecl__advance_(dst, dstlen, rc); + ret += cdecl__advance(dst, dstlen, rc); } return ret + cdecl__emit(dst, dstlen, " of " + !rc); diff --git a/src/output.c b/src/output.c index d2359eb..0bc5023 100644 --- a/src/output.c +++ b/src/output.c @@ -22,7 +22,9 @@ #include "cdecl.h" #include "cdecl-internal.h" -size_t cdecl__advance_(char **buf, size_t *n, size_t amount) +#include "specstr.h" + +size_t cdecl__advance(char **buf, size_t *n, size_t amount) { if (amount >= *n) { *n = 0; @@ -35,35 +37,23 @@ size_t cdecl__advance_(char **buf, size_t *n, size_t amount) return amount; } -size_t cdecl__advance(char **buf, size_t *n, size_t amount) -{ - size_t ret, rc; - - if (!amount) - return 0; - - ret = cdecl__advance_(buf, n, amount); - rc = snprintf(*buf, *n, " "); - return ret + cdecl__advance_(buf, n, rc); -} - size_t cdecl__emit(char **dst, size_t *dstlen, const char *src) { size_t rc = snprintf(*dst, *dstlen, "%s", src); - return cdecl__advance_(dst, dstlen, rc); + return cdecl__advance(dst, dstlen, rc); } -#include "specstr.h" - -static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s) +static size_t explain_spec(char **dst, size_t *dstlen, struct cdecl_declspec *s) { - const char *keyword = spec_string(s->type); + size_t ret; + + ret = cdecl__emit(dst, dstlen, spec_string(s->type)); + if (s->ident) { + ret += cdecl__emit(dst, dstlen, " " + !ret); + ret += cdecl__emit(dst, dstlen, s->ident); + } - 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); + return ret; } /* @@ -71,18 +61,19 @@ static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s) * 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) +size_t cdecl__emit_specs(char **dst, size_t *dstlen, + struct cdecl_declspec *s, + unsigned mask) { - size_t ret = 0, rc = 0; + size_t ret = 0; for (; s; s = s->next) { if (!(s->type & mask)) continue; - ret += cdecl__advance(&buf, &n, rc); - rc = explain_spec(buf, n, s); + ret += cdecl__emit(dst, dstlen, " " + !ret); + ret += explain_spec(dst, dstlen, s); } - return ret + rc; + return ret; } diff --git a/t/normalize.c b/t/normalize.c index bb5829f..9c54d02 100644 --- a/t/normalize.c +++ b/t/normalize.c @@ -1,6 +1,6 @@ /* * Helper application to test normalization of declaration specifiers. - * Copyright © 2021 Nick Bowler + * Copyright © 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 @@ -108,8 +108,11 @@ int do_normalize(char *line, size_t n) line = malloc_nofail(n); line[0] = 0; if (specs) { + char *tmp_line = line; + size_t tmp_n = n; + specs = cdecl__normalize_specs(specs); - cdecl__explain_specs(line, n, specs, -1); + cdecl__emit_specs(&tmp_line, &tmp_n, specs, -1); } printf("%s\n", line); free(line); -- 2.43.2