* evtgbaparse/evtgbaparse.yy, ltlparse/ltlparse.yy,

tgbaparse/tgbaparse.yy: Fix Bison warnings about unset $$.
This commit is contained in:
Alexandre Duret-Lutz 2006-08-30 12:11:28 +00:00
parent 94bf01a53c
commit ac94af5791
4 changed files with 15 additions and 9 deletions

View file

@ -1,5 +1,8 @@
2006-08-30 Alexandre Duret-Lutz <adl@src.lip6.fr> 2006-08-30 Alexandre Duret-Lutz <adl@src.lip6.fr>
* evtgbaparse/evtgbaparse.yy, ltlparse/ltlparse.yy,
tgbaparse/tgbaparse.yy: Fix Bison warnings about unset $$.
* src/tgbaparse/Makefile.am (tgbaparse_HEADERS): Also * src/tgbaparse/Makefile.am (tgbaparse_HEADERS): Also
install location.hh and position.hh, since we no longer share install location.hh and position.hh, since we no longer share
those of ltlvisit. those of ltlvisit.

View file

@ -1,4 +1,4 @@
/* Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), /* Copyright (C) 2004, 2005, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
** département Systèmes Répartis Coopératifs (SRC), Université Pierre ** département Systèmes Répartis Coopératifs (SRC), Université Pierre
** et Marie Curie. ** et Marie Curie.
** **
@ -85,6 +85,7 @@ line: strident ',' strident ',' strident ',' acc_list ';'
string: STRING string: STRING
| UNTERMINATED_STRING | UNTERMINATED_STRING
{ {
$$ = $1;
error_list.push_back(spot::evtgba_parse_error(@1, error_list.push_back(spot::evtgba_parse_error(@1,
"unterminated string")); "unterminated string"));
} }
@ -97,7 +98,8 @@ acc_list:
} }
| acc_list strident | acc_list strident
{ {
$1->insert(spot::rsymbol(*$2)); $$ = $1;
$$->insert(spot::rsymbol(*$2));
delete $2; delete $2;
} }
; ;

View file

@ -1,6 +1,6 @@
/* Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), /* Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de
** département Systèmes Répartis Coopératifs (SRC), Université Pierre ** Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
** et Marie Curie. ** Université Pierre et Marie Curie.
** **
** This file is part of Spot, a model checking library. ** This file is part of Spot, a model checking library.
** **
@ -103,14 +103,14 @@ using namespace spot::ltl;
%nonassoc OP_POST_NEG OP_POST_POS %nonassoc OP_POST_NEG OP_POST_POS
%type <ltl> result subformula %type <ltl> subformula
/* At the time of writing (2004-01-05) there is a bug in CVS Bison: if /* At the time of writing (2004-01-05) there is a bug in CVS Bison: if
you give a token (such a ATOMIC_PROP) a name (such as "atomic you give a token (such a ATOMIC_PROP) a name (such as "atomic
proposition"), then the %destructor should refer to that name. proposition"), then the %destructor should refer to that name.
References to ATOMIC_PROP are silently ignored. */ References to ATOMIC_PROP are silently ignored. */
%destructor { delete $$; } "atomic proposition" %destructor { delete $$; } "atomic proposition"
%destructor { spot::ltl::destroy($$); } result subformula %destructor { spot::ltl::destroy($$); } subformula
%printer { debug_stream() << *$$; } "atomic proposition" %printer { debug_stream() << *$$; } "atomic proposition"

View file

@ -152,6 +152,7 @@ line: strident ',' strident ',' condition ',' acc_list ';'
string: STRING string: STRING
| UNTERMINATED_STRING | UNTERMINATED_STRING
{ {
$$ = $1;
error_list.push_back(spot::tgba_parse_error(@1, error_list.push_back(spot::tgba_parse_error(@1,
"unterminated string")); "unterminated string"));
} }