From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 4BD5C39B4416; Fri, 18 Jun 2021 08:39:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4BD5C39B4416 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1635] [Ada] Make "gcc -gnatDGL" handle unterminated last lines properly X-Act-Checkin: gcc X-Git-Author: Bob Duff X-Git-Refname: refs/heads/master X-Git-Oldrev: f86c2f9c8e5d7d02cc6b79fc80a647a9a27e23f2 X-Git-Newrev: ca5cdc9053ffe033e8ece1c4be7882c67b3f5a39 Message-Id: <20210618083942.4BD5C39B4416@sourceware.org> Date: Fri, 18 Jun 2021 08:39:42 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 08:39:42 -0000 https://gcc.gnu.org/g:ca5cdc9053ffe033e8ece1c4be7882c67b3f5a39 commit r12-1635-gca5cdc9053ffe033e8ece1c4be7882c67b3f5a39 Author: Bob Duff Date: Mon Mar 22 16:22:49 2021 -0400 [Ada] Make "gcc -gnatDGL" handle unterminated last lines properly gcc/ada/ * sprint.adb (Write_Source_Line): Check for EOF in Line_Terminator loop. Note that when a source file is read in, an EOF character is added to the end. Diff: --- gcc/ada/sprint.adb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ada/sprint.adb b/gcc/ada/sprint.adb index 5f2d027dfaf..7fc73409d1a 100644 --- a/gcc/ada/sprint.adb +++ b/gcc/ada/sprint.adb @@ -4847,7 +4847,10 @@ package body Sprint is Write_Int (Int (L)); Write_Str (": "); - while Src (Loc) not in Line_Terminator loop + -- We need to check for EOF here, in case the last line of the source + -- file does not have a Line_Terminator. + + while Src (Loc) not in Line_Terminator | EOF loop Write_Char (Src (Loc)); Loc := Loc + 1; end loop;