[Bug modula2/110019] Reported line numbers ar off-by-1 when preprocessing source files

[cvs-commit at gcc dot gnu.org via Gcc-bugs]

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

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

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

commit r13-7643-g07c1033f003a858f4bfc6bb9e6b7ce67670db974
Author: Gaius Mulley <gaiusm...@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 <gaiusm...@gmail.com>