X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/41d0e2f8f2dc0ec50526ff6e4b8ff12936d1f90e..6f166c6c36bda84191ed916a52b311ab417a4890:/src/explain.c

diff --git a/src/explain.c b/src/explain.c
index 0d9c957..fe3ed7d 100644
--- a/src/explain.c
+++ b/src/explain.c
@@ -1,6 +1,6 @@
 /*
  *  Render C declarations as English.
- *  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
@@ -27,32 +27,26 @@
 #include "cdecl.h"
 #include "cdecl-internal.h"
 
-/*
- * Renders the start of the thing being declared.  If top is true, print
- * the "declare" or "type" keywords at the front, as appropriate.
- */
-static size_t
-explain_prologue(char *buf, size_t n, struct cdecl_declarator *d, bool top)
+static size_t explain_pre_specs(char *buf, size_t n, struct cdecl_declspec *s)
 {
-	size_t ret = 0, rc = 0;
+	return cdecl__explain_specs(buf, n, s, CDECL_SPEC_FUNC|CDECL_SPEC_STOR);
+}
 
-	while (d) {
-		switch (d->type) {
-		case CDECL_DECL_NULL:
-			if (top)
-				return snprintf(buf, n, "type");
-			return 0;
-		case CDECL_DECL_IDENT:
-			if (top)
-				rc = snprintf(buf, n, "declare");
-			ret += cdecl__advance(&buf, &n, rc);
-			return ret + snprintf(buf, n, "%s as", d->u.ident);
-		}
+static size_t 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);
+}
 
+static size_t
+explain_name(char *buf, size_t n, struct cdecl_declarator *d)
+{
+	while (d->child)
 		d = d->child;
-	}
 
-	assert(0);
+	if (d->type != CDECL_DECL_IDENT)
+		return 0;
+
+	return snprintf(buf, n, "%s as", d->u.ident);
 }
 
 static size_t
@@ -91,20 +85,20 @@ explain_array(char *buf, size_t n, struct cdecl_array *a)
 static size_t
 explain_declarators(char *buf, size_t n, struct cdecl_declarator *decl);
 
-static size_t explain_decl(char *buf, size_t n, struct cdecl *decl, bool top)
+static size_t explain_decl(char *buf, size_t n, struct cdecl *decl)
 {
 	size_t ret = 0, rc;
 
-	rc = explain_prologue(buf, n, decl->declarators, top);
+	rc = explain_name(buf, n, decl->declarators);
 	ret += cdecl__advance(&buf, &n, rc);
 
-	rc = cdecl__explain_pre_specs(buf, n, decl->specifiers);
+	rc = explain_pre_specs(buf, n, decl->specifiers);
 	ret += cdecl__advance(&buf, &n, rc);
 
 	rc = explain_declarators(buf, n, decl->declarators);
 	ret += cdecl__advance(&buf, &n, rc);
 
-	return ret + cdecl__explain_post_specs(buf, n, decl->specifiers);
+	return ret + explain_post_specs(buf, n, decl->specifiers);
 }
 
 static size_t explain_function(char *buf, size_t n, struct cdecl_function *f)
@@ -119,7 +113,7 @@ static size_t explain_function(char *buf, size_t n, struct cdecl_function *f)
 		ret += cdecl__advance_(&buf, &n, rc);
 
 		for (struct cdecl *p = f->parameters; p; p = p->next) {
-			rc = explain_decl(buf, n, p, false);
+			rc = explain_decl(buf, n, p);
 			ret += cdecl__advance_(&buf, &n, rc);
 
 			if (p->next)
@@ -160,5 +154,13 @@ explain_declarators(char *buf, size_t n, struct cdecl_declarator *d)
 
 size_t cdecl_explain(char *buf, size_t n, struct cdecl *decl)
 {
-	return explain_decl(buf, n, decl, true);
+	size_t ret, rc;
+
+	if (cdecl_is_abstract(decl->declarators))
+		rc = snprintf(buf, n, "type");
+	else
+		rc = snprintf(buf, n, "declare");
+	ret = cdecl__advance(&buf, &n, rc);
+
+	return ret + explain_decl(buf, n, decl);
 }