hwpfilter/source/grammar.cxx | 34 ---------------------------------- 1 file changed, 34 deletions(-)
New commits: commit e746d8d3af46cb17c705dd7d6724cff8bdd6bca8 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Mar 21 09:24:23 2022 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Mar 21 12:24:38 2022 +0100 YYPARSE_PARAM is not defined Change-Id: Icda8e09ceb5e2bebb5187d00c0baa1bcccda88a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131892 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx index e3a19a2d096e..556bd2c8949f 100644 --- a/hwpfilter/source/grammar.cxx +++ b/hwpfilter/source/grammar.cxx @@ -396,28 +396,13 @@ int yydebug; /* nonzero means print parse trace */ #define YYMAXDEPTH 10000 #endif -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ - -#ifdef YYPARSE_PARAM -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -#define YYPARSE_PARAM_DECL -#else /* not YYPARSE_PARAM */ #define YYPARSE_PARAM_ARG #define YYPARSE_PARAM_DECL -#endif /* not YYPARSE_PARAM */ /* Prevent warning if -Wstrict-prototypes. */ #ifdef __GNUC__ -#ifdef YYPARSE_PARAM -int yyparse (void *); -#else static int yyparse(); #endif -#endif static int yyparse(YYPARSE_PARAM_ARG) commit 08039ee959eefc6888e966fe3b3769abffd1fafc Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Mar 21 09:23:03 2022 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Mar 21 12:24:25 2022 +0100 YYPURE is not defined Change-Id: I5942de482c6216fba2c35fa6d113c44639d349e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131891 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx index c5a8997c0e28..e3a19a2d096e 100644 --- a/hwpfilter/source/grammar.cxx +++ b/hwpfilter/source/grammar.cxx @@ -363,28 +363,15 @@ const short yycheck[] = { 11, #define YYTERROR 1 -#ifndef YYPURE #define YYLEX yylex() -#endif - -#ifdef YYPURE -#ifdef YYLEX_PARAM -#define YYLEX yylex(&yylval, YYLEX_PARAM) -#else -#define YYLEX yylex(&yylval) -#endif -#endif /* If nonreentrant, generate the variables here */ -#ifndef YYPURE - static int yychar; /* the lookahead symbol */ YYSTYPE yylval; /* the semantic value of the */ /* lookahead symbol */ static int yynerrs; /* number of parse errors so far */ -#endif /* not YYPURE */ #if YYDEBUG != 0 int yydebug; /* nonzero means print parse trace */ @@ -452,12 +439,6 @@ yyparse(YYPARSE_PARAM_ARG) int yystacksize = YYINITDEPTH; int yyfree_stacks = 0; -#ifdef YYPURE - int yychar; - YYSTYPE yylval; - int yynerrs; -#endif - YYSTYPE yyval; /* the variable used to return */ yyval.dval = nullptr; /* semantic values from the action */