Add nodefault to flex options.

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

diff --git a/src/parse-decl.c b/src/parse-decl.c
index 0cf830d8f5faa2f31c13106a1f475c6cddc24d1b..3ffb1029ae181b596da102f367130f5f84bd83c4 100644 (file)
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -51,8 +51,7 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 
        typemap = cdecl__build_typemap(specs);
        if (typemap == -1)
-               return -1;
-
+               return false;
 
        for (struct cdecl_declspec *c = specs; c; c = c->next) {
                switch (cdecl_spec_kind(c)) {
@@ -333,6 +332,21 @@ check_rettypes(struct cdecl_declarator **p, struct cdecl_declarator *d)
        return 0;
 }
 
+static int
+check_arrays(struct cdecl_declarator **p, struct cdecl_declarator *d)
+{
+       if (!d->child || d->child->type != CDECL_DECL_ARRAY)
+               return 0;
+
+       switch (d->type) {
+       case CDECL_DECL_FUNCTION:
+               fprintf(stderr, "array members cannot be functions\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
@@ -377,14 +391,14 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
        struct cdecl *decl;
        int rc;
 
-       rc = yylex_init(&scanner);
+       rc = cdecl__yylex_init(&scanner);
        if (rc != 0)
                return NULL;
 
-       state = yy_scan_string(declstr, scanner);
-       rc = yyparse(scanner, &decl);
-       yy_delete_buffer(state, scanner);
-       yylex_destroy(scanner);
+       state = cdecl__yy_scan_string(declstr, scanner);
+       rc = cdecl__yyparse(scanner, &decl);
+       cdecl__yy_delete_buffer(state, scanner);
+       cdecl__yylex_destroy(scanner);
 
        if (rc != 0)
                return NULL;
@@ -398,6 +412,8 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
                        goto err;
                if (!forall_declarators(i, check_rettypes))
                        goto err;
+               if (!forall_declarators(i, check_arrays))
+                       goto err;
 
                if (!valid_declspecs(i, true))
                        goto err;
@@ -413,3 +429,40 @@ err:
        cdecl_free(decl);
        return NULL;
 }
+
+struct cdecl *cdecl_parse_english(const char *english)
+{
+       YY_BUFFER_STATE state;
+       yyscan_t scanner;
+       struct cdecl *decl;
+       int rc;
+
+       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)
+               return NULL;
+
+       for (struct cdecl *i = decl; i; i = i->next) {
+               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 (!valid_declspecs(i, true))
+                       goto err;
+       }
+
+       return decl;
+err:
+       cdecl_free(decl);
+       return NULL;
+}