From 450f38f74da7ce595becbe90b8d9e2e7d7808fc2 Mon Sep 17 00:00:00 2001
From: Antoine Martin <amartin@lrde.epita.fr>
Date: Mon, 6 Mar 2023 18:37:28 +0100
Subject: [PATCH] expansions: allow toggling merge_edges off

---
 spot/tl/expansions.cc | 6 +++++-
 spot/tl/expansions.hh | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/spot/tl/expansions.cc b/spot/tl/expansions.cc
index 1d225b603..f68fb2d9d 100644
--- a/spot/tl/expansions.cc
+++ b/spot/tl/expansions.cc
@@ -1759,7 +1759,11 @@ namespace spot
       }
 
     aut->set_named_prop("state-names", state_names);
-    aut->merge_edges();
+
+    if ((opts & exp_opts_new::MergeEdges)
+        && !(opts & exp_opts_new::UniqueSuffix))
+      aut->merge_edges();
+
     return aut;
   }
 }
diff --git a/spot/tl/expansions.hh b/spot/tl/expansions.hh
index 4286e8fd6..52e83917f 100644
--- a/spot/tl/expansions.hh
+++ b/spot/tl/expansions.hh
@@ -51,6 +51,7 @@ namespace spot
       UniquePrefix = 2,
       BddIsop = 4,
       BddMinterm = 8,
+      MergeEdges = 16,
     };
   };