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 {
}
%{
+static void yyerror(YYLTYPE *, yyscan_t, struct cdecl **, const char *);
static void free_decl(struct cdecl *);
static void free_declspec(struct cdecl_declspec *x)
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;
}
%}
%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
%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
declaration: declspecs declarators semi {
$$ = $2;
-
- for (struct cdecl *i = $$; i; i = i->next)
- i->specifiers = $1;
+ $$->specifiers = $1;
};
/*
| 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
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);
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 {
.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 {
}
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;
}
* 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: {
$$ = $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,
.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;
}
%%
{
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);
+}
projects / cdecl99.git / blobdiff