From patchwork Mon Nov 30 14:17:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1408326 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Cl6lJ6JpNz9sT6 for ; Tue, 1 Dec 2020 01:18:04 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A60CA3896824; Mon, 30 Nov 2020 14:17:23 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 405233892030 for ; Mon, 30 Nov 2020 14:17:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 405233892030 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 38220561F1; Mon, 30 Nov 2020 09:17:12 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id X10w+Tj1lNmV; Mon, 30 Nov 2020 09:17:12 -0500 (EST) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 0E3A3561EB; Mon, 30 Nov 2020 09:17:12 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4862) id 0D63CCB; Mon, 30 Nov 2020 09:17:12 -0500 (EST) Date: Mon, 30 Nov 2020 09:17:12 -0500 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Improve error recovery Message-ID: <20201130141712.GA117864@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Arnaud Charlet Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Function P_Formal_Part was unnecessarily calling Scan after calling T_Semicolon: T_Semicolon is already calling Scan to go past the comma-used-insted-of-semicolon. This avoids spurious cascaded errors in case of e.g: procedure P (A : Integer, B : Integer, C : Integer) is where ',' is used instead of ';'. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * par-ch6.adb (P_Formal_Part): Remove extra call to Scan. * par-tchk.adb: Minor reformatting. diff --git a/gcc/ada/par-ch6.adb b/gcc/ada/par-ch6.adb --- a/gcc/ada/par-ch6.adb +++ b/gcc/ada/par-ch6.adb @@ -1650,7 +1650,6 @@ package body Ch6 is elsif Token = Tok_Comma then T_Semicolon; - Scan; -- past comma -- Special check for omitted separator diff --git a/gcc/ada/par-tchk.adb b/gcc/ada/par-tchk.adb --- a/gcc/ada/par-tchk.adb +++ b/gcc/ada/par-tchk.adb @@ -436,7 +436,6 @@ package body Tchk is procedure T_Semicolon is begin - if Token = Tok_Semicolon then Scan;