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=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 9ABB2C28CC6 for ; Mon, 3 Jun 2019 09:59:41 +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 2BF2728059 for ; Mon, 3 Jun 2019 09:59:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BF2728059 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lip6.fr Authentication-Results: mail.kernel.org; spf=none 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 x539xR0a017900; Mon, 3 Jun 2019 11:59:27 +0200 (CEST) Received: from systeme.lip6.fr (systeme.lip6.fr [127.0.0.1]) by systeme.lip6.fr (Postfix) with ESMTP id 2FBDD7684; Mon, 3 Jun 2019 11:59:27 +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 1298F3F9C for ; Mon, 3 Jun 2019 11:59:26 +0200 (CEST) Received: from mail3-relais-sop.national.inria.fr (mail3-relais-sop.national.inria.fr [192.134.164.104]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id x539xP19011603 for ; Mon, 3 Jun 2019 11:59:25 +0200 (CEST) X-IronPort-AV: E=Sophos;i="5.60,546,1549926000"; d="scan'208";a="307947123" Received: from 206.201.158.77.rev.sfr.net (HELO DESKTOP-869AK4J.localdomain) ([77.158.201.206]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jun 2019 11:59:25 +0200 Date: Mon, 3 Jun 2019 11:59:24 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@hadrien To: =?ISO-8859-15?Q?Christoph_B=F6hmwalder?= In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323329-1398292159-1559555965=:2520" 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, 03 Jun 2019 11:59:27 +0200 (CEST) X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Mon, 03 Jun 2019 11:59:25 +0200 (CEST) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Cc: cocci@systeme.lip6.fr Subject: Re: [Cocci] Indentation when adding an if 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: , Sender: cocci-bounces@systeme.lip6.fr Errors-To: cocci-bounces@systeme.lip6.fr This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-1398292159-1559555965=:2520 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 8BIT On Mon, 3 Jun 2019, Christoph Böhmwalder wrote: > Hi, > > Consider the following C code and cocci patch: > > #include > > int x; > > int main(int argc, char **argv) > { > if (y) > do_something(x); > } > > > @@ > identifier x; > @@ > - do_something(x); > + if (x) > + do_one_thing(); > + else > + do_another_thing(); > > > For this input, spatch produces the following output: > > > $ spatch --sp-file test.cocci test.c > init_defs_builtins: /usr/lib/coccinelle/standard.h > HANDLING: test.c > diff = > --- test.c > +++ /tmp/cocci-output-18011-a28e99-test.c > @@ -5,5 +5,8 @@ int x; > int main(int argc, char **argv) > { > if (y) > - do_something(x); > + if (x) > + do_one_thing(); > + else > + do_another_thing(); > } > > > Obviously it gets the indentation wrong there. Is this a bug? > > Adding curly braces around the outer if (in the C code) yields the correct > indentation, while adding the braces around the inner if (in the cocci patch) > does not. > > Adding an else branch to the outer if also produces the wrong indentation. This is surely a bug. Thank you for the report. julia --8323329-1398292159-1559555965=:2520 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci --8323329-1398292159-1559555965=:2520--