X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/8e320b09c58bbf947dbdc5e0019bdaad478591fe..d349b9bb3fde8fc1d1222d5b7ac8dbbaf6dee230:/src/declare.c

diff --git a/src/declare.c b/src/declare.c
index 3b0b700..172c0a9 100644
--- a/src/declare.c
+++ b/src/declare.c
@@ -19,129 +19,96 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <inttypes.h>
 #include <assert.h>
 
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
-static size_t
-declare_declarator(char *buf, size_t n, struct cdecl_declarator *d);
+static void
+declare_declarator(struct output_state *dst, struct cdecl_declarator *d);
 
-static size_t declare_decl(char *buf, size_t n, struct cdecl *decl)
+static void declare_decl(struct output_state *dst, struct cdecl *decl)
 {
-	size_t ret = 0, rc;
+	const char *sep;
 
-	rc = cdecl__explain_specs(buf, n, decl->specifiers, -1);
+	sep = cdecl__emit_specs(dst, decl->specifiers, -1);
 	if (decl->declarators->type != CDECL_DECL_NULL)
-		ret += cdecl__advance(&buf, &n, rc);
-	else
-		ret += cdecl__advance_(&buf, &n, rc);
+		cdecl__emit(dst, sep);
 
-	return ret + declare_declarator(buf, n, decl->declarators);
+	declare_declarator(dst, decl->declarators);
 }
 
-static size_t
-declare_postfix_child(char *buf, size_t n, struct cdecl_declarator *d)
+static void
+declare_postfix_child(struct output_state *dst, struct cdecl_declarator *d)
 {
-	size_t ret = 0, rc;
+	if (d->type == CDECL_DECL_POINTER)
+		cdecl__emit(dst, "(");
 
-	if (d->type == CDECL_DECL_POINTER) {
-		rc = snprintf(buf, n, "(");
-		ret += cdecl__advance_(&buf, &n, rc);
-	}
-
-	rc = declare_declarator(buf, n, d);
-	ret += cdecl__advance_(&buf, &n, rc);
-
-	if (d->type == CDECL_DECL_POINTER) {
-		rc = snprintf(buf, n, ")");
-		ret += cdecl__advance_(&buf, &n, rc);
-	}
-
-	return ret;
-}
-
-static size_t declare_pointer(char *buf, size_t n, struct cdecl_pointer *p)
-{
-	size_t ret = 0, rc;
-
-	rc = snprintf(buf, n, "*");
-	if (p->qualifiers)
-		ret += cdecl__advance(&buf, &n, rc);
-	else
-		ret += cdecl__advance_(&buf, &n, rc);
+	declare_declarator(dst, d);
 
-	rc = cdecl__explain_specs(buf, n, p->qualifiers, CDECL_SPEC_QUAL);
-	return ret + rc;
+	if (d->type == CDECL_DECL_POINTER)
+		cdecl__emit(dst, ")");
 }
 
-static bool pointer_needs_space(struct cdecl_declarator *d)
+static void declare_pointer(struct output_state *dst, struct cdecl_pointer *p)
 {
-	assert(d->type == CDECL_DECL_POINTER);
-
-	if (d->u.pointer.qualifiers)
-		return d->child->type != CDECL_DECL_NULL;
-
-	return false;
+	struct cdecl_declspec *q = p->qualifiers;
+
+	if (q) {
+		cdecl__emit(dst, "* ");
+		cdecl__emit_specs(dst, q, -1);
+		cdecl__emit(dst, " ");
+	} else {
+		cdecl__emit(dst, "*");
+	}
 }
 
-static size_t declare_array(char *buf, size_t n, struct cdecl_array *a)
+static void declare_array(struct output_state *dst, struct cdecl_array *a)
 {
-	size_t ret = 0, rc;
+	cdecl__emit(dst, "[");
 
-	rc = snprintf(buf, n, "[");
-	ret += cdecl__advance_(&buf, &n, rc);
-
-	if (a->vla)
-		rc = snprintf(buf, n, "%s", a->vla[0] ? a->vla : "*");
-	else
-		rc = snprintf(buf, n, "%.0ju", a->length);
-	ret += cdecl__advance_(&buf, &n, rc);
+	if (a->vla) {
+		const char *s = a->vla[0] ? a->vla : "*";
+		cdecl__emit(dst, s);
+	} else {
+		cdecl__emit_uint(dst, a->length);
+	}
 
-	return ret + snprintf(buf, n, "]");
+	cdecl__emit(dst, "]");
 }
 
-static size_t declare_function(char *buf, size_t n, struct cdecl_function *f)
+static void
+declare_function(struct output_state *dst, struct cdecl_function *f)
 {
-	size_t ret = 0, rc;
+	struct cdecl *p;
 
-	rc = snprintf(buf, n, "(");
-	ret += cdecl__advance_(&buf, &n, rc);
+	cdecl__emit(dst, "(");
 
-	for (struct cdecl *p = f->parameters; p; p = p->next) {
-		rc = declare_decl(buf, n, p);
-		ret += cdecl__advance_(&buf, &n, rc);
+	for (p = f->parameters; p; p = p->next) {
+		declare_decl(dst, p);
 
-		rc = 0;
 		if (p->next)
-			rc = snprintf(buf, n, ", ");
+			cdecl__emit(dst, ", ");
 		else if (f->variadic)
-			rc = snprintf(buf, n, ", ...");
-		ret += cdecl__advance_(&buf, &n, rc);
+			cdecl__emit(dst, ", ...");
 	}
 
-	return ret + snprintf(buf, n, ")");
+	cdecl__emit(dst, ")");
 }
 
-static size_t
-declare_declarator(char *buf, size_t n, struct cdecl_declarator *d)
+static void
+declare_declarator(struct output_state *dst, struct cdecl_declarator *d)
 {
-	size_t ret = 0, rc;
-
 	for (; d; d = d->child) {
 		switch (d->type) {
 		case CDECL_DECL_NULL:
 			break;
 		case CDECL_DECL_IDENT:
-			rc = snprintf(buf, n, "%s", d->u.ident);
-			ret += cdecl__advance_(&buf, &n, rc);
+			cdecl__emit(dst, d->u.ident);
 			break;
 		case CDECL_DECL_POINTER:
-			rc = declare_pointer(buf, n, &d->u.pointer);
-			if (pointer_needs_space(d))
-				ret += cdecl__advance(&buf, &n, rc);
-			else
-				ret += cdecl__advance_(&buf, &n, rc);
+			declare_pointer(dst, &d->u.pointer);
 			break;
 		/*
 		 * Arrays and functions are special: since they are postfix,
@@ -149,22 +116,24 @@ declare_declarator(char *buf, size_t n, struct cdecl_declarator *d)
 		 * "bodies".
 		 */
 		case CDECL_DECL_ARRAY:
-			rc = declare_postfix_child(buf, n, d->child);
-			ret += cdecl__advance_(&buf, &n, rc);
-			return ret + declare_array(buf, n, &d->u.array);
+			declare_postfix_child(dst, d->child);
+			declare_array(dst, &d->u.array);
+			return;
 		case CDECL_DECL_FUNCTION:
-			rc = declare_postfix_child(buf, n, d->child);
-			ret += cdecl__advance_(&buf, &n, rc);
-			return ret + declare_function(buf, n, &d->u.function);
+			declare_postfix_child(dst, d->child);
+			declare_function(dst, &d->u.function);
+			return;
 		default:
 			assert(0);
 		}
 	}
-
-	return ret;
 }
 
 size_t cdecl_declare(char *buf, size_t n, struct cdecl *decl)
 {
-	return declare_decl(buf, n, decl);
+	struct output_state dst = { buf, n };
+
+	declare_decl(&dst, decl);
+
+	return dst.accum;
 }