libcdecl: Don't propagate specifier lists more than once.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 22fc2e9d0e221746a4ba2fef93de0051ac5153a6..62c9c8f9bd0839330de432fde4ea79dac5d9f947 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,6 +1,6 @@
 /*
  *  Helper functions for outputting text.
- *  Copyright © 2011, 2021 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
@@ -22,49 +22,37 @@
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
-size_t cdecl__advance_(char **buf, size_t *n, size_t amount)
-{
-       if (amount >= *n) {
-               *n   = 0;
-               *buf = 0;
-       } else {
-               *buf += amount;
-               *n   -= amount;
-       }
+#include "parse.h"
+#include "specstr.h"
 
-       return amount;
-}
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
 
-size_t cdecl__advance(char **buf, size_t *n, size_t amount)
+size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-       size_t ret, rc;
+       size_t x = MIN(amount, dst->dstlen);
 
-       if (!amount)
-               return 0;
+       dst->dst    += x;
+       dst->dstlen -= x;
+       dst->accum  += amount;
 
-       ret = cdecl__advance_(buf, n, amount);
-       rc = snprintf(*buf, *n, " ");
-       return ret + cdecl__advance_(buf, n, rc);
+       return amount;
 }
 
-static const char *explain_spec_simple(struct cdecl_declspec *s)
+size_t cdecl__emit(struct output_state *dst, const char *src)
 {
-       switch (s->type) {
-#      include "namespecs.h"
-       }
-
-       assert(0);
+       size_t rc = snprintf(dst->dst, dst->dstlen, "%s", src);
+       return cdecl__advance(dst, rc);
 }
 
-static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
+static void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
 {
-       const char *keyword = explain_spec_simple(s);
+       size_t rc;
 
-       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);
+       rc = cdecl__emit(dst, spec_string(s->type));
+       if (s->ident) {
+               cdecl__emit(dst, " " + !rc);
+               cdecl__emit(dst, s->ident);
+       }
 }
 
 /*
@@ -72,33 +60,21 @@ 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)
+const char *cdecl__emit_specs(struct output_state *dst,
+                              struct cdecl_declspec *s,
+                              unsigned mask)
 {
-       size_t ret = 0, rc = 0;
+       const char *sep = " ";
+       int empty = 1;
 
-       for (struct cdecl_declspec *c = s; c; c = c->next) {
-               switch (cdecl_spec_kind(c) & mask) {
-               case CDECL_SPEC_FUNC:
-               case CDECL_SPEC_STOR:
-               case CDECL_SPEC_QUAL:
-               case CDECL_SPEC_TYPE:
-                       ret += cdecl__advance(&buf, &n, rc);
-                       rc = explain_spec(buf, n, c);
-               }
-       }
-
-       return ret + rc;
-}
+       for (; s; s = s->next) {
+               if (!(s->type & mask))
+                       continue;
 
-/* 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)
-{
-       return cdecl__explain_specs(buf, n, s, CDECL_SPEC_FUNC|CDECL_SPEC_STOR);
-}
+               cdecl__emit(dst, sep + empty);
+               explain_spec(dst, s);
+               empty = 0;
+       }
 
-/* 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)
-{
-       return cdecl__explain_specs(buf, n, s, CDECL_SPEC_QUAL|CDECL_SPEC_TYPE);
+       return sep + empty;
 }