From: Jaskaran Singh <jaskaransingh7654321@gmail.com> To: cocci@systeme.lip6.fr Cc: linux-kernel-mentees@lists.linuxfoundation.org Subject: [Cocci] [PATCH v4 12/14] parsing_c: parser: cpp_other end attributes production Date: Fri, 5 Jun 2020 19:13:20 +0530 [thread overview] Message-ID: <20200605134322.15307-13-jaskaransingh7654321@gmail.com> (raw) In-Reply-To: <20200605134322.15307-1-jaskaransingh7654321@gmail.com> Add a production for a macro call in the cpp_other rule of Coccinelle's C parser. This parses the following C code from Linux v5.6-rc7 successfully: arch/x86/kernel/irq_64.c: DEFINE_PER_CPU_PAGE_ALIGNED(struct irq_stack, irq_stack_backing_store) __visible; Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com> --- parsing_c/parser_c.mly | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/parsing_c/parser_c.mly b/parsing_c/parser_c.mly index 71e58e5b..9cd8761e 100644 --- a/parsing_c/parser_c.mly +++ b/parsing_c/parser_c.mly @@ -2182,7 +2182,8 @@ cpp_other: * the rule are slightly different, they can't be statement and so expr * at the top, only decl or function definition. *)*/ - | identifier TOPar argument_list TCPar TPtVirg + + | identifier TOPar argument_list TCPar end_attributes_opt TPtVirg { if args_are_params $3 then @@ -2202,16 +2203,17 @@ cpp_other: Declaration( DeclList ([{v_namei = Some (id,NoInit); v_type = ty; v_storage = unwrap sto; v_local = NotLocalDecl; - v_attr = attrs; v_endattr = Ast_c.noattr; + v_attr = attrs; v_endattr = $5; v_type_bis = ref None; },[]], - ($5::iistart::snd sto))) + ($6::iistart::snd sto))) else Declaration - (MacroDecl((NoSto, fst $1, $3, true), [snd $1;$2;$4;$5;fakeInfo()])) + (MacroDecl((NoSto, fst $1, $3, true), [snd $1;$2;$4;$6;fakeInfo()])) (* old: MacroTop (fst $1, $3, [snd $1;$2;$4;$5]) *) } + /* cheap solution for functions with no return type. Not really a cpp_other, but avoids conflicts */ | identifier TOPar argument_list TCPar compound { -- 2.21.1 _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci
WARNING: multiple messages have this Message-ID (diff)
From: Jaskaran Singh <jaskaransingh7654321@gmail.com> To: cocci@systeme.lip6.fr Cc: julia.lawall@inria.fr, jaskaransingh7654321@gmail.com, linux-kernel-mentees@lists.linuxfoundation.org Subject: [Linux-kernel-mentees] [PATCH v4 12/14] parsing_c: parser: cpp_other end attributes production Date: Fri, 5 Jun 2020 19:13:20 +0530 [thread overview] Message-ID: <20200605134322.15307-13-jaskaransingh7654321@gmail.com> (raw) In-Reply-To: <20200605134322.15307-1-jaskaransingh7654321@gmail.com> Add a production for a macro call in the cpp_other rule of Coccinelle's C parser. This parses the following C code from Linux v5.6-rc7 successfully: arch/x86/kernel/irq_64.c: DEFINE_PER_CPU_PAGE_ALIGNED(struct irq_stack, irq_stack_backing_store) __visible; Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com> --- parsing_c/parser_c.mly | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/parsing_c/parser_c.mly b/parsing_c/parser_c.mly index 71e58e5b..9cd8761e 100644 --- a/parsing_c/parser_c.mly +++ b/parsing_c/parser_c.mly @@ -2182,7 +2182,8 @@ cpp_other: * the rule are slightly different, they can't be statement and so expr * at the top, only decl or function definition. *)*/ - | identifier TOPar argument_list TCPar TPtVirg + + | identifier TOPar argument_list TCPar end_attributes_opt TPtVirg { if args_are_params $3 then @@ -2202,16 +2203,17 @@ cpp_other: Declaration( DeclList ([{v_namei = Some (id,NoInit); v_type = ty; v_storage = unwrap sto; v_local = NotLocalDecl; - v_attr = attrs; v_endattr = Ast_c.noattr; + v_attr = attrs; v_endattr = $5; v_type_bis = ref None; },[]], - ($5::iistart::snd sto))) + ($6::iistart::snd sto))) else Declaration - (MacroDecl((NoSto, fst $1, $3, true), [snd $1;$2;$4;$5;fakeInfo()])) + (MacroDecl((NoSto, fst $1, $3, true), [snd $1;$2;$4;$6;fakeInfo()])) (* old: MacroTop (fst $1, $3, [snd $1;$2;$4;$5]) *) } + /* cheap solution for functions with no return type. Not really a cpp_other, but avoids conflicts */ | identifier TOPar argument_list TCPar compound { -- 2.21.1 _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next prev parent reply other threads:[~2020-06-05 13:44 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-05 13:43 [Cocci] [PATCH v4 00/14] cocci: Improve C parsing of attributes Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 01/14] parsing_c: parse_c: Ignore TMacroAttr and TMacroEndAttr in passed tokens Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 02/14] parsing_c: parsing_hacks: Label end attributes correctly Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 03/14] parsing_c: parsing_hacks: Commentize attributes before qualif/type Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 04/14] parsing_c: parser: Add rule for multiple end attributes Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 05/14] parsing_c: parser: Add expression statement attributes Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 06/14] parsing_c: parser: Add rule for optional end attributes Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 07/14] parsing_c: parser: Add attribute production in spec_qualif_list Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 08/14] parsing_c: parser: Add init_declarator_attrs rule Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 09/14] parsing_c: parser: Add field declaration end attributes production Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 10/14] parsing_c: parser: Handle struct/union/enum end attributes Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 11/14] parsing_c: parser: Add MacroDecl end attributes production Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` Jaskaran Singh [this message] 2020-06-05 13:43 ` [Linux-kernel-mentees] [PATCH v4 12/14] parsing_c: parser: cpp_other " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 13/14] parsing_c: cpp_token_c: Introduce MACROANNOTATION hint Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:43 ` [Cocci] [PATCH v4 14/14] cocci: standard.h: Annotate attributes with MACROANNOTATION Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " Jaskaran Singh 2020-06-05 13:48 ` [Cocci] [PATCH v4 00/14] cocci: Improve C parsing of attributes Jaskaran Singh 2020-06-05 13:48 ` [Linux-kernel-mentees] " Jaskaran Singh
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=20200605134322.15307-13-jaskaransingh7654321@gmail.com \ --to=jaskaransingh7654321@gmail.com \ --cc=cocci@systeme.lip6.fr \ --cc=linux-kernel-mentees@lists.linuxfoundation.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.