libcdecl: Merge both parser function implementations.

[cdecl99.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 27921abb70b9bd6339cfc510af25dec46d826a5b..4590a5cfc60b2fb9c3d1bdead751da7d37b25d9b 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -24,15 +24,15 @@
 
 #include "specstr.h"
 
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
 size_t cdecl__advance(struct output_state *dst, size_t amount)
 {
-       if (amount >= dst->dstlen) {
-               dst->dstlen = 0;
-               dst->dst    = 0;
-       } else {
-               dst->dst    += amount;
-               dst->dstlen -= amount;
-       }
+       size_t x = MIN(amount, dst->dstlen);
+
+       dst->dst    += x;
+       dst->dstlen -= x;
+       dst->accum  += amount;
 
        return amount;
 }
@@ -43,17 +43,15 @@ size_t cdecl__emit(struct output_state *dst, const char *src)
        return cdecl__advance(dst, rc);
 }
 
-static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
+static void explain_spec(struct output_state *dst, struct cdecl_declspec *s)
 {
-       size_t ret;
+       size_t rc;
 
-       ret = cdecl__emit(dst, spec_string(s->type));
+       rc = cdecl__emit(dst, spec_string(s->type));
        if (s->ident) {
-               ret += cdecl__emit(dst, " " + !ret);
-               ret += cdecl__emit(dst, s->ident);
+               cdecl__emit(dst, " " + !rc);
+               cdecl__emit(dst, s->ident);
        }
-
-       return ret;
 }
 
 /*
@@ -61,19 +59,21 @@ static size_t explain_spec(struct output_state *dst, struct cdecl_declspec *s)
  * listed in mask, which is the bitwise OR of the desired specifier kinds, are
  * printed.
  */
-size_t cdecl__emit_specs(struct output_state *dst,
-                         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;
+       const char *sep = " ";
+       int empty = 1;
 
        for (; s; s = s->next) {
                if (!(s->type & mask))
                        continue;
 
-               ret += cdecl__emit(dst, " " + !ret);
-               ret += explain_spec(dst, s);
+               cdecl__emit(dst, sep + empty);
+               explain_spec(dst, s);
+               empty = 0;
        }
 
-       return ret;
+       return sep + empty;
 }