Type attributes for struct can be placed either just after the
keyword 'struct' or after the '}' ending its definition but this
later case is currently ignored.
Prepare the handling of this by factoring the code common to both
cases in a single place.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx>
---
parse.c | 11 +++++------
validation/parsing/enum-attr.c | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/parse.c b/parse.c
index d6343f0e48bf..99d810910dab 100644
--- a/parse.c
+++ b/parse.c
@@ -745,12 +745,7 @@ static struct token *struct_union_enum_specifier(enum type type,
if (sym->symbol_list)
error_die(token->pos, "redefinition of %s", show_typename (sym));
sym->pos = *repos;
- token = parse(token->next, sym);
- token = expect(token, '}', "at end of struct-union-enum-specifier");
-
- // Mark the structure as needing re-examination
- sym->examined = 0;
- sym->endpos = token->pos;
+ goto end;
}
return token;
}
@@ -763,10 +758,14 @@ static struct token *struct_union_enum_specifier(enum type type,
}
sym = alloc_symbol(token->pos, type);
+end:
set_current_scope(sym); // used by dissect
token = parse(token->next, sym);
ctx->ctype.base_type = sym;
token = expect(token, '}', "at end of specifier");
+
+ // Mark the structure as needing re-examination
+ sym->examined = 0;
sym->endpos = token->pos;
return token;
diff --git a/validation/parsing/enum-attr.c b/validation/parsing/enum-attr.c
index a962d8b417af..8d851a162135 100644
--- a/validation/parsing/enum-attr.c
+++ b/validation/parsing/enum-attr.c
@@ -21,9 +21,9 @@ enum bad {
parsing/enum-attr.c:10:15: error: typename in expression
parsing/enum-attr.c:10:15: error: undefined identifier '__attribute__'
parsing/enum-attr.c:10:15: error: bad constant expression type
-parsing/enum-attr.c:10:22: error: Expected } at end of struct-union-enum-specifier
+parsing/enum-attr.c:10:22: error: Expected } at end of specifier
parsing/enum-attr.c:10:22: error: got 33
-parsing/enum-attr.c:14:18: error: Expected } at end of struct-union-enum-specifier
+parsing/enum-attr.c:14:18: error: Expected } at end of specifier
parsing/enum-attr.c:14:18: error: got __attribute__
* check-error-end
*/
--
2.29.2
