libcdecl: Factor out open-coded identifier patchup.

[cdecl99.git] / src / parse.y

diff --git a/src/parse.y b/src/parse.y
index a386c086b9718abc413f515e5183008036ce3776..0156bb3642108ef9f708ecf0e622f0d80361f8fb 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -76,6 +76,7 @@ const char *cdecl__token_name(unsigned token);
 }
 
 %{
+static void yyerror(YYLTYPE *, yyscan_t, struct cdecl **, const char *);
 static void free_decl(struct cdecl *);
 
 static void free_declspec(struct cdecl_declspec *x)
@@ -142,13 +143,34 @@ void cdecl__free(struct cdecl *decl)
        free_decl(decl);
 }
 
-static void
-yyerror(YYLTYPE *loc, yyscan_t scanner, struct cdecl **out, const char *err)
+/*
+ * Join two declaration specifier lists into a single list, with "a" being the
+ * head of the new list.
+ *
+ * The list "a" is assumed to be nonempty.
+ */
+static void join_specs(struct cdecl_declspec *a, struct cdecl_declspec *b)
 {
-       if (strstr(err, "T_LEX_ERROR"))
-               return;
+       while (a->next)
+               a = a->next;
+       a->next = b;
+}
 
-       cdecl__err(CDECL_ENOPARSE, "%s", err);
+/*
+ * Alter an abstract declarator (type name) to declare an identifier instead,
+ * used by the English parser rules to reduce "identifier as type" sequences.
+ */
+static struct cdecl *insert_identifier(struct cdecl *decl, char *ident)
+{
+       struct cdecl_declarator *d = decl->declarators;
+
+       while (d->child)
+               d = d->child;
+
+       d->type = CDECL_DECL_IDENT;
+       d->u.ident = ident;
+
+       return decl;
 }
 %}
 
@@ -254,9 +276,7 @@ semi: | T_SEMICOLON
 
 declaration: declspecs declarators semi {
        $$ = $2;
-
-       for (struct cdecl *i = $$; i; i = i->next)
-               i->specifiers = $1;
+       $$->specifiers = $1;
 };
 
 /*
@@ -447,13 +467,7 @@ direct_declarator: {
 }
 
 english: T_DECLARE T_IDENT T_AS english_declaration {
-       $$ = $4;
-       for (struct cdecl_declarator *d = $$->declarators; d; d = d->child) {
-               if (d->type == CDECL_DECL_NULL) {
-                       d->type = CDECL_DECL_IDENT;
-                       d->u.ident = $2;
-               }
-       }
+       $$ = insert_identifier($4, $2);
 } | T_TYPE english_declaration {
        $$ = $2;
 }
@@ -477,27 +491,16 @@ type_qual_specs: { $$ = NULL; } | type_qual_spec type_qual_specs {
  * together three different specifiers lists.
  */
 post_specs: qualifiers typespec type_qual_specs {
+       $2->next = $3;
+       join_specs($2, $1);
        $$ = $2;
-       $$->next = $1;
-       for (struct cdecl_declspec *s = $$; s; s = s->next) {
-               if (!s->next) {
-                       s->next = $3;
-                       break;
-               }
-       }
 }
 
 english_declaration: storage_func_specs english_declarator post_specs {
+       join_specs($3, $1);
        ALLOC_STRUCT($$, struct cdecl,
                .specifiers = $3,
                .declarators = $2);
-
-       for (struct cdecl_declspec *s = $$->specifiers; s; s = s->next) {
-               if (!s->next) {
-                       s->next = $1;
-                       break;
-               }
-       }
 }
 
 english_declarator: {
@@ -571,13 +574,7 @@ english_parameter: english_declaration | typedef_name_qual null_decl {
                .specifiers = $1,
                .declarators = $2);
 } | T_IDENT T_AS english_declaration {
-       $$ = $3;
-       for (struct cdecl_declarator *d = $$->declarators; d; d = d->child) {
-               if (d->type == CDECL_DECL_NULL) {
-                       d->type = CDECL_DECL_IDENT;
-                       d->u.ident = $1;
-               }
-       }
+       $$ = insert_identifier($3, $1);
 }
 
 english_array: T_VLA T_ARRAY english_vla T_OF {
@@ -616,3 +613,12 @@ const char *cdecl__token_name(unsigned token)
 {
        return yytname[YYTRANSLATE(token)];
 }
+
+static void
+yyerror(YYLTYPE *loc, yyscan_t scanner, struct cdecl **out, const char *err)
+{
+       if (strstr(err, yytname[YYTRANSLATE(T_LEX_ERROR)]))
+               return;
+
+       cdecl__err(CDECL_ENOPARSE, "%s", err);
+}