From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: julia.lawall@inria.fr,
Jaskaran Singh <jaskaransingh7654321@gmail.com>,
linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Linux-kernel-mentees] [PATCH v3 1/3] parsing_c: Handle case of macro before typedef
Date: Tue, 21 Jan 2020 17:57:17 +0530 [thread overview]
Message-ID: <20200121122719.24226-1-jaskaransingh7654321@gmail.com> (raw)
In-Reply-To: <20200121080455.24748-1-jaskaransingh7654321@gmail.com>
For the following case:
<macro> <typedef> <identifier>
A case in parsing_hacks.ml sometimes mislabels <macro> as a
typedef identifier.
If typedef is a known typedef (such as u8 or *_t), then label <macro>
as a CppMacro. Subsequent cases will continue to label <typedef>
correctly as a typedef identifier.
Following are results of --parse-c on the Linux Kernel v5.5-rc4:
Before:
nb good = 18956150, nb passed = 134061 =========> 0.70% passed
After:
nb good = 18956150, nb passed = 134062 =========> 0.70% passed
Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
---
parsing_c/parsing_hacks.ml | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml
index 8374731b..23d675cf 100644
--- a/parsing_c/parsing_hacks.ml
+++ b/parsing_c/parsing_hacks.ml
@@ -2184,6 +2184,41 @@ 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
_______________________________________________
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-01-21 12:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-21 8:04 [Linux-kernel-mentees] [PATCH v2 0/3] cocci: Improve management of macros before typedefs Jaskaran Singh
2020-01-21 8:04 ` [Linux-kernel-mentees] [PATCH v2 1/3] parsing_c: Handle case of macro before typedef Jaskaran Singh
2020-01-21 8:04 ` [Linux-kernel-mentees] [PATCH v2 2/3] parsing_hacks: Add bool to list of known typedefs Jaskaran Singh
2020-01-21 8:04 ` [Linux-kernel-mentees] [PATCH v2 3/3] tests: Add test case for <macro> bool <ident> Jaskaran Singh
2020-01-21 12:24 ` [Linux-kernel-mentees] [PATCH v3 0/3] cocci: Improve management of macros before typedefs Jaskaran Singh
2020-01-25 15:01 ` Julia Lawall
2020-01-21 12:27 ` Jaskaran Singh [this message]
2020-01-21 12:27 ` [Linux-kernel-mentees] [PATCH v3 2/3] parsing_hacks: Add bool to list of known typedefs Jaskaran Singh
2020-01-21 12:27 ` [Linux-kernel-mentees] [PATCH v3 3/3] tests: Add test case for <macro> bool <ident> 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=20200121122719.24226-1-jaskaransingh7654321@gmail.com \
--to=jaskaransingh7654321@gmail.com \
--cc=cocci@systeme.lip6.fr \
--cc=julia.lawall@inria.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).