These will be useful for other output routines.
src/validtypes.sed src/parse.stamp src/scan.stamp
include_HEADERS = src/cdecl.h
src/validtypes.sed src/parse.stamp src/scan.stamp
include_HEADERS = src/cdecl.h
-noinst_HEADERS = src/typemap.h src/scan.h src/parse.h
+noinst_HEADERS = src/typemap.h src/output.h src/scan.h src/parse.h
lib_LTLIBRARIES = libcdecl.la
libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_[[:lower:]]'
libcdecl_la_SOURCES = src/scan.c src/parse.c src/parse-decl.c src/typemap.c \
lib_LTLIBRARIES = libcdecl.la
libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_[[:lower:]]'
libcdecl_la_SOURCES = src/scan.c src/parse.c src/parse-decl.c src/typemap.c \
+ src/output.c src/explain.c
bin_PROGRAMS = cdecl99
cdecl99_SOURCES = src/cdecl99.c
bin_PROGRAMS = cdecl99
cdecl99_SOURCES = src/cdecl99.c
#include "cdecl.h"
#include "typemap.h"
#include "cdecl.h"
#include "typemap.h"
-
-static size_t advance_(char **buf, size_t *n, size_t amount)
-{
- if (amount >= *n) {
- *n = 0;
- *buf = 0;
- } else {
- *buf += amount;
- *n -= amount;
- }
-
- return amount;
-}
-
-static size_t advance(char **buf, size_t *n, size_t amount)
-{
- size_t ret, rc;
-
- if (!amount)
- return 0;
-
- ret = advance_(buf, n, amount);
- rc = snprintf(*buf, *n, " ");
- return ret + advance_(buf, n, rc);
-}
static size_t
explain_qualifiers(char *buf, size_t n, struct cdecl_declspec *s)
static size_t
explain_qualifiers(char *buf, size_t n, struct cdecl_declspec *s)
}
if (qualmap & (1ul << (CDECL_QUAL_RESTRICT & 0xff))) {
}
if (qualmap & (1ul << (CDECL_QUAL_RESTRICT & 0xff))) {
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = snprintf(buf, n, "restrict");
}
if (qualmap & (1ul << (CDECL_QUAL_VOLATILE & 0xff))) {
rc = snprintf(buf, n, "restrict");
}
if (qualmap & (1ul << (CDECL_QUAL_VOLATILE & 0xff))) {
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = snprintf(buf, n, "volatile");
}
if (qualmap & (1ul << (CDECL_QUAL_CONST & 0xff))) {
rc = snprintf(buf, n, "volatile");
}
if (qualmap & (1ul << (CDECL_QUAL_CONST & 0xff))) {
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = snprintf(buf, n, "const");
}
rc = snprintf(buf, n, "const");
}
}
rc = explain_qualifiers(buf, n, s);
}
rc = explain_qualifiers(buf, n, s);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = snprintf(buf, n, "%s", cdecl__explain_typemap(typemap));
if (tag) {
rc = snprintf(buf, n, "%s", cdecl__explain_typemap(typemap));
if (tag) {
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = snprintf(buf, n, "%s", tag);
}
rc = snprintf(buf, n, "%s", tag);
}
}
if (funcmap & (1ul << (CDECL_FUNC_INLINE & 0xff))) {
}
if (funcmap & (1ul << (CDECL_FUNC_INLINE & 0xff))) {
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = snprintf(buf, n, "inline");
}
rc = snprintf(buf, n, "inline");
}
case CDECL_DECL_IDENT:
if (top)
rc = snprintf(buf, n, "declare");
case CDECL_DECL_IDENT:
if (top)
rc = snprintf(buf, n, "declare");
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
return ret + snprintf(buf, n, "%s as", d->u.ident);
}
return ret + snprintf(buf, n, "%s as", d->u.ident);
}
size_t ret = 0, rc;
rc = explain_qualifiers(buf, n, p->qualifiers);
size_t ret = 0, rc;
rc = explain_qualifiers(buf, n, p->qualifiers);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
return ret + snprintf(buf, n, "pointer to");
}
return ret + snprintf(buf, n, "pointer to");
}
rc = snprintf(buf, n, "variable-length array");
else
rc = snprintf(buf, n, "array");
rc = snprintf(buf, n, "variable-length array");
else
rc = snprintf(buf, n, "array");
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
if (a->vla) {
rc = snprintf(buf, n, "%s", a->vla);
if (a->vla) {
rc = snprintf(buf, n, "%s", a->vla);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
} else if (a->length) {
rc = snprintf(buf, n, "%ju", a->length);
} else if (a->length) {
rc = snprintf(buf, n, "%ju", a->length);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
}
return ret + snprintf(buf, n, "of");
}
return ret + snprintf(buf, n, "of");
size_t ret = 0, rc;
rc = explain_prologue(buf, n, decl->declarators, top);
size_t ret = 0, rc;
rc = explain_prologue(buf, n, decl->declarators, top);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = explain_pre_specs(buf, n, decl->specifiers);
rc = explain_pre_specs(buf, n, decl->specifiers);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
rc = explain_declarators(buf, n, decl->declarators);
rc = explain_declarators(buf, n, decl->declarators);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
return ret + explain_post_specs(buf, n, decl->specifiers);
}
return ret + explain_post_specs(buf, n, decl->specifiers);
}
size_t ret = 0, rc = 0;
rc = snprintf(buf, n, "function");
size_t ret = 0, rc = 0;
rc = snprintf(buf, n, "function");
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
if (f->parameters) {
rc = snprintf(buf, n, "(");
if (f->parameters) {
rc = snprintf(buf, n, "(");
- ret += advance_(&buf, &n, rc);
+ ret += cdecl__advance_(&buf, &n, rc);
for (struct cdecl *p = f->parameters; p; p = p->next) {
rc = explain_decl(buf, n, p, false);
for (struct cdecl *p = f->parameters; p; p = p->next) {
rc = explain_decl(buf, n, p, false);
- ret += advance_(&buf, &n, rc);
+ ret += cdecl__advance_(&buf, &n, rc);
if (p->next)
rc = snprintf(buf, n, ",");
if (p->next)
rc = snprintf(buf, n, ",");
rc = snprintf(buf, n, ", ...)");
else
rc = snprintf(buf, n, ")");
rc = snprintf(buf, n, ", ...)");
else
rc = snprintf(buf, n, ")");
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
return 0;
rc = explain_declarators(buf, n, d->child);
return 0;
rc = explain_declarators(buf, n, d->child);
- ret += advance(&buf, &n, rc);
+ ret += cdecl__advance(&buf, &n, rc);
switch (d->type) {
case CDECL_DECL_POINTER:
switch (d->type) {
case CDECL_DECL_POINTER:
--- /dev/null
+#include <stdio.h>
+#include "output.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;
+ }
+
+ 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);
+}
--- /dev/null
+#ifndef CDECL_OUTPUT_H_
+#define CDECL_OUTPUT_H_
+
+#include <stddef.h>
+
+size_t cdecl__advance_(char **buf, size_t *n, size_t amount);
+size_t cdecl__advance(char **buf, size_t *n, size_t amount);
+
+#endif