X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/99dc9be48bee7fdde460659569ad2fef5b7cdd87..c0b4acddf86a9dd0a7d8d8f8cc096cfec771bca7:/src/parse-decl.c

diff --git a/src/parse-decl.c b/src/parse-decl.c
index c088471..5c8e684 100644
--- a/src/parse-decl.c
+++ b/src/parse-decl.c
@@ -15,6 +15,7 @@
  *  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>
@@ -23,18 +24,8 @@
 #include "typemap.h"
 #include "parse.h"
 #include "scan.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 "i18n.h"
+#include "normalize.h"
 
 /*
  * Verify the declaration specifiers of a declaration.  If top is true, treat
@@ -45,14 +36,13 @@ static bool valid_declspecs(struct cdecl *decl, bool top)
 {
 	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;
 
 	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 +323,42 @@ 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;
+}
+
+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
@@ -372,24 +398,36 @@ static bool forall_declarators(struct cdecl *decl,
 
 struct cdecl *cdecl_parse_decl(const char *declstr)
 {
+	struct cdecl_declspec *norm_specs;
 	YY_BUFFER_STATE state;
 	yyscan_t scanner;
 	struct cdecl *decl;
 	int rc;
 
-	rc = yylex_init(&scanner);
+	cdecl__init_i18n();
+
+	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;
 
+	/*
+	 * 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))
@@ -398,6 +436,59 @@ 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 (!forall_declarators(i, normalize_specs))
+			goto err;
+
+		if (!valid_declspecs(i, true))
+			goto err;
+
+		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);
+	return NULL;
+}
+
+struct cdecl *cdecl_parse_english(const char *english)
+{
+	YY_BUFFER_STATE state;
+	yyscan_t scanner;
+	struct cdecl *decl;
+	int rc;
+
+	cdecl__init_i18n();
+
+	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) {
+		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;
@@ -405,6 +496,11 @@ struct cdecl *cdecl_parse_decl(const char *declstr)
 
 	return decl;
 err:
-	cdecl_free(decl);
+	cdecl__free(decl);
 	return NULL;
 }
+
+void cdecl_free(struct cdecl *decl)
+{
+	cdecl__free(decl);
+}