diff --git a/ChangeLog b/ChangeLog index 4bb2ae442..dd3a93b3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,19 @@ +2003-06-22 Alexandre Duret-Lutz + + * src/tgbatest/tripprod.test, src/tgbatest/explprod.test: + Sort out some possible inversions in the output. + 2003-06-19 Alexandre Duret-Lutz - * src/tgba/tgbabddconcretefactory.cc - (tgba_bdd_concrete_factory::~tgba_bdd_concrete_factory): destroy the + * src/tgba/tgbabddconcretefactory.cc + (tgba_bdd_concrete_factory::~tgba_bdd_concrete_factory): destroy the formulae used as keys in prom_. (tgba_bdd_concrete_factory::create_promise): Delete. - (tgba_bdd_concrete_factory::declare_promise, + (tgba_bdd_concrete_factory::declare_promise, tgba_bdd_concrete_factory::finish): New functions. - * src/tgba/tgbabddconcretefactory.hh + * src/tgba/tgbabddconcretefactory.hh (tgba_bdd_concrete_factory::create_promise): Delete. - (tgba_bdd_concrete_factory::declare_promise, + (tgba_bdd_concrete_factory::declare_promise, tgba_bdd_concrete_factory::finish): New functions. (tgba_bdd_concrete_factory::prom_): New map. * src/tgba/ltl2tgba.cc (ltl_trad_visitor::visit): Adjust diff --git a/src/tgbatest/explprod.test b/src/tgbatest/explprod.test index faca78bc0..7feb7a520 100755 --- a/src/tgbatest/explprod.test +++ b/src/tgbatest/explprod.test @@ -18,12 +18,17 @@ EOF cat >expected < stdout +# Sort out some possible inversions in the output. +# (The order is not guaranteed by SPOT.) +sed 's/c a/a c/g;s/b a/a b/g;s/"p2" "p1"/"p1" "p2"/g' stdout > tmp_ && + mv tmp_ stdout + cat stdout diff stdout expected rm input1 input2 stdout expected diff --git a/src/tgbatest/tripprod.test b/src/tgbatest/tripprod.test index 2b3509b40..476cce873 100755 --- a/src/tgbatest/tripprod.test +++ b/src/tgbatest/tripprod.test @@ -25,15 +25,20 @@ EOF cat >expected < stdout +# Sort out some possible inversions in the output. +# (The order is not guaranteed by SPOT.) +sed 's/c a/a c/g;s/b a/a b/g;s/"p2" "p1"/"p1" "p2"/g;s/"p4" "p3"/"p3" "p4"/g' stdout > tmp_ && + mv tmp_ stdout + cat stdout diff stdout expected rm input1 input2 input3 stdout expected