X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/0c61f9637a469ac7a28b5a329551b03e6ad14d62..df005d9975b81f8e310761ebed0afbabd40acfe3:/src/parse-decl.c

diff --git a/src/parse-decl.c b/src/parse-decl.c
index 2757703..f00442d 100644
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -26,6 +26,62 @@
 #include "parse.h"
 #include "scan.h"
 
+/*
+ * We can represent type specifiers as a bitmap, which gives us a finite
+ * list of acceptable bitmap values according to the C standard.  However,
+ * the "long" specifier is allowed to occur more than once, but only at most
+ * 2 times.  Treat it as a special case, assigning an unused bit to represent
+ * the second long.
+ */
+#define MAP_LLONG_BIT 31
+#define MAP_LONG_BIT (CDECL_TYPE_LONG-CDECL_SPEC_TYPE)
+#define CDECL_TYPE_LLONG (CDECL_SPEC_TYPE+MAP_LLONG_BIT)
+
+#include "typemap.h"
+
+/*
+ * Convert the declaration specifiers to a bitmap with each bit
+ * corresponding to one specific type specifier.
+ */
+static int valid_typespec(struct cdecl_declspec *s)
+{
+	unsigned long map = 0;
+
+	for (struct cdecl_declspec *c = s; c; c = c->next) {
+		unsigned long bit;
+
+		if (cdecl_spec_kind(c) != CDECL_SPEC_TYPE)
+			continue;
+
+		bit = c->type - CDECL_SPEC_TYPE;
+		assert(bit < MAP_LLONG_BIT);
+		bit = 1ul << bit;
+
+		/* "long" special case */
+		if ((map & bit) == 1ul << MAP_LONG_BIT)
+			bit = 1ul << MAP_LLONG_BIT;
+
+		if (map & bit) {
+			if (bit == 1ul << MAP_LLONG_BIT)
+				cdecl__err(CDECL_EBADTYPE, _("too many long specifiers"));
+			else
+				cdecl__err(CDECL_EBADTYPE, _("duplicate type specifier"));
+			return false;
+		}
+		map |= bit;
+	}
+
+	if (typemap_is_valid(map))
+		return true;
+
+	if (map == 0)
+		cdecl__err(CDECL_EBADTYPE, _("no type specified"));
+	else
+		cdecl__err(CDECL_EBADTYPE, _("invalid type specified"));
+
+	return false;
+}
+
 /*
  * Verify the declaration specifiers of a declaration.  If top is true, treat
  * this as a top-level declaration.  Otherwise, treat this as a function
@@ -37,10 +93,8 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 	struct cdecl_declarator *d   = decl->declarators;
 	bool abstract = cdecl_is_abstract(d);
 	unsigned num_storage = 0;
-	unsigned long typemap;
 
-	typemap = cdecl__build_typemap(specs);
-	if (typemap == -1)
+	if (!valid_typespec(specs))
 		return false;
 
 	for (struct cdecl_declspec *c = specs; c; c = c->next) {
@@ -49,23 +103,23 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 			if (c->type == CDECL_TYPE_VOID &&
 			    (d->type == CDECL_DECL_IDENT
 		             || d->type == CDECL_DECL_ARRAY)) {
-				fprintf(stderr, "invalid declaration of type void\n");
+				cdecl__err(CDECL_EBADTYPE, _("invalid declaration of type void"));
 				return false;
 			}
 			continue;
 		case CDECL_SPEC_STOR:
 			if (top && abstract) {
-				fprintf(stderr, "type names cannot have storage-class specifiers\n");
+				cdecl__err(CDECL_EBADSTOR, _("type names cannot have storage-class specifiers"));
 				return false;
 			}
 
 			if (!top && c->type != CDECL_STOR_REGISTER) {
-				fprintf(stderr, "function parameters may only have register storage\n");
+				cdecl__err(CDECL_EBADSTOR, _("function parameters may only have register storage"));
 				return false;
 			}
 
 			if (++num_storage > 1) {
-				fprintf(stderr, "too many storage-class specifiers\n");
+				cdecl__err(CDECL_EBADSTOR, _("too many storage-class specifiers"));
 				return false;
 			}
 			break;
@@ -75,18 +129,18 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 			 * pointer qualifier list, which isn't checked here.
 			 */
 			if (c->type == CDECL_QUAL_RESTRICT) {
-				fprintf(stderr, "only pointer types can be restrict-qualified.\n");
+				cdecl__err(CDECL_EBADQUAL, _("only pointer types can be restrict-qualified"));
 				return false;
 			}
 			break;
 		case CDECL_SPEC_FUNC:
 			if (abstract) {
-				fprintf(stderr, "type names cannot have function specifiers\n");
+				cdecl__err(CDECL_ENOTFUNC, _("type names cannot have function specifiers"));
 				return false;
 			}
 
 			if (!top || d->type != CDECL_DECL_FUNCTION) {
-				fprintf(stderr, "only function declarations may have function specifiers.\n");
+				cdecl__err(CDECL_ENOTFUNC, _("only function declarations can have function specifiers"));
 				return false;
 			}
 			break;
@@ -226,7 +280,7 @@ reduce_parentheses(struct cdecl_declarator **p, struct cdecl_declarator *d)
 		}
 
 		if (d->child->type != CDECL_DECL_NULL) {
-			fprintf(stderr, "invalid function parameter\n");
+			cdecl__err(CDECL_EBADPARAMS, _("invalid function parameter"));
 			return -1;
 		}
 
@@ -250,7 +304,7 @@ reduce_parentheses(struct cdecl_declarator **p, struct cdecl_declarator *d)
 		if (decl->type == CDECL_DECL_FUNCTION
 		    && decl->child->type == CDECL_DECL_NULL
 		    && !function_is_reducible(decl)) {
-			fprintf(stderr, "too many parentheses in function\n");
+			cdecl__err(CDECL_EBADPARAMS, _("too many parentheses in function"));
 			return -1;
 		}
 
@@ -269,7 +323,6 @@ check_parameters(struct cdecl_declarator **p, struct cdecl_declarator *d)
 {
 	struct cdecl_declspec *spec;
 	struct cdecl *param;
-	bool has_void = false;
 
 	if (d->type != CDECL_DECL_FUNCTION)
 		return 0;
@@ -286,13 +339,13 @@ check_parameters(struct cdecl_declarator **p, struct cdecl_declarator *d)
 				continue;
 
 			if (spec != param->specifiers || spec->next != NULL) {
-				fprintf(stderr, "void parameter must not have extra specifiers\n");
+				cdecl__err(CDECL_EVOIDPARAM, _("void parameter cannot have extra specifiers"));
 				return -1;
 			} else if (d->u.function.parameters->next) {
-				fprintf(stderr, "a void parameter must stand alone\n");
+				cdecl__err(CDECL_EVOIDPARAM, _("void parameter must stand alone"));
 				return -1;
 			} else if (d->u.function.variadic) {
-				fprintf(stderr, "variadic functions cannot have a void parameter\n");
+				cdecl__err(CDECL_EVOIDPARAM, _("variadic function cannot have void parameter"));
 				return -1;
 			}
 		}
@@ -313,10 +366,10 @@ check_rettypes(struct cdecl_declarator **p, struct cdecl_declarator *d)
 
 	switch (d->type) {
 	case CDECL_DECL_FUNCTION:
-		fprintf(stderr, "functions cannot return functions\n");
+		cdecl__err(CDECL_EBADRETURN, _("functions cannot return functions"));
 		return -1;
 	case CDECL_DECL_ARRAY:
-		fprintf(stderr, "functions cannot return arrays\n");
+		cdecl__err(CDECL_EBADRETURN, _("functions cannot return arrays"));
 		return -1;
 	}
 
@@ -331,7 +384,7 @@ check_arrays(struct cdecl_declarator **p, struct cdecl_declarator *d)
 
 	switch (d->type) {
 	case CDECL_DECL_FUNCTION:
-		fprintf(stderr, "array members cannot be functions\n");
+		cdecl__err(CDECL_EBADARRAY, _("array members cannot be functions"));
 		return -1;
 	}
 
@@ -372,7 +425,7 @@ check_qualifiers(struct cdecl_declarator **p, struct cdecl_declarator *d)
 	for (spec = ptr->qualifiers; spec; spec = spec->next) {
 		if (spec->type == CDECL_QUAL_RESTRICT
 		    && d->type == CDECL_DECL_FUNCTION) {
-			fprintf(stderr, "function pointers cannot be restrict-qualified\n");
+			cdecl__err(CDECL_EBADPOINTER, _("function pointers cannot be restrict-qualified"));
 			return -1;
 		}
 	}
@@ -471,7 +524,7 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
 
 		if (cdecl_is_abstract(i->declarators)
 		    && (i != decl || i->next)) {
-			fprintf(stderr, "mixing type names and declarations is not allowed\n");
+			cdecl__err(CDECL_EBADDECL, _("mixing type names and declarations is not allowed"));
 			goto err;
 		}
 	}