Re: [PATCH 16/17] gdb: move m2-exp-parser.y's support code to m2-exp-parser.c

[Simon Marchi <simon.marchi@polymtl.ca>]

On 2026-09-04 20:30, Kevin Buettner wrote:
> On Fri,  4 Sep 2026 12:56:48 -0400
> simon.marchi@polymtl.ca wrote:
> 
>> From: Simon Marchi <simon.marchi@polymtl.ca>
>>
>> Similar to the previous commits, but for the Modula-2 expression parser.
>>
>> Like the Fortran parser, the Modula-2 parser is entered through the
>> m2_language::parser method rather than a free function, so add a free
>> function m2_parse as the entry point (like the other parsers) and turn
>> m2_language::parser into a thin wrapper around it, defined in m2-lang.c.
>>
>> Put the parser support code inside the m2_exp_parser namespace.
>>
>> Change-Id: I92669a1af7fb81cf59bfb41e2b8c63ce323652d2
>> ---
>>  gdb/Makefile.in     |   2 +
>>  gdb/m2-exp-parser.c | 488 ++++++++++++++++++++++++++++++++++++++++++++
>>  gdb/m2-exp-parser.h |  67 ++++++
>>  gdb/m2-exp-parser.y | 465 +----------------------------------------
>>  gdb/m2-lang.c       |   9 +
>>  5 files changed, 568 insertions(+), 463 deletions(-)
>>  create mode 100644 gdb/m2-exp-parser.c
>>  create mode 100644 gdb/m2-exp-parser.h
>>
>> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
>> index 4289c5151fd0..1c4ba5a12d57 100644
>> --- a/gdb/Makefile.in
>> +++ b/gdb/Makefile.in
>> @@ -1137,6 +1137,7 @@ COMMON_SFILES = \
>>  	language.c \
>>  	linespec.c \
>>  	location.c \
>> +	m2-exp-parser.c \
>>  	m2-lang.c \
>>  	m2-typeprint.c \
>>  	m2-valprint.c \
>> @@ -1518,6 +1519,7 @@ HFILES_NO_SRCDIR = \
>>  	linux-tdep.h \
>>  	location.h \
>>  	loongarch-tdep.h \
>> +	m2-exp-parser.h \
>>  	m2-exp.h \
>>  	m2-lang.h \
>>  	m32r-tdep.h \
>> diff --git a/gdb/m2-exp-parser.c b/gdb/m2-exp-parser.c
>> new file mode 100644
>> index 000000000000..821f1507aef3
>> --- /dev/null
>> +++ b/gdb/m2-exp-parser.c
>> @@ -0,0 +1,488 @@
>> +/* YACC parser support code for Modula-2 expressions, for GDB.
>> +
>> +   Copyright (C) 1986-2026 Free Software Foundation, Inc.
>> +
>> +   This file is part of GDB.
>> +
>> +   This program is free software; you can redistribute it and/or modify
>> +   it under the terms of the GNU General Public License as published by
>> +   the Free Software Foundation; either version 3 of the License, or
>> +   (at your option) any later version.
>> +
>> +   This program is distributed in the hope that it will be useful,
>> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> +   GNU General Public License for more details.
>> +
>> +   You should have received a copy of the GNU General Public License
>> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
>> +
>> +#include "m2-exp-parser.h"
>> +#include "m2-exp-parser-gen.h"
>> +#include "block.h"
>> +#include "expression.h"
>> +#include "language.h"
>> +#include "m2-exp.h"
>> +#include "parser-defs.h"
>> +#include "value.h"
>> +
>> +/* The entry point of the bison/yacc-generated parser, defined in
>> +   m2-exp-parser-gen.c.  Bison produces a declaration for m2_yyparse in
>> +   m2-exp-parser-gen.h, but byacc does not, hence this declaration.  */
>> +
>> +int m2_yyparse ();
>> +
>> +/* Likewise, byacc does not produce a declaration for m2_yydebug.  */
>> +
>> +extern int m2_yydebug;
> 
> Another nit found by the AI patch reviewer; it notes that the extern
> for m2_yydebug is never used.  But it also noted that this was
> pre-existing behavior.

Ok, I just added them mechanically for all parsers.  Most language
parsers do something like:

  scoped_restore restore_yydebug = make_scoped_restore (&c_yydebug,
							par_state->debug);

The m2 and pascal parsers don't, but they probably should.  I'll do
that and these declarations will end up used.

Simon