Replace reference to RATEXP in the parser, by reference to SERE.

* src/ltlparse/ltlparse.yy: Cleanup the names used in the grammar.
* src/ltlparse/public.hh (parse_ratexp): Rename as...
(parse_sere): ... this.
* src/ltltest/consterm.cc: Adjust call to parse_ratexp().
This commit is contained in:
Alexandre Duret-Lutz 2011-12-05 19:14:03 +01:00
parent 3d183d68c8
commit fa44383efb
3 changed files with 59 additions and 59 deletions

View file

@ -1,4 +1,4 @@
// Copyright (C) 2010 Laboratoire de Recherche et Développement de
// Copyright (C) 2010, 2011 Laboratoire de Recherche et Développement de
// l'Epita (LRDE).
// Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de
// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
@ -72,13 +72,13 @@ namespace spot
environment& env = default_environment::instance(),
bool debug = false);
/// \brief Build a formula from a string representing a rational expression.
/// \param ratexp_string The string to parse.
/// \brief Build a formula from a string representing a SERE.
/// \param sere_string The string to parse.
/// \param error_list A list that will be filled with
/// parse errors that occured during parsing.
/// \param env The environment into which parsing should take place.
/// \param debug When true, causes the parser to trace its execution.
/// \return A pointer to the formula built from \a ratexp_string, or
/// \return A pointer to the formula built from \a sere_string, or
/// 0 if the input was unparsable.
///
/// Note that the parser usually tries to recover from errors. It can
@ -87,17 +87,17 @@ namespace spot
/// was parsed succesfully, check \a error_list for emptiness.
///
/// \warning This function is not reentrant.
formula* parse_ratexp(const std::string& ratexp_string,
parse_error_list& error_list,
environment& env = default_environment::instance(),
bool debug = false);
formula* parse_sere(const std::string& sere_string,
parse_error_list& error_list,
environment& env = default_environment::instance(),
bool debug = false);
/// \brief Format diagnostics produced by spot::ltl::parse
/// or spot::ltl::ratexp
/// \param os Where diagnostics should be output.
/// \param input_string The string that were parsed.
/// \param error_list The error list filled by spot::ltl::parse
/// or spot::ltl::parse_ratexp while parsing \a input_string.
/// or spot::ltl::parse_sere while parsing \a input_string.
/// \return \c true iff any diagnostic was output.
bool format_parse_errors(std::ostream& os,
const std::string& input_string,