linux-kernel-mentees.lists.linuxfoundation.org archive mirror
 help / color / mirror / Atom feed
From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: julia.lawall@inria.fr, jaskaransingh7654321@gmail.com,
	linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Linux-kernel-mentees] [PATCH 06/30] parsing_cocci: iso_pattern: Reflect Macrodecl attributes
Date: Sun, 24 May 2020 22:49:11 +0530	[thread overview]
Message-ID: <20200524171935.2504-7-jaskaransingh7654321@gmail.com> (raw)
In-Reply-To: <20200524171935.2504-1-jaskaransingh7654321@gmail.com>

Macrodecl attributes are added to the SmPL AST. Reflect these changes in
iso_pattern.ml.

Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
---
 parsing_cocci/iso_pattern.ml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/parsing_cocci/iso_pattern.ml b/parsing_cocci/iso_pattern.ml
index 9df21fb9..ebb83e23 100644
--- a/parsing_cocci/iso_pattern.ml
+++ b/parsing_cocci/iso_pattern.ml
@@ -965,9 +965,12 @@ let match_maker checks_needed context_required whencode_allowed =
 		     params1 params;
                    match_option varargs_equal va1a va1b
                  ]
-	  | (Ast0.MacroDecl(stga,namea,lp1,argsa,rp1,sc1),
-	     Ast0.MacroDecl(stgb,nameb,lp,argsb,rp,sc)) ->
-	       if bool_match_option mcode_equal stga stgb
+	  | (Ast0.MacroDecl(stga,namea,lp1,argsa,rp1,attra,sc1),
+	     Ast0.MacroDecl(stgb,nameb,lp,argsb,rp,attrb,sc)) ->
+	       if bool_match_option mcode_equal stga stgb &&
+                 (List.length attra = List.length attrb &&
+                  List.fold_left2 (fun p a b -> p && mcode_equal a b) true
+                    attra attrb) (* no metavars *)
 	       then
 		 conjunct_many_bindings
 		   [match_ident namea nameb;
-- 
2.21.1

_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

  parent reply	other threads:[~2020-05-24 17:20 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-24 17:19 [Linux-kernel-mentees] [PATCH 00/30] cocci: Add macrodecl attributes to C and SmPL ASTs Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 01/30] parsing_cocci: ast0_cocci: Add Macrodecl attributes Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 02/30] parsing_cocci: parser: Parse " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 03/30] parsing_cocci: visitor_ast0: Visit " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 04/30] parsing_cocci: unparse_ast0: Reflect " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 05/30] parsing_cocci: index: " Jaskaran Singh
2020-05-24 17:19 ` Jaskaran Singh [this message]
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 07/30] parsing_cocci: type_infer: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 08/30] parsing_cocci: arity: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 09/30] parsing_cocci: check_meta: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 10/30] parsing_cocci: compute_lines: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 11/30] parsing_cocci: context_neg: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 12/30] parsing_cocci: single_statement: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 13/30] parsing_cocci: ast_cocci: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 14/30] parsing_cocci: visitor_ast: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 15/30] parsing_cocci: pretty_print_cocci: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 16/30] parsing_cocci: disjdistr: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 17/30] parsing_cocci: adjust_pragmas: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 18/30] parsing_cocci: unify_ast: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 19/30] parsing_cocci: ast0toast: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 20/30] parsing_c: ast_c: Add " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 21/30] parsing_c: parser_c: Reflect " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 22/30] parsing_c: visitor_c: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 23/30] parsing_c: pretty_print_c: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 24/30] parsing_c: unparse_cocci: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 25/30] engine: check_exhaustive_pattern: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 26/30] engine: cocci_vs_c: Match " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 27/30] ocaml: coccilib: Reflect " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 28/30] tools: spgen: " Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 29/30] tests: Add test case to remove macrodecl attributes Jaskaran Singh
2020-05-24 17:19 ` [Linux-kernel-mentees] [PATCH 30/30] tests: Add test case to detect a macrodecl attribute 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=20200524171935.2504-7-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).