From fda8c43f0a5d1b6ea591344242daa977a8a028c9 Mon Sep 17 00:00:00 2001
From: "James K. Lowden" <jklowden@symas.com>
Date: Fri, 7 Feb 2025 13:53:01 -0500
Subject: [PATCH] replace template diagnositic functions with wrappers
---
gcc/cobol/cbldiag.h | 8 +++-----
gcc/cobol/gcobol.1 | 4 ++--
gcc/cobol/util.cc | 33 +++++++++++++++++++--------------
3 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/gcc/cobol/cbldiag.h b/gcc/cobol/cbldiag.h
index bfc72f392139..7fc479da151e 100644
--- a/gcc/cobol/cbldiag.h
+++ b/gcc/cobol/cbldiag.h
@@ -73,8 +73,7 @@ struct YDFLTYPE
#endif
// an error at a location, called from the parser for semantic errors
-template <typename LOC>
-void error_msg( const LOC& loc, const char gmsgid[], ... );
+void error_msg( const YYLTYPE& loc, const char gmsgid[], ... );
void dialect_error( const YYLTYPE& loc, const char term[], const char dialect[] );
@@ -96,8 +95,7 @@ void cbl_unimplemented_at( const YYLTYPE& loc, const char *gmsgid, ... );
void dbgerr( const char fmt[], ... );
void dbgmsg( const char fmt[], ... );
-template <typename LOC>
-void gcc_location_set( const LOC& loc );
+void gcc_location_set( const YYLTYPE& loc );
// tree.h defines yy_flex_debug as a macro because options.h
#if ! defined(yy_flex_debug)
@@ -110,6 +108,6 @@ location_dump( const char func[], int line, const char tag[], const LOC& loc) {
func, line, tag,
loc.first_line, loc.first_column, loc.last_line, loc.last_column);
}
-#endif
+#endif // defined(yy_flex_debug)
#endif
diff --git a/gcc/cobol/gcobol.1 b/gcc/cobol/gcobol.1
index 0d3898818c7b..415ad36aa786 100644
--- a/gcc/cobol/gcobol.1
+++ b/gcc/cobol/gcobol.1
@@ -98,7 +98,7 @@ to have the value of
.Ar expr .
.It Fl E
Write the CDF-processed \*[lang] input to standard output in free-form
-reference format. Certain non-\*[lang] markers are included in the
+reference format. Certain non-\*[lang] markers are included in the
output to indicate where copybook files were included. For
line-number consistency with the input, blank lines are retained.
.Pp
@@ -308,7 +308,7 @@ the primary source file. If
.Ar filename
is not an absolute path, the directory searched is the current working
directory, not the directory containing the main source file. The
-name is used verbatim. No permutations are applied, and no
+name is used verbatim. No permutations are applied, and no
directories searched.
.Pp
If multiple
diff --git a/gcc/cobol/util.cc b/gcc/cobol/util.cc
index 5891ae853dd1..473718749730 100644
--- a/gcc/cobol/util.cc
+++ b/gcc/cobol/util.cc
@@ -1920,8 +1920,8 @@ cobol_filename_restore() {
static location_t token_location;
template <typename LOC>
-void
-gcc_location_set( const LOC& loc ) {
+static void
+gcc_location_set_impl( const LOC& loc ) {
token_location = linemap_line_start( line_table, loc.last_line, 80 );
token_location = linemap_position_for_column( line_table, loc.first_column);
location_dump(__func__, __LINE__, "parser", loc);
@@ -2007,20 +2007,9 @@ class temp_loc_t : protected YYLTYPE {
}
};
-// These uses of the error_msg function are never invoked, but encourage the
-// compiler to instantiate the templates.
-namespace none {
- void foo() {
- error_msg(YYLTYPE(), "fake");
- error_msg(YDFLTYPE(), "also fake");
- gcc_location_set(YYLTYPE());
- gcc_location_set(YDFLTYPE());
- }
-};
-
template <typename LOC>
void
-error_msg( const LOC& loc, const char gmsgid[], ... ) {
+static error_msg_impl( const LOC& loc, const char gmsgid[], ... ) {
temp_loc_t looker(loc);
verify_format(gmsgid);
parse_error_inc();
@@ -2034,6 +2023,22 @@ error_msg( const LOC& loc, const char gmsgid[], ... ) {
global_dc->end_group();
}
+void error_msg( const YYLTYPE& loc, const char gmsgid[], ... ) {
+ error_msg_impl(loc, gmsgid);
+}
+
+void error_msg( const YDFLTYPE& loc, const char gmsgid[], ... ) {
+ error_msg_impl(loc, gmsgid);
+}
+
+void gcc_location_set( const YYLTYPE& loc ) {
+ gcc_location_set_impl(loc);
+}
+
+void gcc_location_set( const YDFLTYPE& loc ) {
+ gcc_location_set_impl(loc);
+}
+
void
cdf_location_set(YYLTYPE loc) {
extern YDFLTYPE ydflloc;
--
GitLab