/*
* Render C declarations.
- * 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
*/
#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 **dst, size_t *dstlen, struct cdecl_declarator *d);
+static void
+declare_declarator(struct output_state *dst, struct cdecl_declarator *d);
-static size_t declare_decl(char **dst, size_t *dstlen, struct cdecl *decl)
+static void declare_decl(struct output_state *dst, struct cdecl *decl)
{
- size_t ret, rc;
+ struct cdecl_declarator *d = decl->declarators;
+ const char *sep;
- rc = cdecl__explain_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);
+ sep = cdecl__emit_specs(dst, decl->specifiers, -1);
+ if (d->type != CDECL_DECL_NULL)
+ cdecl__emit(dst, sep);
- return ret + declare_declarator(dst, dstlen, decl->declarators);
+ declare_declarator(dst, d);
}
-static size_t
-declare_postfix_child(char **dst, size_t *dstlen, struct cdecl_declarator *d)
+static void
+declare_postfix_child(struct output_state *dst, struct cdecl_declarator *d)
{
- size_t ret = 0;
+ bool need_parens = (d->type == CDECL_DECL_POINTER);
- if (d->type == CDECL_DECL_POINTER)
- ret += cdecl__emit(dst, dstlen, "(");
-
- ret += declare_declarator(dst, dstlen, d);
-
- if (d->type == CDECL_DECL_POINTER)
- ret += cdecl__emit(dst, dstlen, ")");
-
- return ret;
+ if (need_parens) cdecl__emit(dst, "(");
+ declare_declarator(dst, d);
+ if (need_parens) cdecl__emit(dst, ")");
}
-static size_t
-declare_pointer(char **dst, size_t *dstlen, struct cdecl_pointer *p)
+static void declare_pointer(struct output_state *dst, struct cdecl_declarator *d)
{
- struct cdecl_declspec *q = p->qualifiers;
+ struct cdecl_declspec *q = d->u.pointer.qualifiers;
if (q) {
- size_t ret, rc;
+ const char *sep;
- ret = cdecl__emit(dst, dstlen, "* ");
- rc = cdecl__explain_specs(*dst, *dstlen, q, -1);
- return ret + cdecl__advance(dst, dstlen, rc);
+ cdecl__emit(dst, "* ");
+ sep = cdecl__emit_specs(dst, q, -1);
+ if (d->child->type != CDECL_DECL_NULL)
+ cdecl__emit(dst, sep);
+ } else {
+ cdecl__emit(dst, "*");
}
-
- return cdecl__emit(dst, dstlen, "*");
}
-static size_t declare_array(char **dst, size_t *dstlen, struct cdecl_array *a)
+static void declare_array(struct output_state *dst, struct cdecl_array *a)
{
- size_t ret;
-
- ret = cdecl__emit(dst, dstlen, "[");
+ cdecl__emit(dst, "[");
if (a->vla) {
const char *s = a->vla[0] ? a->vla : "*";
- ret += cdecl__emit(dst, dstlen, s);
+ cdecl__emit(dst, s);
} else {
- size_t rc = snprintf(*dst, *dstlen, "%.0" PRIuMAX, a->length);
- ret += cdecl__advance_(dst, dstlen, rc);
+ cdecl__emit_uint(dst, a->length);
}
- return ret + cdecl__emit(dst, dstlen, "]");
+ cdecl__emit(dst, "]");
}
-static size_t
-declare_function(char **dst, size_t *dstlen, struct cdecl_function *f)
+static void
+declare_function(struct output_state *dst, struct cdecl_function *f)
{
struct cdecl *p;
- size_t ret;
- ret = cdecl__emit(dst, dstlen, "(");
+ cdecl__emit(dst, "(");
for (p = f->parameters; p; p = p->next) {
- ret += declare_decl(dst, dstlen, p);
+ declare_decl(dst, p);
if (p->next)
- ret += cdecl__emit(dst, dstlen, ", ");
+ cdecl__emit(dst, ", ");
else if (f->variadic)
- ret += cdecl__emit(dst, dstlen, ", ...");
+ cdecl__emit(dst, ", ...");
}
- return ret + cdecl__emit(dst, dstlen, ")");
+ cdecl__emit(dst, ")");
}
-static size_t
-declare_declarator(char **dst, size_t *dstlen, struct cdecl_declarator *d)
+static void
+declare_declarator(struct output_state *dst, struct cdecl_declarator *d)
{
- size_t ret = 0;
-
for (; d; d = d->child) {
switch (d->type) {
case CDECL_DECL_NULL:
break;
case CDECL_DECL_IDENT:
- ret += cdecl__emit(dst, dstlen, d->u.ident);
+ cdecl__emit(dst, d->u.ident);
break;
case CDECL_DECL_POINTER:
- ret += declare_pointer(dst, dstlen, &d->u.pointer);
+ declare_pointer(dst, d);
break;
/*
* Arrays and functions are special: since they are postfix,
* "bodies".
*/
case CDECL_DECL_ARRAY:
- ret += declare_postfix_child(dst, dstlen, d->child);
- return ret + declare_array(dst, dstlen, &d->u.array);
+ declare_postfix_child(dst, d->child);
+ declare_array(dst, &d->u.array);
+ return;
case CDECL_DECL_FUNCTION:
- ret += declare_postfix_child(dst, dstlen, d->child);
- return ret + declare_function(dst, dstlen, &d->u.function);
- default:
- assert(0);
+ declare_postfix_child(dst, d->child);
+ declare_function(dst, &d->u.function);
+ return;
}
}
-
- 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;
}
projects / cdecl99.git / blobdiff