From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A40EBC433E1 for ; Fri, 3 Jul 2020 18:03:19 +0000 (UTC) Received: from isis.lip6.fr (isis.lip6.fr [132.227.60.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 497DE21D81 for ; Fri, 3 Jul 2020 18:03:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 497DE21D81 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=cocci-bounces@systeme.lip6.fr Received: from systeme.lip6.fr (systeme.lip6.fr [132.227.104.7]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 063I2q5x006499; Fri, 3 Jul 2020 20:03:01 +0200 (CEST) Received: from systeme.lip6.fr (systeme.lip6.fr [127.0.0.1]) by systeme.lip6.fr (Postfix) with ESMTP id A2A91782A; Fri, 3 Jul 2020 20:02:53 +0200 (CEST) Received: from isis.lip6.fr (isis.lip6.fr [132.227.60.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by systeme.lip6.fr (Postfix) with ESMTPS id 8E4CB776E for ; Fri, 3 Jul 2020 20:00:18 +0200 (CEST) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTPS id 063I0Htg025488 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 3 Jul 2020 20:00:18 +0200 (CEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: jaskaran_singh) with ESMTPSA id 0E0522A64FA From: Jaskaran Singh To: cocci@systeme.lip6.fr Date: Fri, 3 Jul 2020 23:29:30 +0530 Message-Id: <20200703175931.1693-20-jaskaran.singh@collabora.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200703175931.1693-1-jaskaran.singh@collabora.com> References: <20200703175931.1693-1-jaskaran.singh@collabora.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, Sender e-mail whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Fri, 03 Jul 2020 20:03:01 +0200 (CEST) X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Fri, 03 Jul 2020 20:00:18 +0200 (CEST) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 X-Mailman-Approved-At: Fri, 03 Jul 2020 20:02:41 +0200 Subject: [Cocci] [PATCH 19/20] engine: cocci_vs_c: Wrap SmPL Attributes X-BeenThere: cocci@systeme.lip6.fr X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: cocci-bounces@systeme.lip6.fr Errors-To: cocci-bounces@systeme.lip6.fr Attributes are wrapped in the SmPL AST. Reflect these changes in cocci_vs_c.ml. Signed-off-by: Jaskaran Singh --- engine/cocci_vs_c.ml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/engine/cocci_vs_c.ml b/engine/cocci_vs_c.ml index 7abc4d53..3199d54d 100644 --- a/engine/cocci_vs_c.ml +++ b/engine/cocci_vs_c.ml @@ -1529,11 +1529,12 @@ let rec (expression: (A.expression, Ast_c.expression) matcher) = ((B.Cast (typb, attrsb, eb), typ),ii) -> let attr_allminus = - let mcode_is_not_context = function - | (_,_,A.CONTEXT(_,_),_) -> false + let attr_is_not_context a = + match A.unwrap a with + | A.Attribute(_,_,A.CONTEXT(_,_),_) -> false | _ -> true in check_allminus.Visitor_ast.combiner_fullType typa && - List.for_all mcode_is_not_context attrsa in + List.for_all attr_is_not_context attrsa in let (ib1, ib2) = tuple_of_list2 ii in fullType typa typb >>= (fun typa typb -> @@ -4265,8 +4266,8 @@ and attribute_list allminus attras attrbs = | _ -> failwith "only one attribute allowed in SmPL") and attribute = fun allminus ea eb -> - match ea, eb with - attra, (B.Attribute attrb, ii) + match A.unwrap ea, eb with + A.Attribute(attra), (B.Attribute attrb, ii) when (A.unwrap_mcode attra) = attrb -> let ib1 = tuple_of_list1 ii in tokenf attra ib1 >>= (fun attra ib1 -> @@ -4274,7 +4275,7 @@ and attribute = fun allminus ea eb -> then minusize_list [ib1] else return ((), [ib1])) >>= (fun _ ib1 -> return ( - attra, + A.rewrap ea (A.Attribute(attra)), (B.Attribute attrb,ib1) ))) | _ -> fail -- 2.21.3 _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci