libcdecl: Sidestep some possible snprintf issues.

[cdecl99.git] / src / parse.y

diff --git a/src/parse.y b/src/parse.y
index cf24b25ae73d1e3377bc8804b492bb10d118f817..a993ea6100459e100bd3f367da553b35f7541d0f 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -155,6 +155,23 @@ static void join_specs(struct cdecl_declspec *a, struct cdecl_declspec *b)
                a = a->next;
        a->next = b;
 }
+
+/*
+ * 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;
+}
 %}
 
 %destructor { free($$); }            <strval>
@@ -222,6 +239,7 @@ static void join_specs(struct cdecl_declspec *a, struct cdecl_declspec *b)
 %token T_VLA       "variable-length"
 
 %type <strval>     vla_ident
+%type <uintval>    array_length
 %type <boolval>    varargs
 %type <spectype>   declspec_simple qualifier_simple
 %type <spectype>   typespec_simple typespec_tagged
@@ -231,15 +249,15 @@ static void join_specs(struct cdecl_declspec *a, struct cdecl_declspec *b)
 %type <declarator> direct_declarator declarator pointer array parens postfix
 %type <declarator> direct_declarator_ish declarator_ish parameter_type_list
 %type <decl>       declaration declarators declarator_wrap
-%type <decl>       parameter parameters
+%type <decl>       parameter
 
 %type <strval>     english_vla
 %type <declspec>   storage_func_specs post_specs
 %type <declspec>   type_qual_spec type_qual_specs typedef_name_qual
 %type <declarator> english_declarator english_array english_function
 %type <declarator> english_parameter_list null_decl
-%type <decl>       english_parameter english_parameters
 %type <decl>       english english_declaration
+%type <decl>       english_parameter
 
 /*
  * Harmless shift/reduce conflicts in english_parameter.  See comments below
@@ -325,7 +343,7 @@ typespec_simple: T_VOID
        | T_COMPLEX
        | T_IMAGINARY
 
-typespec_tagged: T_STRUCT | T_UNION | T_ENUM
+typespec_tagged: T_STRUCT | T_UNION | T_ENUM | { $$ = CDECL_TYPE_IDENT; }
 
 qualifier_simple: T_CONST
        | T_RESTRICT
@@ -347,23 +365,16 @@ typespec: typespec_noid | typespec_tagged T_IDENT {
        ALLOC_STRUCT($$, struct cdecl_declspec,
                .type  = $1,
                .ident = $2);
-} | T_IDENT {
-       ALLOC_STRUCT($$, struct cdecl_declspec,
-               .type = CDECL_TYPE_IDENT,
-               .ident = $1);
 }
 
 declspec_noid: declspec_notype | typespec_noid
 
 vla_ident: T_IDENT | T_ASTERISK {
        ALLOC($$, sizeof "");
-       strcpy($$, "");
+       *$$ = 0;
 }
 
-array: T_LBRACKET T_UINT T_RBRACKET {
-       if ($2 == 0)
-               FAIL(_("array length must be positive"));
-
+array: T_LBRACKET array_length T_RBRACKET {
        ALLOC_STRUCT($$, struct cdecl_declarator,
                .type = CDECL_DECL_ARRAY,
                .u.array.length = $2);
@@ -371,9 +382,6 @@ array: T_LBRACKET T_UINT T_RBRACKET {
        ALLOC_STRUCT($$, struct cdecl_declarator,
                .type = CDECL_DECL_ARRAY,
                .u.array.vla = $2);
-} | T_LBRACKET T_RBRACKET {
-       ALLOC_STRUCT($$, struct cdecl_declarator,
-               .type = CDECL_DECL_ARRAY);
 }
 
 parameter: declspecs declarator {
@@ -382,26 +390,17 @@ parameter: declspecs declarator {
                .declarators = $2);
 }
 
-parameters: parameter | parameters T_COMMA parameter {
-       $$ = $3;
-       $$->next = $1;
-}
-
 varargs: { $$ = false; } | T_COMMA T_ELLIPSIS { $$ = true; }
 
-parameter_type_list: parameters varargs {
-       struct cdecl *p, *c, *n;
-
-       /* Parameters were accumulated in reverse order. */
-       for (p = NULL, c = $1; c; p = c, c = n) {
-               n = c->next;
-               c->next = p;
-       }
-
+parameter_type_list: parameter varargs {
        ALLOC_STRUCT($$, struct cdecl_declarator,
                .type = CDECL_DECL_FUNCTION,
-               .u.function.parameters = p,
+               .u.function.parameters = $1,
                .u.function.variadic = $2);
+} | parameter T_COMMA parameter_type_list {
+       $$ = $3;
+       $1->next = $$->u.function.parameters;
+       $$->u.function.parameters = $1;
 }
 
 parens: T_LPAREN parameter_type_list T_RPAREN {
@@ -450,13 +449,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;
 }
@@ -516,25 +509,16 @@ english_function: T_FUNCTION T_RETURNING {
        $$ = $3;
 }
 
-english_parameter_list: english_parameters varargs {
-       struct cdecl *p, *c, *n;
-
-       /* Parameters were accumulated in reverse order. */
-       for (p = NULL, c = $1; c; p = c, c = n) {
-               n = c->next;
-               c->next = p;
-       }
-
+english_parameter_list: english_parameter varargs {
        ALLOC_STRUCT($$, struct cdecl_declarator,
                .type = CDECL_DECL_FUNCTION,
-               .u.function.parameters = p,
+               .u.function.parameters = $1,
                .u.function.variadic = $2);
-}
-
-english_parameters: english_parameters T_COMMA english_parameter {
+} | english_parameter T_COMMA english_parameter_list {
        $$ = $3;
-       $$->next = $1;
-} | english_parameter
+       $1->next = $$->u.function.parameters;
+       $$->u.function.parameters = $1;
+}
 
 typedef_name_qual: T_IDENT qualifiers {
        ALLOC_STRUCT($$, struct cdecl_declspec,
@@ -563,35 +547,28 @@ 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 {
        ALLOC_STRUCT($$, struct cdecl_declarator,
                .type = CDECL_DECL_ARRAY,
                .u.array.vla = $3);
-} | T_ARRAY T_UINT T_OF {
-       if ($2 == 0)
-               FAIL(_("array length must be positive"));
-
+} | T_ARRAY array_length T_OF {
        ALLOC_STRUCT($$, struct cdecl_declarator,
                .type = CDECL_DECL_ARRAY,
                .u.array.length = $2);
-} | T_ARRAY T_OF {
-       ALLOC_STRUCT($$, struct cdecl_declarator,
-               .type = CDECL_DECL_ARRAY,
-               .u.array.length = 0);
+}
+
+array_length: { $$ = 0; }
+array_length: T_UINT {
+       if (!($$ = $1))
+               FAIL(_("array length must be positive"));
 }
 
 english_vla: T_IDENT | {
        ALLOC($$, sizeof "");
-       strcpy($$, "");
+       *$$ = 0;
 }
 
 %%