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

add options to %x to list atomic propositions

Browse source 
* bin/common_aoutput.cc, bin/common_aoutput.hh, bin/common_output.cc,
bin/common_output.hh: Add options to %x to list atomic propositions
with various quoting scheme.  Deprecate --format=%a in favor of the
new --format=%x for consistency with --stats=%x.
* tests/core/format.test, tests/core/remprop.test: Adjust and add more
tests.
* NEWS: Mention these changes.
This commit is contained in:
Alexandre Duret-Lutz 2017-03-01 16:02:09 +01:00
parent 68ad391948
commit 18283d6907
7 changed files with 169 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/common_output.cc
View file

@ -19,6 +19,7 @@
#include "common_sys.hh"
#include "common_output.hh"
#include "common_aoutput.hh"
#include <iostream>
#include <sstream>
#include <spot/tl/print.hh>
@ -203,13 +204,14 @@ namespace
formula_printer(std::ostream& os, const char* format)
: format_(format)
{
declare('a', &ap_num_);
declare('a', &ap_); // deprecated in 2.3.2
declare('b', &bool_size_);
declare('f', &fl_);
declare('F', &filename_);
declare('L', &line_);
declare('s', &size_);
declare('h', &class_);
declare('x', &ap_);
declare('<', &prefix_);
declare('>', &suffix_);
set_output(os);
@ -225,10 +227,10 @@ namespace
prefix_ = fl.prefix ? fl.prefix : "";
suffix_ = fl.suffix ? fl.suffix : "";
auto f = fl_.val()->f;
if (has('a'))
if (has('a') || has('x'))
{
auto s = spot::atomic_prop_collect(f);
ap_num_ = s->size();
ap_.set(s->begin(), s->end());
delete s;
}
if (has('b'))
@ -250,7 +252,7 @@ namespace
spot::printable_value<int> size_;
printable_formula_class class_;
spot::printable_value<int> bool_size_;
spot::printable_value<int> ap_num_;
printable_varset ap_;
};
}