VeniVidiVici
/
GDAL2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerate ods_formula_parser with Bison 3.8.1 to hopefully avoid Coverity warnings

This commit is contained in:
Even Rouault 2024-11-24 23:36:04 +01:00
parent 181b6b9991
commit ca16dce69a
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
4 changed files with 1166 additions and 1328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pre-commit-config.yaml
View File

@ -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|

2
ogr/ogrsf_frmts/ods/ods_formula.cpp
View File

@ -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},

2420
ogr/ogrsf_frmts/ods/ods_formula_parser.cpp
View File

File diff suppressed because it is too large Load Diff

71
ogr/ogrsf_frmts/ods/ods_formula_parser.hpp
View File

@ -1,8 +1,8 @@
/* A Bison parser, made by GNU Bison 3.5.1. */
/* A Bison parser, made by GNU Bison 3.8.2. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
@ -16,7 +16,7 @@
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/>. */
along with this program. If not, see <https://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@ -31,49 +31,58 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
/* Undocumented macros, especially those whose name start with YY_,
are private implementation details. Do not rely on them. */
/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
especially those whose name start with YY_ or yy_. They are
private implementation details that can be changed or removed. */
#ifndef YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
#define YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
# define YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
#define YYDEBUG 0
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int ods_formuladebug;
#endif
/* Token type. */
/* Token kinds. */
#ifndef YYTOKENTYPE
#define YYTOKENTYPE
enum yytokentype
{
ODST_NUMBER = 258,
ODST_STRING = 259,
ODST_IDENTIFIER = 260,
ODST_FUNCTION_NO_ARG = 261,
ODST_FUNCTION_SINGLE_ARG = 262,
ODST_FUNCTION_TWO_ARG = 263,
ODST_FUNCTION_THREE_ARG = 264,
ODST_FUNCTION_ARG_LIST = 265,
ODST_START = 266,
ODST_NOT = 267,
ODST_OR = 268,
ODST_AND = 269,
ODST_IF = 270,
ODST_UMINUS = 271
};
# define YYTOKENTYPE
enum yytokentype
{
YYEMPTY = -2,
YYEOF = 0, /* "end of file" */
YYerror = 256, /* error */
YYUNDEF = 257, /* "invalid token" */
ODST_NUMBER = 258, /* ODST_NUMBER */
ODST_STRING = 259, /* ODST_STRING */
ODST_IDENTIFIER = 260, /* ODST_IDENTIFIER */
ODST_FUNCTION_NO_ARG = 261, /* ODST_FUNCTION_NO_ARG */
ODST_FUNCTION_SINGLE_ARG = 262, /* ODST_FUNCTION_SINGLE_ARG */
ODST_FUNCTION_TWO_ARG = 263, /* ODST_FUNCTION_TWO_ARG */
ODST_FUNCTION_THREE_ARG = 264, /* ODST_FUNCTION_THREE_ARG */
ODST_FUNCTION_ARG_LIST = 265, /* ODST_FUNCTION_ARG_LIST */
ODST_START = 266, /* ODST_START */
ODST_NOT = 267, /* ODST_NOT */
ODST_OR = 268, /* ODST_OR */
ODST_AND = 269, /* ODST_AND */
ODST_IF = 270, /* ODST_IF */
ODST_UMINUS = 271 /* ODST_UMINUS */
};
typedef enum yytokentype yytoken_kind_t;
#endif
/* Value type. */
#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
#define YYSTYPE_IS_TRIVIAL 1
#define YYSTYPE_IS_DECLARED 1
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
#endif
int ods_formulaparse(ods_formula_parse_context *context);
int ods_formulaparse (ods_formula_parse_context *context);
#endif /* !YY_ODS_FORMULA_ODS_FORMULA_PARSER_HPP_INCLUDED */