]> git.draconx.ca Git - cdecl99.git/blobdiff - src/parse-decl.c
libcdecl: Simplify cdecl__advance.
[cdecl99.git] / src / parse-decl.c
index f25c4c4d56f109d42452d969993a20855ad5c409..7e181c082f0f1610c3498f21604293b4ec9478d3 100644 (file)
@@ -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)
-                               fprintf(stderr, "too many long specifiers\n");
+                               cdecl__errmsg(CDECL__ETOOLONG);
                        else
-                               fprintf(stderr, "duplicate type specifier\n");
+                               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)
-               fprintf(stderr, "no type specified\n");
+               cdecl__errmsg(CDECL__ENOTYPE);
        else
-               fprintf(stderr, "invalid type specified\n");
+               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)) {
-                               fprintf(stderr, "invalid declaration of type void\n");
+                               cdecl__errmsg(CDECL__EBADVOID);
                                return false;
                        }
                        continue;
                case CDECL_SPEC_STOR:
                        if (top && abstract) {
-                               fprintf(stderr, "type names cannot have storage-class specifiers\n");
+                               cdecl__errmsg(CDECL__ETYPESTOR);
                                return false;
                        }
 
                        if (!top && c->type != CDECL_STOR_REGISTER) {
-                               fprintf(stderr, "function parameters may only have register storage\n");
+                               cdecl__errmsg(CDECL__EFUNCSTOR);
                                return false;
                        }
 
                        if (++num_storage > 1) {
-                               fprintf(stderr, "too many storage-class specifiers\n");
+                               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) {
-                               fprintf(stderr, "only pointer types can be restrict-qualified.\n");
+                               cdecl__errmsg(CDECL__EBADQUAL);
                                return false;
                        }
                        break;
                case CDECL_SPEC_FUNC:
-                       if (abstract) {
-                               fprintf(stderr, "type names cannot have function specifiers\n");
+                       if (abstract || !top || d->type != CDECL_DECL_FUNCTION) {
+                               cdecl__errmsg(CDECL__ENOTFUNC);
                                return false;
                        }
 
-                       if (!top || d->type != CDECL_DECL_FUNCTION) {
-                               fprintf(stderr, "only function declarations may have function specifiers.\n");
-                               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) {
-                       fprintf(stderr, "invalid function parameter\n");
+                       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)) {
-                       fprintf(stderr, "too many parentheses in function\n");
+                       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) {
-                               fprintf(stderr, "void parameter must not have extra specifiers\n");
+                               cdecl__errmsg(CDECL__EVOIDPARAM);
                                return -1;
                        } else if (d->u.function.parameters->next) {
-                               fprintf(stderr, "a void parameter must stand alone\n");
+                               cdecl__errmsg(CDECL__EVOIDPARAM);
                                return -1;
                        } else if (d->u.function.variadic) {
-                               fprintf(stderr, "variadic functions cannot have a void parameter\n");
+                               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:
-               fprintf(stderr, "functions cannot return functions\n");
+               cdecl__errmsg(CDECL__ERETFUNC);
                return -1;
        case CDECL_DECL_ARRAY:
-               fprintf(stderr, "functions cannot return arrays\n");
+               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:
-               fprintf(stderr, "array members cannot be functions\n");
+               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) {
-                       fprintf(stderr, "function pointers cannot be restrict-qualified\n");
+                       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)) {
-                       fprintf(stderr, "mixing type names and declarations is not allowed\n");
+                       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) {