alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modernize Bison parsers.

Browse source 
* src/ltlparse/ltlparse.yy, src/tgbaparse/tgbaparse.yy,
src/evtgbaparse/evtgbaparse.yy, src/eltlparse/eltlparse.yy: Use
token types for %destructor and %printer.  Remove the yylex hack,
since %name-prefix is now honored by Bison.  Also remove the
useless <token> type.  Suggested by Akim Demaille.
This commit is contained in:
Alexandre Duret-Lutz 2010-04-07 16:47:40 +02:00
parent d71ceb3b04
commit bbd526ac81
5 changed files with 37 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tgbaparse/tgbaparse.yy
View file

@ -1,6 +1,6 @@
/* Copyright (C) 2009 Laboratoire de Recherche et Développement
/* Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
** de l'Epita (LRDE).
/* Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de
** Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de
** Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
** Université Pierre et Marie Curie.
**
@ -68,11 +68,6 @@ typedef std::map<std::string, bdd> formula_cache;
#include "parsedecl.hh"
using namespace spot::ltl;
/* Ugly hack so that Bison use tgbayylex, not yylex.
(%name-prefix doesn't work for the lalr1.cc skeleton
at the time of writing.) */
#define yylex tgbayylex
typedef std::pair<bool, spot::ltl::formula*> pair;
}
@ -83,17 +78,15 @@ typedef std::pair<bool, spot::ltl::formula*> pair;
%type <list> acc_list
%token ACC_DEF
%destructor { delete $$; } STRING UNTERMINATED_STRING IDENT
strident string condition
%destructor { delete $$; } <str>
%destructor {
for (std::list<spot::ltl::formula*>::iterator i = $$->begin();
i != $$->end(); ++i)
(*i)->destroy();
delete $$;
} acc_list
} <list>
%printer { debug_stream() << *$$; } STRING UNTERMINATED_STRING IDENT
strident string condition
%printer { debug_stream() << *$$; } <str>
%%
tgba: acceptance_decl lines