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)) {
return 0;
}
+/*
+ * Function parameters and return types have a few restrictions that are
+ * really easy to check in comparison to the above absurdity.
+ */
static int
check_parameters(struct cdecl_declarator **p, struct cdecl_declarator *d)
{
return 0;
}
+/*
+ * Functions cannot return arrays or functions. Since the parse tree is
+ * "inside-out", we need to look for functions as the child declarator.
+ */
+static int
+check_rettypes(struct cdecl_declarator **p, struct cdecl_declarator *d)
+{
+ if (!d->child || d->child->type != CDECL_DECL_FUNCTION)
+ return 0;
+
+ switch (d->type) {
+ case CDECL_DECL_FUNCTION:
+ fprintf(stderr, "functions cannot return functions\n");
+ return -1;
+ case CDECL_DECL_ARRAY:
+ fprintf(stderr, "functions cannot return arrays\n");
+ return -1;
+ }
+
+ 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
struct cdecl *cdecl_parse_decl(const char *declstr)
{
YY_BUFFER_STATE state;
+ yyscan_t scanner;
struct cdecl *decl;
int rc;
- state = yy_scan_string(declstr);
- rc = yyparse(&decl);
- yy_delete_buffer(state);
+ rc = cdecl__yylex_init(&scanner);
+ if (rc != 0)
+ return NULL;
+
+ 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;
goto err;
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;
+
+ if (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);
+ 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;