From: Jaskaran Singh <jaskaransingh7654321@gmail.com> To: cocci@systeme.lip6.fr Cc: linux-kernel-mentees@lists.linuxfoundation.org Subject: [Cocci] [PATCH v4 03/14] parsing_c: parsing_hacks: Commentize attributes before qualif/type Date: Fri, 5 Jun 2020 19:13:11 +0530 [thread overview] Message-ID: <20200605134322.15307-4-jaskaransingh7654321@gmail.com> (raw) In-Reply-To: <20200605134322.15307-1-jaskaransingh7654321@gmail.com> For the following example from fs/btrfs/ctree.h in Linux v5.6-rc7: __cold __noreturn static inline void assertfail(const char *expr, const char *file, int line) { pr_err("assertion failed: %s, in %s:%d\n", expr, file, line); BUG(); } __cold and __noreturn are not labeled correctly, leading to C parsing errors. Add a case to commentize attributes before a storage qualifier/type qualifier/type correctly. Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com> --- parsing_c/parsing_hacks.ml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml index 74c3ba60..0254fc7f 100644 --- a/parsing_c/parsing_hacks.ml +++ b/parsing_c/parsing_hacks.ml @@ -1952,6 +1952,29 @@ let is_type = function | Tshort _ -> true | _ -> false +let is_type_qualif = function + | Tconst _ + | Tvolatile _ -> true + | _ -> false + +let is_storage_spec = function + | Tstatic _ + | Tregister _ + | Textern _ + | Tauto _ -> true + | _ -> false + +let rec is_idents ?(followed_by=fun _ -> true) ts = + let rec loop l = + match l with + | x::xs when ident x -> loop xs + | x::xs -> followed_by x + | [] -> failwith "unexpected end of token stream" in + match ts with + | x::xs when ident x -> loop xs + | x::xs -> followed_by x + | _ -> false + let is_cparen = function (TCPar _) -> true | _ -> false let is_oparen = function (TOPar _) -> true | _ -> false @@ -2134,6 +2157,16 @@ let lookahead2 ~pass next before = else TCommentCpp (Token_c.CppDirective, i1) + (* tt xx yy *) + | (TIdent (s, i1)::rest, _) + when not_struct_enum before + && is_idents + ~followed_by: + (function x -> + is_type x || is_storage_spec x || is_type_qualif x) rest + && s ==~ regexp_annot -> + TCommentCpp (Token_c.CppMacro, i1) + | (TIdent (s2, i2)::_ , TIdent (s, i1)::seen::_) when not_struct_enum before && is_macro s2 && is_type seen -> -- 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 03/14] parsing_c: parsing_hacks: Commentize attributes before qualif/type Date: Fri, 5 Jun 2020 19:13:11 +0530 [thread overview] Message-ID: <20200605134322.15307-4-jaskaransingh7654321@gmail.com> (raw) In-Reply-To: <20200605134322.15307-1-jaskaransingh7654321@gmail.com> For the following example from fs/btrfs/ctree.h in Linux v5.6-rc7: __cold __noreturn static inline void assertfail(const char *expr, const char *file, int line) { pr_err("assertion failed: %s, in %s:%d\n", expr, file, line); BUG(); } __cold and __noreturn are not labeled correctly, leading to C parsing errors. Add a case to commentize attributes before a storage qualifier/type qualifier/type correctly. Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com> --- parsing_c/parsing_hacks.ml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml index 74c3ba60..0254fc7f 100644 --- a/parsing_c/parsing_hacks.ml +++ b/parsing_c/parsing_hacks.ml @@ -1952,6 +1952,29 @@ let is_type = function | Tshort _ -> true | _ -> false +let is_type_qualif = function + | Tconst _ + | Tvolatile _ -> true + | _ -> false + +let is_storage_spec = function + | Tstatic _ + | Tregister _ + | Textern _ + | Tauto _ -> true + | _ -> false + +let rec is_idents ?(followed_by=fun _ -> true) ts = + let rec loop l = + match l with + | x::xs when ident x -> loop xs + | x::xs -> followed_by x + | [] -> failwith "unexpected end of token stream" in + match ts with + | x::xs when ident x -> loop xs + | x::xs -> followed_by x + | _ -> false + let is_cparen = function (TCPar _) -> true | _ -> false let is_oparen = function (TOPar _) -> true | _ -> false @@ -2134,6 +2157,16 @@ let lookahead2 ~pass next before = else TCommentCpp (Token_c.CppDirective, i1) + (* tt xx yy *) + | (TIdent (s, i1)::rest, _) + when not_struct_enum before + && is_idents + ~followed_by: + (function x -> + is_type x || is_storage_spec x || is_type_qualif x) rest + && s ==~ regexp_annot -> + TCommentCpp (Token_c.CppMacro, i1) + | (TIdent (s2, i2)::_ , TIdent (s, i1)::seen::_) when not_struct_enum before && is_macro s2 && is_type seen -> -- 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 ` Jaskaran Singh [this message] 2020-06-05 13:43 ` [Linux-kernel-mentees] [PATCH v4 03/14] parsing_c: parsing_hacks: Commentize attributes before qualif/type 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 ` [Cocci] [PATCH v4 12/14] parsing_c: parser: cpp_other " Jaskaran Singh 2020-06-05 13:43 ` [Linux-kernel-mentees] " 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-4-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.