From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: linux-sparse@vger.kernel.org
Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Jacob Keller <jacob.e.keller@intel.com>
Subject: [PATCH v2 12/16] struct-attr: prepare to handle attributes at the end of struct definitions (3)
Date: Sat, 26 Dec 2020 18:51:25 +0100 [thread overview]
Message-ID: <20201226175129.9621-13-luc.vanoostenryck@gmail.com> (raw)
In-Reply-To: <20201226175129.9621-1-luc.vanoostenryck@gmail.com>
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 having the 3 following cases in sequence:
1) a tag is present
2) no tag present but is followed by an opening brace
3) neither of these, so it's an error.
---
parse.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/parse.c b/parse.c
index a90dcf7f7e4a..a67d567145d0 100644
--- a/parse.c
+++ b/parse.c
@@ -747,18 +747,15 @@ 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;
- goto end;
- }
-
- // private struct/union/enum type
- if (!match_op(token, '{')) {
+ } else if (match_op(token, '{')) {
+ // private struct/union/enum type
+ sym = alloc_symbol(token->pos, type);
+ } else {
sparse_error(token->pos, "expected declaration");
ctx->ctype.base_type = &bad_ctype;
return token;
}
- sym = alloc_symbol(token->pos, type);
-end:
set_current_scope(sym); // used by dissect
token = parse(token->next, sym);
ctx->ctype.base_type = sym;
--
2.29.2
next prev parent reply other threads:[~2020-12-26 17:53 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-26 17:51 [PATCH 00/16] support __packed struct Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 01/16] add testcases for dubious enum values Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 02/16] add testcases for exotic " Luc Van Oostenryck
2020-12-28 16:10 ` Ramsay Jones
2020-12-28 20:00 ` Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 03/16] add testcases for enum attributes Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 04/16] add testcases for type attributes Luc Van Oostenryck
2020-12-28 16:13 ` Ramsay Jones
2020-12-28 19:59 ` Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 05/16] add testcases for packed structures Luc Van Oostenryck
2020-12-28 16:17 ` Ramsay Jones
2020-12-28 20:01 ` Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 06/16] add testcases for packed bitfields Luc Van Oostenryck
2020-12-28 16:28 ` Ramsay Jones
2020-12-28 20:05 ` Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 07/16] apply_ctype: use self-explanatory argument name Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 08/16] apply_ctype: reverse the order of arguments Luc Van Oostenryck
2020-12-28 16:47 ` Ramsay Jones
2020-12-28 20:37 ` Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 09/16] apply_ctype: move up its declaration Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 10/16] struct-attr: prepare to handle attributes at the end of struct definitions (1) Luc Van Oostenryck
2020-12-28 16:54 ` Ramsay Jones
2020-12-28 20:49 ` Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 11/16] struct-attr: prepare to handle attributes at the end of struct definitions (2) Luc Van Oostenryck
2020-12-26 17:51 ` Luc Van Oostenryck [this message]
2020-12-26 17:51 ` [PATCH v2 13/16] struct-attr: fix type attribute like 'struct __attr { ... }' Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 14/16] struct-attr: fix: do not ignore struct/union/enum type attributes Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 15/16] packed: no out-of-bound access of packed bitfields Luc Van Oostenryck
2020-12-28 17:10 ` Ramsay Jones
2020-12-28 21:12 ` Luc Van Oostenryck
2020-12-26 17:51 ` [PATCH v2 16/16] packed: add support for __packed struct Luc Van Oostenryck
2020-12-28 17:18 ` [PATCH 00/16] support " Ramsay Jones
2020-12-28 21:33 ` Luc Van Oostenryck
2021-01-05 17:56 ` Jacob Keller
2021-01-05 20:39 ` Luc Van Oostenryck
2021-01-05 22:07 ` Jacob Keller
2021-01-05 17:55 ` Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201226175129.9621-13-luc.vanoostenryck@gmail.com \
--to=luc.vanoostenryck@gmail.com \
--cc=jacob.e.keller@intel.com \
--cc=linux-sparse@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).