Rework library error reporting.

[cdecl99.git] / src / parse-decl.c

diff --git a/src/parse-decl.c b/src/parse-decl.c
index f25c4c4d56f109d42452d969993a20855ad5c409..f00442d31712c2dffef54ecf10bb8aa6c0b8d66b 100644 (file)
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -63,9 +63,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__err(CDECL_EBADTYPE, _("too many long specifiers"));
                        else
-                               fprintf(stderr, "duplicate type specifier\n");
+                               cdecl__err(CDECL_EBADTYPE, _("duplicate type specifier"));
                        return false;
                }
                map |= bit;
@@ -75,9 +75,9 @@ static int valid_typespec(struct cdecl_declspec *s)
                return true;
 
        if (map == 0)
-               fprintf(stderr, "no type specified\n");
+               cdecl__err(CDECL_EBADTYPE, _("no type specified"));
        else
-               fprintf(stderr, "invalid type specified\n");
+               cdecl__err(CDECL_EBADTYPE, _("invalid type specified"));
 
        return false;
 }
@@ -103,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;
@@ -129,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;
@@ -280,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;
                }
 
@@ -304,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;
                }
 
@@ -339,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;
                        }
                }
@@ -366,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;
        }
 
@@ -384,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;
        }
 
@@ -425,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;
                }
        }
@@ -524,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;
                }
        }