cocci.inria.fr archive mirror
 help / color / mirror / Atom feed
From: Jaskaran Singh <jaskaransingh7654321@gmail.com>
To: cocci@systeme.lip6.fr
Cc: linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Cocci] [PATCH 10/23] parsing_cocci: iso_pattern: Reflect Parameter attributes
Date: Mon, 27 Apr 2020 17:38:21 +0530	[thread overview]
Message-ID: <20200427120834.380-11-jaskaransingh7654321@gmail.com> (raw)
In-Reply-To: <20200427120834.380-1-jaskaransingh7654321@gmail.com>

Parameter 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 | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/parsing_cocci/iso_pattern.ml b/parsing_cocci/iso_pattern.ml
index 9df21fb9..09a39bdf 100644
--- a/parsing_cocci/iso_pattern.ml
+++ b/parsing_cocci/iso_pattern.ml
@@ -1165,10 +1165,24 @@ let match_maker checks_needed context_required whencode_allowed =
 	if not(checks_needed) || not(context_required) || is_context p
 	then
 	  match (up,Ast0.unwrap p) with
-	    (Ast0.VoidParam(tya),Ast0.VoidParam(tyb)) -> match_typeC tya tyb
-	  | (Ast0.Param(tya,ida),Ast0.Param(tyb,idb)) ->
-	      conjunct_bindings (match_typeC tya tyb)
-		(match_option match_ident ida idb)
+	    (Ast0.VoidParam(tya,attra),Ast0.VoidParam(tyb,attrb)) ->
+               if
+                (List.length attra = List.length attrb &&
+                 List.fold_left2 (fun p a b -> p && mcode_equal a b) true
+                 attra attrb)
+               then
+                 match_typeC tya tyb
+               else return false
+	  | (Ast0.Param(tya,ida,attra),Ast0.Param(tyb,idb,attrb)) ->
+               if
+                (List.length attra = List.length attrb &&
+                 List.fold_left2 (fun p a b -> p && mcode_equal a b) true
+                 attra attrb)
+              then
+	        conjunct_bindings (match_typeC tya tyb)
+		  (match_option match_ident ida idb)
+              else
+                return false
 	  | (Ast0.PComma(c1),Ast0.PComma(c)) -> check_mcode c1 c
 	  | (Ast0.Pdots(d1),Ast0.Pdots(d)) -> check_mcode d1 d
 	  | (Ast0.OptParam(parama),Ast0.OptParam(paramb)) ->
-- 
2.21.1

_______________________________________________
Cocci mailing list
Cocci@systeme.lip6.fr
https://systeme.lip6.fr/mailman/listinfo/cocci

  parent reply	other threads:[~2020-04-27 12:09 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-27 12:08 [Cocci] [PATCH 00/23] cocci: Add parameter attributes to SmPL Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 01/23] parsing_cocci: ast0_cocci: Add parameter attributes Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 02/23] parsing_cocci: parser: Parse Parameter attributes Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 03/23] parsing_cocci: visitor_ast0: Visit " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 04/23] parsing_cocci: arity: Reflect " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 05/23] parsing_cocci: check_meta: " Jaskaran Singh
2020-04-27 17:00   ` Julia Lawall
2020-04-27 12:08 ` [Cocci] [PATCH 06/23] parsing_cocci: compute_lines: " Jaskaran Singh
2020-04-27 17:03   ` Julia Lawall
2020-04-27 12:08 ` [Cocci] [PATCH 07/23] parsing_cocci: context_neg: " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 08/23] parsing_cocci: function_prototypes: " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 09/23] parsing_cocci: index: " Jaskaran Singh
2020-04-27 12:08 ` Jaskaran Singh [this message]
2020-04-27 17:06   ` [Cocci] [PATCH 10/23] parsing_cocci: iso_pattern: " Julia Lawall
2020-04-27 12:08 ` [Cocci] [PATCH 11/23] parsing_cocci: type_infer: " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 12/23] parsing_cocci: unparse_ast0: " Jaskaran Singh
2020-04-27 17:09   ` Julia Lawall
2020-04-27 12:08 ` [Cocci] [PATCH 13/23] parsing_c: unparse_cocci: " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 14/23] parsing_cocci: ast_cocci: Add " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 15/23] parsing_cocci: visitor_ast: Visit " Jaskaran Singh
2020-04-27 17:13   ` Julia Lawall
2020-04-27 12:08 ` [Cocci] [PATCH 16/23] parsing_cocci: ast0toast: Reflect " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 17/23] parsing_cocci: disjdistr: " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 18/23] parsing_cocci: pretty_print_cocci: " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 19/23] parsing_cocci: unify_ast: " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 20/23] engine: cocci_vs_c: Match " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 21/23] ocaml: coccilib: Reflect " Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 22/23] tests: Add test case for removing parameter attributes Jaskaran Singh
2020-04-27 17:31   ` Julia Lawall
2020-04-28 12:43     ` Jaskaran Singh
2020-04-27 12:08 ` [Cocci] [PATCH 23/23] tests: Add test case to detect " Jaskaran Singh
2020-04-27 12:21 ` [Cocci] [PATCH v2 08/23] parsing_cocci: function_prototypes: Reflect Parameter attributes 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=20200427120834.380-11-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).