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 20/23] engine: cocci_vs_c: Match Parameter attributes
Date: Mon, 27 Apr 2020 17:38:31 +0530	[thread overview]
Message-ID: <20200427120834.380-21-jaskaransingh7654321@gmail.com> (raw)
In-Reply-To: <20200427120834.380-1-jaskaransingh7654321@gmail.com>

Parameter attributes are added to the C and SmPL AST. Match the
attributes correctly in cocci_vs_c.ml.

Signed-off-by: Jaskaran Singh <jaskaransingh7654321@gmail.com>
---
 engine/cocci_vs_c.ml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/engine/cocci_vs_c.ml b/engine/cocci_vs_c.ml
index 317fa71e..66cb104a 100644
--- a/engine/cocci_vs_c.ml
+++ b/engine/cocci_vs_c.ml
@@ -2112,14 +2112,14 @@ and parameters_bis eas ebs =
   let special_cases ea eas ebs =
     (* a case where one smpl parameter matches a list of C parameters *)
     match A.unwrap ea,ebs with
-      A.VoidParam ta, ys ->
+      A.VoidParam (ta, attrsa), ys ->
 	Some
           (match eas, ebs with
           | [], [Left eb] ->
               let {B.p_register=(hasreg,iihasreg);
                     p_namei = idbopt;
                     p_type=tb;
-                    p_attr=attrs; } = eb in
+                    p_attr=attrsb; } = eb in
 
               let attr_allminus =
                 check_allminus.Visitor_ast.combiner_parameter ea in
@@ -2128,10 +2128,10 @@ and parameters_bis eas ebs =
                 match tb with
                 | (qub, (B.BaseType B.Void,_)) ->
                     fullType ta tb >>= (fun ta tb ->
-                    attribute_list attr_allminus [] attrs >>=
+                    attribute_list attr_allminus attrsa attrsb >>=
                     (fun attrsa attrsb ->
                       return (
-                      [(A.VoidParam ta) +> A.rewrap ea],
+                      [(A.VoidParam (ta, attrsa)) +> A.rewrap ea],
                       [Left {B.p_register=(hasreg, iihasreg);
                               p_namei = idbopt;
                               p_type = tb;
@@ -2171,23 +2171,23 @@ and parameter = fun parama paramb ->
 	      return
 		(A.MetaParam(ida,constraints,keep,inherited)+>
 		 A.rewrap parama,eb)))
-  | A.Param (typa, idaopt), eb ->
+  | A.Param (typa, idaopt, attrsa), eb ->
       let {B.p_register = (hasreg,iihasreg);
 	    p_namei = nameidbopt;
 	    p_type = typb;
-            p_attr = attrs;} = paramb in
+            p_attr = attrsb;} = paramb in
 
       let attr_allminus =
         check_allminus.Visitor_ast.combiner_parameter parama in
 
       fullType typa typb >>= (fun typa typb ->
-      attribute_list attr_allminus [] attrs >>= (fun attrsa attrsb ->
+      attribute_list attr_allminus attrsa attrsb >>= (fun attrsa attrsb ->
 	match idaopt, nameidbopt with
 	| Some ida, Some nameidb ->
       (* todo: if minus on ida, should also minus the iihasreg ? *)
 	    ident_cpp DontKnow ida nameidb >>= (fun ida nameidb ->
               return (
-              A.Param (typa, Some ida)+> A.rewrap parama,
+              A.Param (typa, Some ida, attrsa)+> A.rewrap parama,
               {B.p_register = (hasreg, iihasreg);
 		p_namei = Some (nameidb);
                 p_type = typb;
@@ -2196,7 +2196,7 @@ and parameter = fun parama paramb ->
 
 	| None, None ->
 	    return (
-            A.Param (typa, None)+> A.rewrap parama,
+            A.Param (typa, None, attrsa)+> A.rewrap parama,
             {B.p_register=(hasreg,iihasreg);
               p_namei = None;
               p_type = typb;
-- 
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:10 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 ` [Cocci] [PATCH 10/23] parsing_cocci: iso_pattern: " Jaskaran Singh
2020-04-27 17:06   ` 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 ` Jaskaran Singh [this message]
2020-04-27 12:08 ` [Cocci] [PATCH 21/23] ocaml: coccilib: " 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-21-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).