From 27b78a5cc5690382d8dd4cad88fc50da60cdb898 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Thu, 24 Apr 2014 16:38:45 +0200
Subject: [PATCH] Simplify the code of a test case.

* src/tgbatest/maskacc.cc: Simplify iteration on acceptance sets.
* src/tgbatest/maskacc.test: Adjust expected order.
---
 src/tgbatest/maskacc.cc   | 10 +++++-----
 src/tgbatest/maskacc.test | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/tgbatest/maskacc.cc b/src/tgbatest/maskacc.cc
index 1d392b686..992a5cfb6 100755
--- a/src/tgbatest/maskacc.cc
+++ b/src/tgbatest/maskacc.cc
@@ -47,12 +47,12 @@ main(int argc, char** argv)
   if (spot::format_tgba_parse_errors(std::cerr, argv[1], pel))
     return 2;
 
-  bdd all = aut->all_acceptance_conditions();
-  while (all != bddfalse)
-    {
-      bdd one = bdd_satone(all);
-      all -= one;
+  bdd allneg = aut->neg_acceptance_conditions();
 
+  for (bdd cur = allneg; cur != bddtrue; cur = bdd_low(cur))
+    {
+      int i = bdd_var(cur);
+      bdd one = bdd_compose(allneg, bdd_nithvar(i), i);
       const spot::tgba* masked = spot::build_tgba_mask_acc_ignore(aut, one);
       spot::tgba_save_reachable(std::cout, masked);
       delete masked;
diff --git a/src/tgbatest/maskacc.test b/src/tgbatest/maskacc.test
index 0e6bb711e..e1082be88 100755
--- a/src/tgbatest/maskacc.test
+++ b/src/tgbatest/maskacc.test
@@ -35,15 +35,15 @@ EOF
 
 cat >expect1 <<EOF
 acc = "B" "A";
-"s1", "s2", "a", "A";
-"s2", "s3", "a",;
-"s3", "s2", "b",;
-"s3", "s4", "b", "A";
-acc = "B" "A";
 "s1", "s3", "b", "B";
 "s3", "s2", "b",;
 "s2", "s3", "a",;
 "s2", "s4", "a", "B";
+acc = "B" "A";
+"s1", "s2", "a", "A";
+"s2", "s3", "a",;
+"s3", "s2", "b",;
+"s3", "s4", "b", "A";
 EOF
 
 run 0 ../maskacc input1 | tee stdout