X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/5383a8b913e74ebe5faa39ef3e570afb95779141..41ff7ec97691:/src/parse.y

diff --git a/src/parse.y b/src/parse.y
index 0156bb3..f507d5b 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -53,6 +53,13 @@
 	ALLOC(ptr, sizeof (type)); \
 	*(ptr) = (type) { __VA_ARGS__ }; \
 } while (0)
+
+/*
+ * With the postprocessing performed by fix-yytname.awk, all the symbol
+ * name strings can be used directly in error messages and there is no
+ * need for any string processing.
+ */
+#define yytnamerr(a, b) cdecl__strlcpy(a, b, (a) ? INT_MAX : 0)
 %}
 
 %code requires {
@@ -239,6 +246,7 @@ static struct cdecl *insert_identifier(struct cdecl *decl, char *ident)
 %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
@@ -248,15 +256,15 @@ static struct cdecl *insert_identifier(struct cdecl *decl, char *ident)
 %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
@@ -342,7 +350,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
@@ -364,23 +372,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);
@@ -388,9 +389,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 {
@@ -399,26 +397,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 {
@@ -527,25 +516,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,
@@ -581,22 +561,21 @@ 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;
 }
 
 %%