From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-bugzilla@gcc.gnu.org>
Received: by sourceware.org (Postfix, from userid 48)
	id 0E1E738582B7; Sat, 29 Jul 2023 14:16:53 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E1E738582B7
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1690640213;
	bh=enYsQp5GjTR5ag+H3Aq0LC7m0ASnL6GhDtF+In9cH+Q=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=xBLZMwitKnkGGy7Zh+3OgcHEao5rr2K+mG2K80c7NioTza6zdyOe8/PrZBDAPf+G5
	 dmhiRHxXwcF3Fpx9xBqA1s6BRJDnADSXMIOiB/960JMJtdEa8js3BHT+aM2jLuBM6s
	 Ykv2ZJXFZdsQkvRG3KAzxyqMFS3Jge1TTLMOyllw=
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug modula2/110019] Reported line numbers ar off-by-1 when
 preprocessing source files
Date: Sat, 29 Jul 2023 14:16:52 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: gcc
X-Bugzilla-Component: modula2
X-Bugzilla-Version: 13.1.0
X-Bugzilla-Keywords: 
X-Bugzilla-Severity: normal
X-Bugzilla-Who: cvs-commit at gcc dot gnu.org
X-Bugzilla-Status: RESOLVED
X-Bugzilla-Resolution: FIXED
X-Bugzilla-Priority: P3
X-Bugzilla-Assigned-To: gaius at gcc dot gnu.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-110019-4-yR9LKG5XBO@http.gcc.gnu.org/bugzilla/>
In-Reply-To: <bug-110019-4@http.gcc.gnu.org/bugzilla/>
References: <bug-110019-4@http.gcc.gnu.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
List-Id: <gcc-bugs.sourceware.org>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D110019

--- Comment #5 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-13 branch has been updated by Gaius Mulley
<gaius@gcc.gnu.org>:

https://gcc.gnu.org/g:07c1033f003a858f4bfc6bb9e6b7ce67670db974

commit r13-7643-g07c1033f003a858f4bfc6bb9e6b7ce67670db974
Author: Gaius Mulley <gaiusmod2@gmail.com>
Date:   Sat Jul 29 15:16:08 2023 +0100

    PR modula2/110019 Reported line numbers off by 1 when cpp invoked.

    Fix off by one in m2.flex when the line number is set via cpp.

    gcc/m2/ChangeLog:

            PR modula2/110019
            * gm2-compiler/SymbolKey.mod (SearchAndDo): Reformatted.
            (ForeachNodeDo): Reformatted.
            * gm2-compiler/SymbolTable.mod (AddListify): Join list
            with "," or "and" if more than one word is in the list.
            * m2.flex: Remove -1 from atoi(yytext) line number.

    gcc/testsuite/ChangeLog:

            PR modula2/110019
            * gm2/cpp/fail/cpp-fail.exp: New test.
            * gm2/cpp/fail/foocpp.mod: New test.

    (cherry picked from commit 29c82c6ca929e0f5eccfe038dea71177d814c6b7)

    Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>=