From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Cocci] [PATCH] parsing_c: Handle case of macro before typedef
Date: Sun, 19 Jan 2020 18:48:46 +0530 [thread overview]
Message-ID: <20200119131846.23302-1-jaskaransingh7654321@gmail.com> (raw)
For the following case:
<macro> <typedef> <identifier>
A case in parsing_hacks.ml sometimes mislabels <macro> as a
typedef ident.
If <typedef> is a known typedef (such as u8 or *_t), then label
<macro> as a CppMacro. Subsequent cases will then label <typedef>
correctly.
Following is a diff of --parse-c on the Linux Kernel v5.5-rc4:
Before
---
After
nb good = 18956150, nb passed = 134061 =========> 0.70% passed
---
nb good = 18956150, nb passed = 134062 =========> 0.70% passed
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 8374731b..685a4908 100644
--- a/parsing_c/parsing_hacks.ml
+++ b/parsing_c/parsing_hacks.ml
@@ -2184,6 +2184,39 @@ let lookahead2 ~pass next before =
&& ok_typedef s && is_macro s2 && is_type type_
->
TIdent (s, i1)
+
+ (* xx yy zz : xx is a macro *)
+ | (TIdent (s, i1)::TIdent (s2, i2)::TIdent(_,_)::_ , _)
+ when not_struct_enum before
+ && ok_typedef s2
+ && is_known_typdef s2
+ ->
+ TCommentCpp(Token_c.CppMacro, i1)
+
+ (* xx yy zz : xx is a typedef ident *)
+ | (TIdent (s, i1)::TIdent (s2, i2)::TIdent(_,_)::_ , _)
+ when not_struct_enum before
+ && ok_typedef s
+ ->
+ msg_typedef s i1 2; LP.add_typedef_root s i1;
+ TypedefIdent (s, i1)
+
+ (* xx yy * zz : xx is a macro *)
+ | (TIdent (s, i1)::TIdent (s2, i2)::ptr , _)
+ when pointer ~followed_by:(function TIdent _ -> true | _ -> false) ptr
+ && not_struct_enum before
+ && ok_typedef s2 && is_known_typdef s2
+ ->
+ TCommentCpp(Token_c.CppMacro, i1)
+
+ (* xx yy * zz : xx is a typedef ident *)
+ | (TIdent (s, i1)::TIdent (s2, i2)::ptr , _)
+ when pointer ~followed_by:(function TIdent _ -> true | _ -> false) ptr && not_struct_enum before
+ && ok_typedef s
+ ->
+ msg_typedef s i1 2; LP.add_typedef_root s i1;
+ TypedefIdent (s, i1)
+
(* xx yy *)
| (TIdent (s, i1)::TIdent (s2, i2)::rest , _) when not_struct_enum before
&& ok_typedef s && not (is_macro_paren s2 rest)
--
2.21.1
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
next reply other threads:[~2020-01-19 13:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 13:18 Jaskaran Singh [this message]
2020-01-19 13:25 ` [Cocci] [PATCH] parsing_c: Handle case of macro before typedef Jaskaran Singh
2020-01-19 13:46 Jaskaran Singh
2020-01-21 6:28 ` Julia Lawall
2020-01-21 9:35 Markus Elfring
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=20200119131846.23302-1-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: 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).