Merge pull request #3821 from rouault/unused-but-set-variable-wkt

Fix -Wunused-but-set-variable with recent clang in bison generated parsers
OSGeo · Jul 12, 2023 · f440bfd · f440bfd
2 parents ed8f029 + 0f2a227
commit f440bfd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/generate_wkt_parser.cmake b/src/generate_wkt_parser.cmake
@@ -15,4 +15,8 @@ string(REPLACE "yyerrlab1:" "#endif\nyyerrlab1:" CONTENTS "${CONTENTS}")
 string(REPLACE "for (yylen = 0; yystr[yylen]; yylen++)" "for (yylen = 0; yystr && yystr[yylen]; yylen++)" CONTENTS "${CONTENTS}")
 string(REPLACE "return yystpcpy (yyres, yystr) - yyres;" "return (YYPTRDIFF_T)(yystpcpy (yyres, yystr) - yyres);" CONTENTS "${CONTENTS}")
 string(REPLACE "YYPTRDIFF_T yysize = yyssp - yyss + 1;" "YYPTRDIFF_T yysize = (YYPTRDIFF_T)(yyssp - yyss + 1);" CONTENTS "${CONTENTS}")
+string(REPLACE "#define yynerrs         pj_wkt1_nerrs" "/* #define yynerrs         pj_wkt1_nerrs */" CONTENTS "${CONTENTS}")
+string(REPLACE "int yynerrs;" "/* int yynerrs; */" CONTENTS "${CONTENTS}")
+string(REPLACE "yynerrs = 0;" "/* yynerrs = 0; */" CONTENTS "${CONTENTS}")
+string(REPLACE "++yynerrs;" "/* ++yynerrs; */" CONTENTS "${CONTENTS}")
 file(WRITE "${OUT_FILE}" "${CONTENTS}")
diff --git a/src/wkt1_generated_parser.c b/src/wkt1_generated_parser.c
@@ -68,7 +68,7 @@
 #define yylex           pj_wkt1_lex
 #define yyerror         pj_wkt1_error
 #define yydebug         pj_wkt1_debug
-#define yynerrs         pj_wkt1_nerrs
+/* #define yynerrs         pj_wkt1_nerrs */
 
 /* First part of user prologue.  */
 
@@ -1315,7 +1315,7 @@ YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
 YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
-    int yynerrs;
+    /* int yynerrs; */
 
     yy_state_fast_t yystate;
     /* Number of tokens to shift before error messages enabled.  */
@@ -1369,7 +1369,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
   yystate = 0;
   yyerrstatus = 0;
-  yynerrs = 0;
+  /* yynerrs = 0; */
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
@@ -1604,7 +1604,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
-      ++yynerrs;
+      /* ++yynerrs; */
 #if ! YYERROR_VERBOSE
       yyerror (context, YY_("syntax error"));
 #else

diff --git a/src/wkt2_generated_parser.c b/src/wkt2_generated_parser.c
@@ -2882,7 +2882,7 @@ YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
 YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
-    int yynerrs;
+    /* int yynerrs; */
 
     yy_state_fast_t yystate;
     /* Number of tokens to shift before error messages enabled.  */
@@ -2936,7 +2936,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
   yystate = 0;
   yyerrstatus = 0;
-  yynerrs = 0;
+  /* yynerrs = 0; */
   yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
@@ -3171,7 +3171,7 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
-      ++yynerrs;
+      /* ++yynerrs; */
 #if ! YYERROR_VERBOSE
       yyerror (context, YY_("syntax error"));
 #else