Don't allow restrict-qualified pointers to functions.

Such pointers are prohibited by the C language, so we must reject them.

diff --git a/src/parse-decl.c b/src/parse-decl.c
index 45cf67fcc5f7a8323a5624bd59a83a28d5cb94bb..4489532cdaa1f232862968c47871dafe53431f65 100644 (file)
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -1,6 +1,6 @@
 /*
  *  Parse and validate C declarations.
- *  Copyright © 2011 Nick Bowler
+ *  Copyright © 2011-2012 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
@@ -364,6 +364,27 @@ normalize_specs(struct cdecl_declarator **p, struct cdecl_declarator *d)
        return 0;
 }
 
+static int
+check_qualifiers(struct cdecl_declarator **p, struct cdecl_declarator *d)
+{
+       struct cdecl_declspec *spec;
+       struct cdecl_pointer *ptr;
+
+       if (!d->child || d->child->type != CDECL_DECL_POINTER)
+               return 0;
+
+       ptr = &d->child->u.pointer;
+       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");
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
 /*
  * Traverse the parse tree, calling a function on every declarator in a
  * depth-first preorder traversal.  The function is given a pointer to the
@@ -445,6 +466,8 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
                        goto err;
                if (!forall_declarators(i, normalize_specs))
                        goto err;
+               if (!forall_declarators(i, check_qualifiers))
+                       goto err;
 
                if (!valid_declspecs(i, true))
                        goto err;
@@ -494,6 +517,8 @@ struct cdecl *cdecl_parse_english(const char *english)
                        goto err;
                if (!forall_declarators(i, normalize_specs))
                        goto err;
+               if (!forall_declarators(i, check_qualifiers))
+                       goto err;
 
                if (!valid_declspecs(i, true))
                        goto err;

diff --git a/test/declgen.c b/test/declgen.c
index 3f4c3944f613c0c094ee070899a66639d5c8ae6f..4fb39cb52e26539d29df0749a1c8e24e508c07d0 100644 (file)
--- a/test/declgen.c
+++ b/test/declgen.c
@@ -402,6 +402,12 @@ struct cdecl_declarator *gen_declarators(struct gen_rng *rng)
                        break;
                case 2:
                        gen_function(rng, d);
+                       if (p && p->type == CDECL_DECL_POINTER) {
+                               struct cdecl_pointer *ptr = &p->u.pointer;
+
+                               gen_free_declspecs(ptr->qualifiers);
+                               ptr->qualifiers = gen_qualifiers(rng, false);
+                       }
                        limit = 1;
                        break;
                default:

diff --git a/tests/cdecl99-c-invalid.sh b/tests/cdecl99-c-invalid.sh
index 5ffb3b39a61a0b298314be7e32f23d57d0c0acc6..4370e58e6d3e81883e0db891d95883d7f5f28a15 100755 (executable)
--- a/tests/cdecl99-c-invalid.sh
+++ b/tests/cdecl99-c-invalid.sh
@@ -30,8 +30,12 @@ test_decl explain 'long long long x'
 test_decl declare 'x as long long long'
 test_decl explain 'inline int x'
 test_decl declare 'x as inline int'
+# C99§6.7.3#2: Types other than opinter types derived from object or incomplete
+# types shall not be restrict-qualified.
 test_decl explain 'restrict int x'
 test_decl declare 'x as restrict int'
+test_decl explain 'int (*restrict f)(void)'
+test_decl declare 'f as restrict pointer to function (void) returning int'
 test_decl explain 'static auto int x'
 test_decl declare 'x as static auto int'
 test_decl explain 'auto x'