From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Cocci] [PATCH] parsing_c: handle space and ctx newline around minus toks
Date: Tue, 19 Nov 2019 15:04:07 +0530 [thread overview]
Message-ID: <20191119093407.23603-1-jaskaransingh7654321@gmail.com> (raw)
Handle the following case:
space + minus + context newline
In this case, the space should be dropped except if it is followed
by any newline. This should be done just before the minus tokens
are removed from the token stream.
This is useful for situations like the following. Here, the space next to
the right paranthesis should be dropped:
if(a)
-{
-result = b;
goto c;
-}
Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
---
parsing_c/unparse_c.ml | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/parsing_c/unparse_c.ml b/parsing_c/unparse_c.ml
index 778a59ab..c6478c5a 100644
--- a/parsing_c/unparse_c.ml
+++ b/parsing_c/unparse_c.ml
@@ -1300,21 +1300,28 @@ let rec drop_space_at_endline = function
drop_space_at_endline rest
| ((T2(Parser_c.TCommentSpace _,Ctx,_i,_h)) as a)::rest ->
let (outer_spaces,rest) = span is_space rest in
- let minus_or_comment_or_space_nocpp = function
- | (T2(Parser_c.TCommentNewline _,_,_i,_)) -> false
- | T2(_,Min adj,_,_) -> true
- | (T2(Parser_c.TCommentSpace _,Ctx,_i,_)) -> true
+ let match_till_context_nl = function
+ | (T2(Parser_c.TCommentNewline _,_,_i,_) :: _) -> false
+ | (T2(_,Min adj,_,_) :: _) -> true
| x -> false in
- let (minus,rest) = span minus_or_comment_or_space_nocpp rest in
- let fail _ = a :: outer_spaces @ minus @ (drop_space_at_endline rest) in
- if List.exists is_minus minus
+ if match_till_context_nl rest
then
- match rest with
- | ((T2(Parser_c.TCommentNewline _,Ctx,_i,_h)) as a)::rest ->
- (* drop trailing spaces *)
- minus @ a :: (drop_space_at_endline rest)
- | _ -> fail ()
- else fail ()
+ let minus_or_comment_or_space_nocpp = function
+ | (T2(Parser_c.TCommentNewline _,Ctx,_i,_)) -> false
+ | T2(_,Min adj,_,_) -> true
+ | (T2(Parser_c.TCommentSpace _,Ctx,_i,_)) -> true
+ | x -> false in
+ let (minus,rest) = span minus_or_comment_or_space_nocpp rest in
+ let fail _ = a :: outer_spaces @ minus @ (drop_space_at_endline rest) in
+ if List.exists is_minus minus
+ then
+ match rest with
+ | ((T2(Parser_c.TCommentNewline _,Ctx,_i,_h)) as a)::rest ->
+ (* drop trailing spaces *)
+ minus @ a :: (drop_space_at_endline rest)
+ | _ -> fail ()
+ else fail ()
+ else a :: outer_spaces @ (drop_space_at_endline rest)
| a :: rest ->
a :: drop_space_at_endline rest
--
2.21.0
_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci
reply other threads:[~2019-11-19 9:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20191119093407.23603-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).