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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 A5DF4C433DF for ; Wed, 8 Jul 2020 13:01:44 +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 2F197207DF for ; Wed, 8 Jul 2020 13:01:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F197207DF 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 068D1UpK029504; Wed, 8 Jul 2020 15:01:33 +0200 (CEST) Received: from systeme.lip6.fr (systeme.lip6.fr [127.0.0.1]) by systeme.lip6.fr (Postfix) with ESMTP id 5132044A7; Wed, 8 Jul 2020 15:01:33 +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 89E1A44A7 for ; Wed, 8 Jul 2020 15:01:31 +0200 (CEST) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTPS id 068D1UEg024709 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 8 Jul 2020 15:01:31 +0200 (CEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: jaskaran_singh) with ESMTPSA id B4F942A5789 From: Jaskaran Singh To: cocci@systeme.lip6.fr Date: Wed, 8 Jul 2020 18:30:32 +0530 Message-Id: <20200708130035.26687-18-jaskaran.singh@collabora.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200708130035.26687-1-jaskaran.singh@collabora.com> References: <20200708130035.26687-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]); Wed, 08 Jul 2020 15:01:33 +0200 (CEST) X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [IPv6:2001:660:3302:283c:0:0:0:2]); Wed, 08 Jul 2020 15:01:31 +0200 (CEST) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 X-Scanned-By: MIMEDefang 2.78 Subject: [Cocci] [PATCH v2 RESEND 17/20] parsing_cocci: pretty_print_cocci: 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 pretty_print_cocci.ml. Signed-off-by: Jaskaran Singh --- parsing_cocci/pretty_print_cocci.ml | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/parsing_cocci/pretty_print_cocci.ml b/parsing_cocci/pretty_print_cocci.ml index aaea3f9d..1ac6d743 100644 --- a/parsing_cocci/pretty_print_cocci.ml +++ b/parsing_cocci/pretty_print_cocci.ml @@ -251,8 +251,7 @@ let rec expression e = expression exp; mcode print_string ar; ident field | Ast.Cast(lp,ty,attr,rp,exp) -> mcode print_string_box lp; fullType ty; close_box(); - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr; + print_attribute_list attr; mcode print_string rp; expression exp | Ast.SizeOfExpr(sizeof,exp) -> mcode print_string sizeof; expression exp @@ -450,7 +449,15 @@ and print_fninfo = function Ast.FStorage(stg) -> mcode storage stg | Ast.FType(ty) -> fullType ty | Ast.FInline(inline) -> mcode print_string inline; print_string " " - | Ast.FAttr(attr) -> mcode print_string attr; print_string " " + | Ast.FAttr(attr) -> print_attribute attr; print_string " " + +and print_attribute_list attrs = + if not (attrs = []) then print_string " "; + print_between print_space print_attribute attrs + +and print_attribute attr = + match Ast.unwrap attr with + Ast.Attribute(a) -> mcode print_string a and typeC ty = match Ast.unwrap ty with @@ -551,15 +558,13 @@ and declaration d = | Ast.Init(stg,ty,id,attr,eq,ini,sem) -> print_option (mcode storage) stg; print_named_type ty (fun _ -> ident id); - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr; + print_attribute_list attr; print_string " "; mcode print_string eq; print_string " "; initialiser ini; mcode print_string sem | Ast.UnInit(stg,ty,id,attr,sem) -> print_option (mcode storage) stg; print_named_type ty (fun _ -> ident id); - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr; + print_attribute_list attr; mcode print_string sem | Ast.FunProto (fninfo,name,lp1,params,va,rp1,sem) -> List.iter print_fninfo fninfo; @@ -571,8 +576,7 @@ and declaration d = print_option (mcode storage) stg; ident name; mcode print_string_box lp; dots (function _ -> ()) expression args; close_box(); mcode print_string rp; - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr; + print_attribute_list attr; mcode print_string sem | Ast.MacroDeclInit(stg,name,lp,args,rp,eq,ini,sem) -> print_option (mcode storage) stg; ident name; mcode print_string_box lp; @@ -582,8 +586,7 @@ and declaration d = print_string " "; initialiser ini; mcode print_string sem | Ast.TyDecl(ty,attr,sem) -> fullType ty; - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr; + print_attribute_list attr; mcode print_string sem | Ast.Typedef(stg,ty,id,sem) -> mcode print_string stg; print_string " "; @@ -699,16 +702,13 @@ and parameterTypeDef p = match Ast.unwrap p with Ast.VoidParam(ty,attr) -> fullType ty; - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr + print_attribute_list attr | Ast.Param(ty,Some id,attr) -> print_named_type ty (fun _ -> ident id); - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr + print_attribute_list attr | Ast.Param(ty,None,attr) -> fullType ty; - (if not (attr = []) then print_string " "); - print_between print_space (mcode print_string) attr + print_attribute_list attr | Ast.MetaParam(name,_,_,_) -> mcode print_meta name | Ast.MetaParamList(name,_,_,_,_) -> mcode print_meta name | Ast.PComma(cm) -> mcode print_string cm; print_space() -- 2.21.3 _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci