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

bin: add the --output to tools that output formulas

Browse source 
* src/bin/common_output.cc, src/bin/common_output.hh: Add option
--output.
* src/ltltest/ltlfilt.test, src/ltltest/rand.test: Add tests.
* NEWS, doc/org/ioltl.org: Document it.
This commit is contained in:
Alexandre Duret-Lutz 2015-02-15 23:50:48 +01:00
parent e22a800fe4
commit 78def4f8ca
6 changed files with 96 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/bin/common_output.hh
View file

@ -23,9 +23,12 @@
#include "common_sys.hh"
#include <argp.h>
#include <map>
#include <memory>
#include "ltlast/formula.hh"
#include "tgbaalgos/stats.hh"
#include "common_output.hh"
#include "common_file.hh"
enum output_format_t { spot_output, spin_output, utf8_output,
lbt_output, wring_output, latex_output,
@ -38,9 +41,6 @@ extern const struct argp output_argp;
int parse_opt_output(int key, char* arg, struct argp_state* state);
void output_formula(std::ostream& os, const spot::ltl::formula* f,
const char* filename = 0, int linenum = 0,
const char* prefix = 0, const char* suffix = 0);
void output_formula_checked(const spot::ltl::formula* f,
const char* filename = 0, int linenum = 0,
const char* prefix = 0, const char* suffix = 0);
@ -58,10 +58,7 @@ public:
}
virtual void
print(std::ostream& os, const char*) const
{
output_formula(os, val_);
}
print(std::ostream& os, const char*) const;
};
class aut_stat_printer: protected spot::stat_printer
@ -73,6 +70,8 @@ public:
declare('f', &formula_); // Override the formula printer.
}
using spot::formater::set_output;
std::ostream&
print(const spot::const_tgba_digraph_ptr& aut,
const spot::ltl::formula* f = 0,