From: Julia Lawall <julia.lawall@inria.fr>
To: Jaskaran Singh <jaskaransingh7654321@gmail.com>
Cc: linux-kernel-mentees@lists.linuxfoundation.org, cocci@systeme.lip6.fr
Subject: Re: [Linux-kernel-mentees] [PATCH] parsing_c: Handle case of annotation and ; or = after ident
Date: Wed, 8 Jan 2020 14:00:40 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.21.2001081359400.2069@hadrien> (raw)
In-Reply-To: <20200108113112.26209-1-jaskaransingh7654321@gmail.com>
On Wed, 8 Jan 2020, Jaskaran Singh wrote:
> For the following case:
>
> [const_vol] <type> [ptr] <identifier> <annotation> <semicolon|eq>
>
> The lookahead function in Parsing_hacks would mislabel <identifier> as a
> CppDirective.
>
> Add cases in the lookahead function for handling this case.
>
> Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
Looks good. There are a lot of __ro_after_inits that now get properly
recognized as attributes. The patch is applied.
julia
> ---
> parsing_c/parsing_hacks.ml | 31 +++++++++++++++++++++++++++++++
> 1 file changed, 31 insertions(+)
>
> diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml
> index 56857f3c..43421647 100644
> --- a/parsing_c/parsing_hacks.ml
> +++ b/parsing_c/parsing_hacks.ml
> @@ -1887,6 +1887,11 @@ let not_struct_enum = function
> (Parser_c.Tstruct _ | Parser_c.Tunion _ | Parser_c.Tenum _)::_ -> false
> | _ -> true
>
> +let is_struct_enum = function
> + | (Parser_c.TIdent _)::
> + (Parser_c.Tstruct _ | Parser_c.Tunion _ | Parser_c.Tenum _)::_ -> true
> + | _ -> false
> +
> let not_opar = function
> TOPar _ -> false
> | _ -> true
> @@ -2061,6 +2066,32 @@ let lookahead2 ~pass next before =
> && is_type type_ ->
> TCommentCpp (Token_c.CppDirective, i1)
>
> + (* tt xx yy; : yy is an annot *)
> + | (TIdent (s, i1)::(TPtVirg _|TEq _)::_, TIdent (s2, i2)::type_::rest)
> + when (is_struct_enum (type_::rest)
> + || is_type type_)
> + && s ==~ regexp_annot ->
> + TCommentCpp (Token_c.CppMacro, i1)
> +
> + (* tt * xx yy; : yy is an annot *)
> + | (TIdent (s, i1)::(TPtVirg _|TEq _)::_, TIdent (s2, i2)::ptr)
> + when pointer ptr
> + && s ==~ regexp_annot ->
> + TCommentCpp (Token_c.CppMacro, i1)
> +
> + (* tt xx yy; : yy is an annot, so xx is an ident *)
> + | (TIdent (s, i1)::TIdent (s2, i2)::(TPtVirg _|TEq _)::_, seen::_)
> + when (is_struct_enum before
> + || is_type seen)
> + && s2 ==~ regexp_annot ->
> + TIdent (s, i1)
> +
> + (* tt * xx yy; : yy is an annot, so xx is an ident *)
> + | (TIdent (s, i1)::TIdent (s2, i2)::(TPtVirg _|TEq _)::_, ptr)
> + when pointer ptr
> + && s2 ==~ regexp_annot ->
> + TIdent (s, i1)
> +
> (* tt xx yy *)
> | (TIdent (s, i1)::TIdent (s2, i2)::_ , seen::_)
> when not_struct_enum before
> --
> 2.21.1
>
>
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
prev parent reply other threads:[~2020-01-08 13:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 11:31 [Linux-kernel-mentees] [PATCH] parsing_c: Handle case of annotation and ; or = after ident Jaskaran Singh
2020-01-08 13:00 ` Julia Lawall [this message]
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=alpine.DEB.2.21.2001081359400.2069@hadrien \
--to=julia.lawall@inria.fr \
--cc=cocci@systeme.lip6.fr \
--cc=jaskaransingh7654321@gmail.com \
--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).