From patchwork Tue Feb 21 12:01:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 59994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1832784wrn; Tue, 21 Feb 2023 04:27:37 -0800 (PST) X-Google-Smtp-Source: AK7set/a2n4PpGd7CRf5UD2aNetXlixl675ql4eY+JZoxYdHo+r2K+ILcd3oqIgKZ10/Tv1OFqc4 X-Received: by 2002:a17:906:27c3:b0:885:2eb5:68a5 with SMTP id k3-20020a17090627c300b008852eb568a5mr10338144ejc.66.1676982457222; Tue, 21 Feb 2023 04:27:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676982457; cv=none; d=google.com; s=arc-20160816; b=GDjtK+Q4UOVIc0ljsd8ASwO2cnl/okOKrW+oMHnPFQVr7g6MtNzwHbRDWqpRBdcGnw xQVeuO1kx2e5mapboE+Cpsv8mHcH/5z9IeGBCd7ljXdECbxi+5Q1f2Us3JnvtE4/jOi/ y6JyuPq9ifGr/oiXuFya1WKBT2Jj2s2Y10W6bYy7oiHGtwYiAI16nrUs9SHWTIoRluBI xHGPpI8Bvk4CdK1EnQwmB3WKRQWlSXK5uM/VbFK7ffsYzFxZ5kc8OvG1dhkB7O2OfLmB nROjXHCSNFerY06Bdk/Fi7TvmhAiOv0Q7msiobPKYT/Muk26ZfHu7oWb3RxXMc4bXKqZ 6qlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:dmarc-filter :delivered-to; bh=uwPUebrX1sEZQcVvMyvVXXl5jvFOsJN52ZRV+SL1CnQ=; b=jESuUsZ823+3QT6ymJkP7/h0PIOvCqnIYSOEC36HwUF/cg3n4U+YJxWxC4vTa7UYoL 39D47ePg8oxgy8Myq2IlyY5HyVr1q/cszd0j32M9tGoInQ6go3j2lUO2oXym7Dj2zAs9 5cktNkhKPCjhXTR+8faUMzC7cerLndQdDLSzjaWdNwDCPs0ilxK2GEsJB/ixqiU3Qir/ rrm/5JynaBW/Bgwyaa1NJNGIIdBr/W1oYSM9nH/W9Y5b91vWZMhbf4VNxbeWVOccLzBO PoGqrCmtYc4v8lwlJM0Kpg8t4Bgc9JfbK0tHVue3PtMUGVk9YedFTCQL1HyREHoQjPAk 6YUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=TOV3lF5e; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ui38-20020a170907c92600b008b17879ce7asi15663667ejc.914.2023.02.21.04.27.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:27:37 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=TOV3lF5e; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A88DA38B1E1C for ; Tue, 21 Feb 2023 12:10:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id 0D390383FDC6 for ; Tue, 21 Feb 2023 12:03:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0D390383FDC6 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x333.google.com with SMTP id p18-20020a05600c359200b003dc57ea0dfeso3355602wmq.0 for ; Tue, 21 Feb 2023 04:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=uwPUebrX1sEZQcVvMyvVXXl5jvFOsJN52ZRV+SL1CnQ=; b=TOV3lF5eNT/oIft2vgnKnmoYyXalBiVzyP2Fb1zJXyldYblCGF5qIX2LZ6o0XTktFD NPhLrH5iH9xTLCJhy605Ul02UrKIDU0rzjsBgnb43/tLtX6vid2V1r0eQnomrV+lPpr8 35OvvrnCDg05ZdVJXQD0Q8hC/nDuKc/VRgXTFknR/byIpixVw0109hcXa54Rwv8TybGy ktMlQKX2UfI2JpGzh6AysoKLOfJr1bds+noVAA7+MqL1C02FRjD6h9GdIpA5bm2DjznF vOZIvKoK1SsJdMmcmoE7yeTPN8l3nKhV9OrY6Ttry/jmbCosVx2yWEuJDCT2PLyyJ+ja Q3kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=uwPUebrX1sEZQcVvMyvVXXl5jvFOsJN52ZRV+SL1CnQ=; b=L+vuvntNobCWN2uBtJsCbUW7nYM3Bb+SKA7Cioo2YgXFlDyGDpGAVl6YeJjvoChcZV pEAC6LDRErFCOE0YIPEPio/+3R/HTQeVfomsOBh3Jzpz3uMZCeQjtSceBORr+EzrOWbT mv5n+1WknQC/0BGcuP+zogMHzvz2R+3fti+eIQqvsXw44M/Tb+0T/KMQW/96POQrjGSD XuHY8WqoAg60zjuoljdXNzjmRf5RA3ycR7R8zg9K08ZvT1hoThJkZjP5LP3jbnCvOmY3 g6DfgbHI8/0xwKAQjG42BsFpm+nAWXYxGU6DTqcYmhk/HSFnRPFYA6ZZ1u7YZlSwq0lQ iHyA== X-Gm-Message-State: AO0yUKVT9zO4hQfpEbh686Ycj9oxOylc6pgKdKWgGMxOdss/vPjt4q+u +J+x4SdTs2golqGg5Uz9csZbclMTlw33HU9+4w== X-Received: by 2002:a05:600c:448a:b0:3e1:97d:612e with SMTP id e10-20020a05600c448a00b003e1097d612emr8747107wmo.29.1676981024524; Tue, 21 Feb 2023 04:03:44 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id c15-20020adffb4f000000b002c55b0e6ef1sm5013811wrs.4.2023.02.21.04.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:03:44 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, David Faust Subject: [committed 026/103] gccrs: ast: dump: minor fixups to IfExpr formatting Date: Tue, 21 Feb 2023 13:01:16 +0100 Message-Id: <20230221120230.596966-27-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221120230.596966-1-arthur.cohen@embecosm.com> References: <20230221120230.596966-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-15.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758443556918056075?= X-GMAIL-MSGID: =?utf-8?q?1758443556918056075?= From: David Faust gcc/rust/ChangeLog: * ast/rust-ast-dump.cc (Dump::visit): Fix IfExpr formatting. --- gcc/rust/ast/rust-ast-dump.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc index 3b00c9fedb6..1ba84b8efa1 100644 --- a/gcc/rust/ast/rust-ast-dump.cc +++ b/gcc/rust/ast/rust-ast-dump.cc @@ -570,6 +570,7 @@ Dump::visit (IfExpr &expr) { stream << "if "; expr.vis_if_condition (*this); + stream << " "; expr.vis_if_block (*this); } @@ -578,6 +579,7 @@ Dump::visit (IfExprConseqElse &expr) { stream << "if "; expr.vis_if_condition (*this); + stream << " "; expr.vis_if_block (*this); stream << indentation << "else "; expr.vis_else_block (*this); @@ -588,8 +590,10 @@ Dump::visit (IfExprConseqIf &expr) { stream << "if "; expr.vis_if_condition (*this); + stream << " "; expr.vis_if_block (*this); - stream << indentation << "else if "; + stream << indentation << "else "; + // The "if" part of the "else if" is printed by the next visitor expr.vis_conseq_if_expr (*this); }