Merge pull request #11347 from rouault/ods_parser_bison_update

Regenerate ods_formula_parser with Bison 3.8.1 to hopefully avoid Coverity warnings
OSGeo · Nov 26, 2024 · 30471cd · 30471cd
2 parents 0599106 + ca16dce
commit 30471cd
Show file tree

Hide file tree

Showing 4 changed files with 1,189 additions and 1,351 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -67,6 +67,7 @@ repos:
                 ogr/ogrsf_frmts/flatgeobuf/flatbuffers/|
                 ogr/ogrsf_frmts/pmtiles/pmtiles/|
                 ogr/ogrsf_frmts/ods/ods_formula_parser.cpp|
+                ogr/ogrsf_frmts/ods/ods_formula_parser.hpp|
                 ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load|
                 ogr/swq_parser.cpp|
                 ogr/swq_parser.hpp|

diff --git a/ogr/ogrsf_frmts/ods/ods_formula.cpp b/ogr/ogrsf_frmts/ods/ods_formula.cpp
@@ -27,8 +27,6 @@ int ods_formulalex(ods_formula_node **ppNode,
 #include "ods_formula_parser.cpp"
 } /* end of anonymous namespace */
 
-#define YYSTYPE ods_formula_node *
-
 static const SingleOpStruct apsSingleOp[] = {
     {"ABS", ODS_ABS, fabs},   {"SQRT", ODS_SQRT, sqrt},
     {"COS", ODS_COS, cos},    {"SIN", ODS_SIN, sin},