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

Maintain basic LTL properties using a bitfield inside formula objects.

Browse source 
This bitfield is easily updated as the formulae are constructed.
Doing so avoids many AST recursions to compute these properties
individually.  This patch removes the eventual_universal_visitor,
as well as the kind_of() function.

* src/ltlast/formula.hh (is_boolean, is_sugar_free_boolean,
is_in_nenoform, is_X_free, is_sugar_free_ltl,
is_ltl_formula, is_eltl_formula, is_psl_formula, is_eventual,
is_universal, is_marked): New methods to query formula
properties in constant time.
(get_props, ltl_prop): A method and structure for
implementation as a field bit in an unsigned, for fast
computation.
(print_formula_props): New function.
* src/ltlast/formula.cc (print_formula_props): Implement it.
* src/ltlast/atomic_prop.cc, src/ltlast/binop.cc,
src/ltlast/bunop.cc, src/ltlast/constant.cc, src/ltlast/multop.cc,
src/ltlast/unop.cc, src/ltlast/automatop.cc: Compute the
properties as instances are constructed.
* src/ltlparse/ltlparse.yy: Update to use is_boolean() instead
of kind_of().
* src/ltltest/kind.cc: Update to use print_formula_props().
* src/ltltest/kind.test: Adjust to test eventual and universal
properties.
* src/ltlvisit/kind.cc, src/ltlvisit/kind.hh: Delete these files.
* src/ltlvisit/Makefile.am: Remove kind.hh and kind.cc.
* src/ltlvisit/reduce.cc (recurse_eu, eventual_universal_visitor):
Remove, no longer needed.
(reduce_visitor, is_eventual, is_universal): Adjust to
use formula::is_eventual(), and formula::is_universal().
* src/ltlvisit/reduce.hh (is_eventual, is_universal): Declare as
deprecated.
This commit is contained in:
Alexandre Duret-Lutz 2010-12-08 18:22:35 +01:00
parent 1671aa5da1
commit 546260e7a0
17 changed files with 408 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/ltlast/formula.cc
View file

@ -1,4 +1,4 @@
// 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, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
@ -23,6 +23,7 @@
#include "formula.hh"
#include "misc/hash.hh"
#include <iostream>
namespace spot
{
@ -60,5 +61,32 @@ namespace spot
// Not reference counted by default.
return false;
}
std::ostream&
print_formula_props(std::ostream& out, const formula* f, bool abbr)
{
const char* comma = abbr ? "" : ", ";
const char* sep = "";
#define proprint(m, a, l) \
if (f->m()) \
{ \
out << sep; out << (abbr ? a : l); \
sep = comma; \
}
proprint(is_boolean, "B", "Boolean formula");
proprint(is_sugar_free_boolean, "&", "without Boolean sugar");
proprint(is_in_nenoform, "!", "in negative normal form");
proprint(is_X_free, "x", "without X operator");
proprint(is_sugar_free_ltl, "f", "without LTL sugar");
proprint(is_ltl_formula, "L", "LTL formula");
proprint(is_eltl_formula, "E", "ELTL formula");
proprint(is_psl_formula, "P", "PSL formula");
proprint(is_eventual, "e", "pure eventuality");
proprint(is_universal, "u", "purely universal");
proprint(is_marked, "+", "marked");
return out;
}
}
}