Modernize Bison parsers.

* 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

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) 2004, 2005, 2006 Laboratoire d'Informatique de
** Copyright (C) 2004, 2005, 2006 Laboratoire d'Informatique de
** Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
** Université Pierre et Marie Curie.
**
@ -50,11 +50,6 @@
We mut ensure that YYSTYPE is declared (by the above %union)
before parsedecl.hh uses it. */
#include "parsedecl.hh"
/* 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 evtgbayylex
}
%token <str> STRING UNTERMINATED_STRING
@ -64,11 +59,9 @@
%token ACC_DEF
%token INIT_DEF
%destructor { delete $$; } STRING UNTERMINATED_STRING IDENT
strident string acc_list
%destructor { delete $$; } <str>
%printer { debug_stream() << *$$; } STRING UNTERMINATED_STRING IDENT
strident string
%printer { debug_stream() << *$$; } <str>
%%
evtgba: lines