X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/df4db3927748d77c1192c0b103f3ffdfbc5d7fd8..31ac11cc668bb8ecc1317fd2e8bd79b7925bceeb:/src/output.c

diff --git a/src/output.c b/src/output.c
index cb2a568..3b4fa9f 100644
--- a/src/output.c
+++ b/src/output.c
@@ -48,9 +48,13 @@ size_t cdecl__advance(char **buf, size_t *n, size_t amount)
 	return ret + cdecl__advance_(buf, n, rc);
 }
 
-static size_t explain_storage(char *buf, size_t n, unsigned spec)
+static size_t explain_spec(char *buf, size_t n, struct cdecl_declspec *s)
 {
-	switch (spec) {
+	switch (s->type) {
+	/* Function specifiers */
+	case CDECL_FUNC_INLINE:
+		return snprintf(buf, n, "inline");
+	/* Storage-class specifiers */
 	case CDECL_STOR_TYPEDEF:
 		return snprintf(buf, n, "typedef");
 	case CDECL_STOR_EXTERN:
@@ -61,93 +65,83 @@ static size_t explain_storage(char *buf, size_t n, unsigned spec)
 		return snprintf(buf, n, "auto");
 	case CDECL_STOR_REGISTER:
 		return snprintf(buf, n, "register");
+	/* Type qualifiers */
+	case CDECL_QUAL_RESTRICT:
+		return snprintf(buf, n, "restrict");
+	case CDECL_QUAL_VOLATILE:
+		return snprintf(buf, n, "volatile");
+	case CDECL_QUAL_CONST:
+		return snprintf(buf, n, "const");
+	/* Type specifiers */
+	case CDECL_TYPE_VOID:
+		return snprintf(buf, n, "void");
+	case CDECL_TYPE_CHAR:
+		return snprintf(buf, n, "char");
+	case CDECL_TYPE_SHORT:
+		return snprintf(buf, n, "short");
+	case CDECL_TYPE_INT:
+		return snprintf(buf, n, "int");
+	case CDECL_TYPE_LONG:
+		return snprintf(buf, n, "long");
+	case CDECL_TYPE_FLOAT:
+		return snprintf(buf, n, "float");
+	case CDECL_TYPE_DOUBLE:
+		return snprintf(buf, n, "double");
+	case CDECL_TYPE_SIGNED:
+		return snprintf(buf, n, "signed");
+	case CDECL_TYPE_UNSIGNED:
+		return snprintf(buf, n, "unsigned");
+	case CDECL_TYPE_BOOL:
+		return snprintf(buf, n, "_Bool");
+	case CDECL_TYPE_COMPLEX:
+		return snprintf(buf, n, "_Complex");
+	case CDECL_TYPE_IMAGINARY:
+		return snprintf(buf, n, "_Imaginary");
+	case CDECL_TYPE_STRUCT:
+		return snprintf(buf, n, "struct %s", s->ident);
+	case CDECL_TYPE_UNION:
+		return snprintf(buf, n, "union %s", s->ident);
+	case CDECL_TYPE_ENUM:
+		return snprintf(buf, n, "enum %s", s->ident);
+	case CDECL_TYPE_IDENT:
+		return snprintf(buf, n, "%s", s->ident);
 	default:
 		assert(0);
 	}
 }
 
-/* Renders the storage-class and function specifiers in canonical form. */
-size_t cdecl__explain_pre_specs(char *buf, size_t n, struct cdecl_declspec *s)
+/*
+ * Render a list of declaration specifiers.  Only the declaration specifiers
+ * listed in mask, which is the bitwise OR of the desired specifier kinds, are
+ * printed.
+ */
+size_t cdecl__explain_specs(char *buf, size_t n, struct cdecl_declspec *s,
+                                                 unsigned mask)
 {
-	unsigned long funcmap = 0;
 	size_t ret = 0, rc = 0;
 
 	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		switch (cdecl_spec_kind(c)) {
+		switch (cdecl_spec_kind(c) & mask) {
 		case CDECL_SPEC_FUNC:
-			funcmap |= 1ul << (c->type & 0xff);
-			break;
 		case CDECL_SPEC_STOR:
-			/* Valid C declarations have at most one
-			 * storage-class specifier. */
-			rc = explain_storage(buf, n, c->type);
-			break;
+		case CDECL_SPEC_QUAL:
+		case CDECL_SPEC_TYPE:
+			ret += cdecl__advance(&buf, &n, rc);
+			rc = explain_spec(buf, n, c);
 		}
 	}
 
-	if (funcmap & (1ul << (CDECL_FUNC_INLINE & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "inline");
-	}
-
 	return ret + rc;
 }
 
-size_t cdecl__explain_qualifiers(char *buf, size_t n, struct cdecl_declspec *s)
+/* Renders the storage-class and function specifiers in canonical form. */
+size_t cdecl__explain_pre_specs(char *buf, size_t n, struct cdecl_declspec *s)
 {
-	unsigned long qualmap = 0;
-	size_t ret = 0, rc = 0;
-
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		if (cdecl_spec_kind(c) != CDECL_SPEC_QUAL)
-			continue;
-		qualmap |= 1ul << (c->type & 0xff);
-	}
-
-	if (qualmap & (1ul << (CDECL_QUAL_RESTRICT & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "restrict");
-	}
-	if (qualmap & (1ul << (CDECL_QUAL_VOLATILE & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "volatile");
-	}
-	if (qualmap & (1ul << (CDECL_QUAL_CONST & 0xff))) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "const");
-	}
-
-	return ret + rc;
+	return cdecl__explain_specs(buf, n, s, CDECL_SPEC_FUNC|CDECL_SPEC_STOR);
 }
 
 /* Renders the type qualifiers and type specifiers in canonical form. */
 size_t cdecl__explain_post_specs(char *buf, size_t n, struct cdecl_declspec *s)
 {
-	const char *tag = NULL;
-	unsigned long typemap;
-	size_t ret = 0, rc;
-
-	typemap = cdecl__build_typemap(s);
-	if (typemap == -1)
-		return 0;
-
-	for (struct cdecl_declspec *c = s; c; c = c->next) {
-		if (cdecl_spec_kind(c) != CDECL_SPEC_TYPE)
-			continue;
-
-		/* Valid C types have at most one identifier. */
-		if (c->ident)
-			tag = c->ident;
-	}
-
-	rc = cdecl__explain_qualifiers(buf, n, s);
-	ret += cdecl__advance(&buf, &n, rc);
-
-	rc = snprintf(buf, n, "%s", cdecl__explain_typemap(typemap));
-	if (tag) {
-		ret += cdecl__advance(&buf, &n, rc);
-		rc = snprintf(buf, n, "%s", tag);
-	}
-
-	return ret + rc;
+	return cdecl__explain_specs(buf, n, s, CDECL_SPEC_QUAL|CDECL_SPEC_TYPE);
 }