X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/ad973d63e038f293f2b158f19b04c1582e616af0..b9d67c6ec4c59b204883dfbf346e3b7fca54a84b:/src/parse-decl.c

diff --git a/src/parse-decl.c b/src/parse-decl.c
index f00442d..7e181c0 100644
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -1,6 +1,6 @@
 /*
  * Parse and validate C declarations.
- * Copyright © 2011-2012, 2020-2021 Nick Bowler
+ * Copyright © 2011-2012, 2020-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
@@ -25,6 +25,7 @@
 #include "cdecl-internal.h"
 #include "parse.h"
 #include "scan.h"
+#include "errmsg.h"
 
 /*
  * We can represent type specifiers as a bitmap, which gives us a finite
@@ -63,9 +64,9 @@ static int valid_typespec(struct cdecl_declspec *s)
 
 		if (map & bit) {
 			if (bit == 1ul << MAP_LLONG_BIT)
-				cdecl__err(CDECL_EBADTYPE, _("too many long specifiers"));
+				cdecl__errmsg(CDECL__ETOOLONG);
 			else
-				cdecl__err(CDECL_EBADTYPE, _("duplicate type specifier"));
+				cdecl__errmsg(CDECL__EDUPTYPE);
 			return false;
 		}
 		map |= bit;
@@ -75,9 +76,9 @@ static int valid_typespec(struct cdecl_declspec *s)
 		return true;
 
 	if (map == 0)
-		cdecl__err(CDECL_EBADTYPE, _("no type specified"));
+		cdecl__errmsg(CDECL__ENOTYPE);
 	else
-		cdecl__err(CDECL_EBADTYPE, _("invalid type specified"));
+		cdecl__errmsg(CDECL__EBADTYPE);
 
 	return false;
 }
@@ -103,23 +104,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)) {
-				cdecl__err(CDECL_EBADTYPE, _("invalid declaration of type void"));
+				cdecl__errmsg(CDECL__EBADVOID);
 				return false;
 			}
 			continue;
 		case CDECL_SPEC_STOR:
 			if (top && abstract) {
-				cdecl__err(CDECL_EBADSTOR, _("type names cannot have storage-class specifiers"));
+				cdecl__errmsg(CDECL__ETYPESTOR);
 				return false;
 			}
 
 			if (!top && c->type != CDECL_STOR_REGISTER) {
-				cdecl__err(CDECL_EBADSTOR, _("function parameters may only have register storage"));
+				cdecl__errmsg(CDECL__EFUNCSTOR);
 				return false;
 			}
 
 			if (++num_storage > 1) {
-				cdecl__err(CDECL_EBADSTOR, _("too many storage-class specifiers"));
+				cdecl__errmsg(CDECL__EMANYSTOR);
 				return false;
 			}
 			break;
@@ -129,20 +130,16 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 			 * pointer qualifier list, which isn't checked here.
 			 */
 			if (c->type == CDECL_QUAL_RESTRICT) {
-				cdecl__err(CDECL_EBADQUAL, _("only pointer types can be restrict-qualified"));
+				cdecl__errmsg(CDECL__EBADQUAL);
 				return false;
 			}
 			break;
 		case CDECL_SPEC_FUNC:
-			if (abstract) {
-				cdecl__err(CDECL_ENOTFUNC, _("type names cannot have function specifiers"));
+			if (abstract || !top || d->type != CDECL_DECL_FUNCTION) {
+				cdecl__errmsg(CDECL__ENOTFUNC);
 				return false;
 			}
 
-			if (!top || d->type != CDECL_DECL_FUNCTION) {
-				cdecl__err(CDECL_ENOTFUNC, _("only function declarations can have function specifiers"));
-				return false;
-			}
 			break;
 		default:
 			assert(0);
@@ -280,7 +277,7 @@ reduce_parentheses(struct cdecl_declarator **p, struct cdecl_declarator *d)
 		}
 
 		if (d->child->type != CDECL_DECL_NULL) {
-			cdecl__err(CDECL_EBADPARAMS, _("invalid function parameter"));
+			cdecl__errmsg(CDECL__EBADPARAM);
 			return -1;
 		}
 
@@ -304,7 +301,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)) {
-			cdecl__err(CDECL_EBADPARAMS, _("too many parentheses in function"));
+			cdecl__errmsg(CDECL__EMANYPAREN);
 			return -1;
 		}
 
@@ -339,13 +336,13 @@ check_parameters(struct cdecl_declarator **p, struct cdecl_declarator *d)
 				continue;
 
 			if (spec != param->specifiers || spec->next != NULL) {
-				cdecl__err(CDECL_EVOIDPARAM, _("void parameter cannot have extra specifiers"));
+				cdecl__errmsg(CDECL__EVOIDPARAM);
 				return -1;
 			} else if (d->u.function.parameters->next) {
-				cdecl__err(CDECL_EVOIDPARAM, _("void parameter must stand alone"));
+				cdecl__errmsg(CDECL__EVOIDPARAM);
 				return -1;
 			} else if (d->u.function.variadic) {
-				cdecl__err(CDECL_EVOIDPARAM, _("variadic function cannot have void parameter"));
+				cdecl__errmsg(CDECL__EVOIDPARAM);
 				return -1;
 			}
 		}
@@ -366,10 +363,10 @@ check_rettypes(struct cdecl_declarator **p, struct cdecl_declarator *d)
 
 	switch (d->type) {
 	case CDECL_DECL_FUNCTION:
-		cdecl__err(CDECL_EBADRETURN, _("functions cannot return functions"));
+		cdecl__errmsg(CDECL__ERETFUNC);
 		return -1;
 	case CDECL_DECL_ARRAY:
-		cdecl__err(CDECL_EBADRETURN, _("functions cannot return arrays"));
+		cdecl__errmsg(CDECL__ERETARRAY);
 		return -1;
 	}
 
@@ -384,7 +381,7 @@ check_arrays(struct cdecl_declarator **p, struct cdecl_declarator *d)
 
 	switch (d->type) {
 	case CDECL_DECL_FUNCTION:
-		cdecl__err(CDECL_EBADARRAY, _("array members cannot be functions"));
+		cdecl__errmsg(CDECL__EFUNCARRAY);
 		return -1;
 	}
 
@@ -425,7 +422,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) {
-			cdecl__err(CDECL_EBADPOINTER, _("function pointers cannot be restrict-qualified"));
+			cdecl__errmsg(CDECL__ERESTRICTFUNC);
 			return -1;
 		}
 	}
@@ -470,26 +467,36 @@ static bool forall_declarators(struct cdecl *decl,
 	return true;
 }
 
-struct cdecl *cdecl_parse_decl(const char *declstr)
+static struct cdecl *do_parse(const char *str, int english_mode)
 {
-	struct cdecl_declspec *norm_specs;
 	YY_BUFFER_STATE state;
 	yyscan_t scanner;
 	struct cdecl *decl;
-	int rc;
 
-	cdecl__init_i18n();
+#if YYDEBUG
+	extern int cdecl__yydebug;
+	cdecl__yydebug = 1;
+#endif
 
-	rc = cdecl__yylex_init(&scanner);
-	if (rc != 0)
+	cdecl__init_i18n();
+	if (cdecl__yylex_init_extra(english_mode, &scanner) != 0)
 		return NULL;
 
-	state = cdecl__yy_scan_string(declstr, scanner);
-	rc = cdecl__yyparse(scanner, &decl);
+	state = cdecl__yy_scan_string(str, scanner);
+	if (cdecl__yyparse(scanner, &decl) != 0)
+		decl = NULL;
 	cdecl__yy_delete_buffer(state, scanner);
 	cdecl__yylex_destroy(scanner);
 
-	if (rc != 0)
+	return decl;
+}
+
+struct cdecl *cdecl_parse_decl(const char *declstr)
+{
+	struct cdecl_declspec *norm_specs;
+	struct cdecl *decl;
+
+	if (!(decl = do_parse(declstr, false)))
 		return NULL;
 
 	/*
@@ -524,7 +531,7 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
 
 		if (cdecl_is_abstract(i->declarators)
 		    && (i != decl || i->next)) {
-			cdecl__err(CDECL_EBADDECL, _("mixing type names and declarations is not allowed"));
+			cdecl__errmsg(CDECL__EDECLTYPE);
 			goto err;
 		}
 	}
@@ -537,23 +544,9 @@ err:
 
 struct cdecl *cdecl_parse_english(const char *english)
 {
-	YY_BUFFER_STATE state;
-	yyscan_t scanner;
 	struct cdecl *decl;
-	int rc;
-
-	cdecl__init_i18n();
-
-	rc = cdecl__yylex_init_extra(true, &scanner);
-	if (rc != 0)
-		return NULL;
-
-	state = cdecl__yy_scan_string(english, scanner);
-	rc = cdecl__yyparse(scanner, &decl);
-	cdecl__yy_delete_buffer(state, scanner);
-	cdecl__yylex_destroy(scanner);
 
-	if (rc != 0)
+	if (!(decl = do_parse(english, true)))
 		return NULL;
 
 	for (struct cdecl *i = decl; i; i = i->next) {