* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdio.h>
#include <assert.h>
#include <stdbool.h>
#include "parse.h"
#include "scan.h"
#include "i18n.h"
-
-/*
- * Determine if a declarator declares an identifier (other than a function
- * parameter).
- */
-static bool is_abstract(struct cdecl_declarator *d)
-{
- while (d->child)
- d = d->child;
-
- return d->type != CDECL_DECL_IDENT;
-}
+#include "normalize.h"
/*
* Verify the declaration specifiers of a declaration. If top is true, treat
{
struct cdecl_declspec *specs = decl->specifiers;
struct cdecl_declarator *d = decl->declarators;
- bool abstract = is_abstract(d);
+ bool abstract = cdecl_is_abstract(d);
unsigned num_storage = 0;
unsigned long typemap;
return 0;
}
+static int
+normalize_specs(struct cdecl_declarator **p, struct cdecl_declarator *d)
+{
+ struct cdecl_function *func;
+ struct cdecl_pointer *ptr;
+
+ switch (d->type) {
+ case CDECL_DECL_POINTER:
+ ptr = &d->u.pointer;
+ ptr->qualifiers = cdecl__normalize_specs(ptr->qualifiers);
+ break;
+ case CDECL_DECL_FUNCTION:
+ func = &d->u.function;
+ for (struct cdecl *i = func->parameters; i; i = i->next)
+ i->specifiers = cdecl__normalize_specs(i->specifiers);
+ break;
+ }
+
+ 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
struct cdecl *cdecl_parse_decl(const char *declstr)
{
+ struct cdecl_declspec *norm_specs;
YY_BUFFER_STATE state;
yyscan_t scanner;
struct cdecl *decl;
if (rc != 0)
return NULL;
+ /*
+ * Since the top-level specifiers are shared between each top-level
+ * declarator, we need to normalize them once and then propagate the
+ * new specifier list.
+ */
+ norm_specs = cdecl__normalize_specs(decl->specifiers);
+
for (struct cdecl *i = decl; i; i = i->next) {
+ i->specifiers = norm_specs;
+
if (!forall_declarators(i, reduce_parentheses))
goto err;
if (!forall_declarators(i, simplify_functions))
goto err;
if (!forall_declarators(i, check_arrays))
goto err;
+ if (!forall_declarators(i, normalize_specs))
+ goto err;
if (!valid_declspecs(i, true))
goto err;
- if (is_abstract(i->declarators) && (i != decl || i->next)) {
+ if (cdecl_is_abstract(i->declarators)
+ && (i != decl || i->next)) {
fprintf(stderr, "mixing type names and declarations is not allowed\n");
goto err;
}
return decl;
err:
- cdecl_free(decl);
+ cdecl__free(decl);
return NULL;
}
return NULL;
for (struct cdecl *i = decl; i; i = i->next) {
+ i->specifiers = cdecl__normalize_specs(i->specifiers);
+
if (!forall_declarators(i, check_parameters))
goto err;
if (!forall_declarators(i, check_rettypes))
goto err;
if (!forall_declarators(i, check_arrays))
goto err;
+ if (!forall_declarators(i, normalize_specs))
+ goto err;
if (!valid_declspecs(i, true))
goto err;
return decl;
err:
- cdecl_free(decl);
+ cdecl__free(decl);
return NULL;
}
+
+void cdecl_free(struct cdecl *decl)
+{
+ cdecl__free(decl);
+}