From: Julia Lawall <julia.lawall@inria.fr>
To: Jaskaran Singh <jaskaransingh7654321@gmail.com>
Cc: linux-kernel-mentees@lists.linuxfoundation.org,
cocci@systeme.lip6.fr, skhan@linuxfoundation.org
Subject: Re: [Cocci] [PATCH] parsing_c: Handle case of annotation in function proto/def
Date: Thu, 9 Jan 2020 11:47:23 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.21.2001091147060.10786@hadrien> (raw)
In-Reply-To: <20200108150518.6241-1-jaskaransingh7654321@gmail.com>
On Wed, 8 Jan 2020, Jaskaran Singh wrote:
> For the following case:
>
> [const_vol] <type> [ptr] <annotation> <identifier> <open_par>
>
> The lookahead function in Parsing_hacks would mislabel <annotation> as a
> CppDirective, causing pretty printing errors.
>
> Add a case in the lookahead function for handling this case.
Applied. Thanks!
julia
>
> Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
> ---
> parsing_c/parsing_hacks.ml | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/parsing_c/parsing_hacks.ml b/parsing_c/parsing_hacks.ml
> index 43421647..3f031f21 100644
> --- a/parsing_c/parsing_hacks.ml
> +++ b/parsing_c/parsing_hacks.ml
> @@ -2066,6 +2066,20 @@ let lookahead2 ~pass next before =
> && is_type type_ ->
> TCommentCpp (Token_c.CppDirective, i1)
>
> + (* tt xx yy ( : xx is an annot *)
> + | (TIdent (s, i1)::TIdent (s2, i2)::TOPar _::_, seen::_)
> + when LP.current_context () = LP.InTopLevel
> + && (is_struct_enum before || is_type seen)
> + && s ==~ regexp_annot ->
> + TCommentCpp (Token_c.CppMacro, i1)
> +
> + (* tt * xx yy ( : xx is an annot *)
> + | (TIdent (s, i1)::TIdent (s2, i2)::TOPar _::_, ptr)
> + when LP.current_context () = LP.InTopLevel
> + && pointer ptr
> + && s ==~ regexp_annot ->
> + TCommentCpp (Token_c.CppMacro, i1)
> +
> (* tt xx yy; : yy is an annot *)
> | (TIdent (s, i1)::(TPtVirg _|TEq _)::_, TIdent (s2, i2)::type_::rest)
> when (is_struct_enum (type_::rest)
> --
> 2.21.1
>
>
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
prev parent reply other threads:[~2020-01-09 10:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 15:05 [Cocci] [PATCH] parsing_c: Handle case of annotation in function proto/def Jaskaran Singh
2020-01-09 10:47 ` 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.2001091147060.10786@hadrien \
--to=julia.lawall@inria.fr \
--cc=cocci@systeme.lip6.fr \
--cc=jaskaransingh7654321@gmail.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=skhan@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).