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.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 19E54C0044D for ; Mon, 16 Mar 2020 10:05:05 +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 8BFA32051A for ; Mon, 16 Mar 2020 10:05:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FwnPrx/3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BFA32051A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 02GA4pIt019652; Mon, 16 Mar 2020 11:04:51 +0100 (CET) Received: from systeme.lip6.fr (systeme.lip6.fr [127.0.0.1]) by systeme.lip6.fr (Postfix) with ESMTP id 79EFE7809; Mon, 16 Mar 2020 11:04:51 +0100 (CET) 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 DDD517802 for ; Mon, 16 Mar 2020 11:04:49 +0100 (CET) Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20:0:0:0:543]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTPS id 02GA4mai011650 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128 verify=OK) for ; Mon, 16 Mar 2020 11:04:49 +0100 (CET) Received: by mail-pg1-x543.google.com with SMTP id z4so3692901pgu.3 for ; Mon, 16 Mar 2020 03:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O40XMfKoBGsiadoKnr5LmawGLF1uWP0L2JS6q5pD5LQ=; b=FwnPrx/3qUif+z0KhKkBBjxFOfGYWrI14fZYtfOamJZnYBRazzFktR70yMqIFkdYCR S1PNg/yWsl1dfUSlJiFLCKEqi9zQ7PPjq1mk7CX76V5OzZxfQ3cYB+0UMvsXxB36XTlu M4DdAyI2Uyc6EfJkzr8gHEj8r6tuyZsgAqHkhsgjhxotrNqWCgLRsBrbym09EnVUEYpg g9Alvo9hxeixvP7Xwhi18nDPXlruFubf52yX8rdyyR1lfQMpfN0qx5h7SCSSvYsZG/CH w10Jwea7wLiK6b+I/W8lzybQm4/JChcdxQDIWXjP6wnbue4rNjxxUQF/mz5dY/qgSziG hLEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O40XMfKoBGsiadoKnr5LmawGLF1uWP0L2JS6q5pD5LQ=; b=bP7JNDpKokdhhsJpsmon90M6pqaNoZQZGqQoFtmKgy5sc1837DFxW04RB97qY6U9yG wmnulSLFwJQxlJuqEEC7toEqhQWq4k11OMFNqKUGSo4E77frNOQ8Mzbn/cLjC/GYP4/E +5CwQG0HUe/QCFC4pBEi7NBsRYnMbBC9nqw1W5EfQ9SlI2MAY6pADJPyaHHzibIxSGHO CPT0zW2YF1hXJGWH+akLRDQTht0qs0hjJV/ylXEJNEOBoyRXH6VL0EpQy7LQ3OXP9mRq Nl/6hTqOflvIDzjJreS4YYr++rr47pozv3AW3wtLFNII9XzwWye7ZcVwcPcj9g4LA8+C C1Cg== X-Gm-Message-State: ANhLgQ3zVTWy4HGynyoChPQJdn+ZBWoqgihsd/JPhi7QqUxD3SnLh1Vd 93mSXTSK5foUYWa9XVo7k791ToyL X-Google-Smtp-Source: ADFU+vvKiEjCZKoYrkje8oVJ3phykPHO80xfEcbrmSuGhdFzEZ5ShYb5vaOpBtZu4E3TL5xhXH3svQ== X-Received: by 2002:a63:cf4a:: with SMTP id b10mr13717971pgj.354.1584353087316; Mon, 16 Mar 2020 03:04:47 -0700 (PDT) Received: from localhost.localdomain ([2405:204:284:a4f2:cc63:b7fc:551c:dce5]) by smtp.gmail.com with ESMTPSA id u3sm19803374pjv.32.2020.03.16.03.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:04:47 -0700 (PDT) From: Jaskaran Singh To: cocci@systeme.lip6.fr Date: Mon, 16 Mar 2020 15:33:14 +0530 Message-Id: <20200316100319.27935-22-jaskaransingh7654321@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200316100319.27935-1-jaskaransingh7654321@gmail.com> References: <20200316100319.27935-1-jaskaransingh7654321@gmail.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]); Mon, 16 Mar 2020 11:04:51 +0100 (CET) X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [IPv6:2001:660:3302:283c:0:0:0:2]); Mon, 16 Mar 2020 11:04:49 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 X-Scanned-By: MIMEDefang 2.78 Cc: linux-kernel-mentees@lists.linuxfoundation.org Subject: [Cocci] [PATCH 21/26] parsing_cocci: pretty_print_cocci: Print ParenType/FunctionType 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 The order of the terms in ParenType require implementing a special case for ParenType. This case handles only the following: ( * id [ .* ] ) ( params ) i.e., a function pointer or an array of function pointers, and will fail for any other cases. This is similar to the function used to print ParenType in Pretty_print_c. Signed-off-by: Jaskaran Singh --- parsing_cocci/pretty_print_cocci.ml | 57 +++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/parsing_cocci/pretty_print_cocci.ml b/parsing_cocci/pretty_print_cocci.ml index 6338e464..ef60106c 100644 --- a/parsing_cocci/pretty_print_cocci.ml +++ b/parsing_cocci/pretty_print_cocci.ml @@ -403,6 +403,54 @@ and print_function_pointer (ty,lp1,star,rp1,lp2,params,rp2) fn = mcode print_string rp1; mcode print_string lp1; parameter_list params; mcode print_string rp2 +and print_parentype (lp,ty,rp) fn = + match Ast.unwrap ty with + Ast.Type(_,_,fty1) -> + (match Ast.unwrap fty1 with + Ast.Pointer(ty1,star) -> + (match Ast.unwrap ty1 with + Ast.Type(_,_,fty2) -> + (match Ast.unwrap fty2 with + Ast.FunctionType(ty2,lp2,params,rp2) -> + fullType ty2; + print_space(); + mcode print_string lp; + mcode print_string star; + fn(); + mcode print_string rp; + mcode print_string lp2; + parameter_list params; + mcode print_string rp2 + | _ -> failwith "ParenType Pretty_print_cocci") + | _ -> failwith "ParenType Pretty_print_cocci") + | Ast.Array(ty1,lb1,size1,rb1) -> + (match Ast.unwrap ty1 with + Ast.Type(_,_,fty2) -> + (match Ast.unwrap fty2 with + Ast.Pointer(ty2,star) -> + (match Ast.unwrap ty2 with + Ast.Type(_,_,fty3) -> + (match Ast.unwrap fty3 with + Ast.FunctionType(ty3,lp3,params,rp3) -> + fullType ty3; + print_space(); + mcode print_string lp; + mcode print_string star; + fn(); + mcode print_string lb1; + print_option expression size1; + mcode print_string rb1; + mcode print_string rp; + mcode print_string lp3; + parameter_list params; + mcode print_string rp3 + | _ -> failwith "ParenType Pretty_print_cocci") + | _ -> failwith "ParenType Pretty_print_cocci") + | _ -> failwith "ParenType Pretty_print_cocci") + | _ -> failwith "ParenType Pretty_print_cocci") + | _ -> failwith "ParenType Pretty_print_cocci") + | _ -> failwith "ParenType Pretty_print_cocci" + and varargs = function | None -> () | Some (comma, ellipsis) -> @@ -424,6 +472,13 @@ and typeC ty = | Ast.FunctionPointer(ty,lp1,star,rp1,lp2,params,rp2) -> print_function_pointer (ty,lp1,star,rp1,lp2,params,rp2) (function _ -> ()) + | Ast.ParenType(lp,ty,rp) -> + print_parentype (lp,ty,rp) (function _ -> ()) + | Ast.FunctionType(ty,lp,params,rp) -> + fullType ty; + mcode print_string lp; + parameter_list params; + mcode print_string rp | Ast.Array(ty,lb,size,rb) -> fullType ty; mcode print_string lb; print_option expression size; mcode print_string rb @@ -498,6 +553,8 @@ and print_named_type ty id = | _ -> failwith "complex array types not supported") | _ -> typeC ty; id(); k () in loop ty1 (function _ -> ()) + | Ast.ParenType(lp,ty,rp) -> + print_parentype (lp,ty,rp) (function _ -> id()) | _ -> fullType ty; id()) | _ -> fullType ty; id() -- 2.21.1 _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci