From efdfe27bee2560d12d612b8086bc66dbb910c617 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 8 Nov 2019 10:51:57 +0100 Subject: [PATCH] Add option -t for bison. The added debugging code doesn't harm, and it silences scan-build. --- src/xbt/automaton/parserPromela.tab.cacc | 26 +++++++++++++----------- src/xbt/automaton/parserPromela.tab.hacc | 4 ++-- tools/cmake/MaintainerMode.cmake | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/xbt/automaton/parserPromela.tab.cacc b/src/xbt/automaton/parserPromela.tab.cacc index 5585076aef..002434501c 100644 --- a/src/xbt/automaton/parserPromela.tab.cacc +++ b/src/xbt/automaton/parserPromela.tab.cacc @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.4.1. */ +/* A Bison parser, made by GNU Bison 3.4.2. */ /* Bison implementation for Yacc-like parsers in C @@ -48,7 +48,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.4.1" +#define YYBISON_VERSION "3.4.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -118,7 +118,7 @@ static void new_transition(char* id, xbt_automaton_exp_label_t label); # define YY_XBT_AUTOMATON_PARSER_PARSERPROMELA_TAB_HACC_INCLUDED /* Debug traces. */ #ifndef YYDEBUG -# define YYDEBUG 0 +# define YYDEBUG 1 #endif #if YYDEBUG extern int xbt_automaton_parser_debug; @@ -666,7 +666,9 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) if (yytype < YYNTOKENS) YYPRINT (yyo, yytoknum[yytype], *yyvaluep); # endif + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -1267,53 +1269,53 @@ yyreduce: case 4: #line 64 "parserPromela.yacc" { new_state((yyvsp[-1].string), 1);} -#line 1271 "parserPromela.tab.cacc" +#line 1273 "parserPromela.tab.cacc" break; case 7: #line 68 "parserPromela.yacc" { new_transition((yyvsp[-1].string), (yyvsp[-4].label));} -#line 1277 "parserPromela.tab.cacc" +#line 1279 "parserPromela.tab.cacc" break; case 8: #line 71 "parserPromela.yacc" { (yyval.label) = (yyvsp[-1].label); } -#line 1283 "parserPromela.tab.cacc" +#line 1285 "parserPromela.tab.cacc" break; case 9: #line 72 "parserPromela.yacc" { (yyval.label) = xbt_automaton_exp_label_new_or((yyvsp[-2].label), (yyvsp[0].label)); } -#line 1289 "parserPromela.tab.cacc" +#line 1291 "parserPromela.tab.cacc" break; case 10: #line 73 "parserPromela.yacc" { (yyval.label) = xbt_automaton_exp_label_new_and((yyvsp[-2].label), (yyvsp[0].label)); } -#line 1295 "parserPromela.tab.cacc" +#line 1297 "parserPromela.tab.cacc" break; case 11: #line 74 "parserPromela.yacc" { (yyval.label) = xbt_automaton_exp_label_new_not((yyvsp[0].label)); } -#line 1301 "parserPromela.tab.cacc" +#line 1303 "parserPromela.tab.cacc" break; case 12: #line 75 "parserPromela.yacc" { (yyval.label) = xbt_automaton_exp_label_new_one(); } -#line 1307 "parserPromela.tab.cacc" +#line 1309 "parserPromela.tab.cacc" break; case 13: #line 76 "parserPromela.yacc" { (yyval.label) = xbt_automaton_exp_label_new_predicat((yyvsp[0].string)); } -#line 1313 "parserPromela.tab.cacc" +#line 1315 "parserPromela.tab.cacc" break; -#line 1317 "parserPromela.tab.cacc" +#line 1319 "parserPromela.tab.cacc" default: break; } diff --git a/src/xbt/automaton/parserPromela.tab.hacc b/src/xbt/automaton/parserPromela.tab.hacc index 18c33f782a..3add96ded5 100644 --- a/src/xbt/automaton/parserPromela.tab.hacc +++ b/src/xbt/automaton/parserPromela.tab.hacc @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.4.1. */ +/* A Bison parser, made by GNU Bison 3.4.2. */ /* Bison interface for Yacc-like parsers in C @@ -38,7 +38,7 @@ # define YY_XBT_AUTOMATON_PARSER_PARSERPROMELA_TAB_HACC_INCLUDED /* Debug traces. */ #ifndef YYDEBUG -# define YYDEBUG 0 +# define YYDEBUG 1 #endif #if YYDEBUG extern int xbt_automaton_parser_debug; diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake index 000cc6feca..f1be39cc8f 100644 --- a/tools/cmake/MaintainerMode.cmake +++ b/tools/cmake/MaintainerMode.cmake @@ -90,7 +90,7 @@ if(enable_maintainer_mode AND NOT WIN32) ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/parserPromela.yacc COMMENT "Generating automaton source files" - COMMAND ${BISON_EXE} --name-prefix=xbt_automaton_parser_ -d parserPromela.yacc + COMMAND ${BISON_EXE} --name-prefix=xbt_automaton_parser_ -d -t parserPromela.yacc COMMAND ${LEX_EXE} --prefix=xbt_automaton_parser_ --outfile=automaton_lexer.yy.c parserPromela.lex WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/src/xbt/automaton/ ) -- 2.20.1