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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 9F87EC54FCB for ; Mon, 27 Apr 2020 17:06:59 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 682DD20738 for ; Mon, 27 Apr 2020 17:06:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 682DD20738 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=inria.fr Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-kernel-mentees-bounces@lists.linuxfoundation.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 80BCF87E9D; Mon, 27 Apr 2020 17:06:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q+3O8X1qRRNK; Mon, 27 Apr 2020 17:06:55 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 4978487EA1; Mon, 27 Apr 2020 17:06:55 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 323DCC18DC; Mon, 27 Apr 2020 17:06:55 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 57C09C0172 for ; Mon, 27 Apr 2020 17:06:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4781787E9D for ; Mon, 27 Apr 2020 17:06:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tVev7Qvyj0IE for ; Mon, 27 Apr 2020 17:06:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail3-relais-sop.national.inria.fr (mail3-relais-sop.national.inria.fr [192.134.164.104]) by hemlock.osuosl.org (Postfix) with ESMTPS id C399F87E62 for ; Mon, 27 Apr 2020 17:06:50 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.73,324,1583190000"; d="scan'208";a="347098034" Received: from abo-173-121-68.mrs.modulonet.fr (HELO hadrien) ([85.68.121.173]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Apr 2020 19:06:49 +0200 Date: Mon, 27 Apr 2020 19:06:48 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@hadrien To: Jaskaran Singh In-Reply-To: <20200427120834.380-11-jaskaransingh7654321@gmail.com> Message-ID: References: <20200427120834.380-1-jaskaransingh7654321@gmail.com> <20200427120834.380-11-jaskaransingh7654321@gmail.com> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Cc: linux-kernel-mentees@lists.linuxfoundation.org, cocci@systeme.lip6.fr Subject: Re: [Linux-kernel-mentees] [PATCH 10/23] parsing_cocci: iso_pattern: Reflect Parameter attributes X-BeenThere: linux-kernel-mentees@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 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 Errors-To: linux-kernel-mentees-bounces@lists.linuxfoundation.org Sender: "Linux-kernel-mentees" On Mon, 27 Apr 2020, Jaskaran Singh wrote: > Parameter attributes are added to the SmPL AST. Reflect these changes in > iso_pattern.ml. > > Signed-off-by: Jaskaran Singh > --- > 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) Could you move the ( line up to the right of the if? thanks, julia > + 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 > > _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees