From 7fdd78614cc0ea5afed287903b386675ea361814 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 26 Jun 2003 15:15:39 +0000 Subject: [PATCH] * src/tgba/ltl2tgba.hh, src/tgba/ltl2tgba.cc: Move ... * src/tgbaalgos/ltl2tgba.hh, src/tgbaalgos/ltl2tgba.cc: ... here. * src/tgba/Makefile.am, src/tgbaalgos/Makefile.am: Adjust. * src/tgba/public.hh: Do not include ltl2tgba.hh. * src/tgbatests/explprod.cc, src/tgbatests/ltl2tgba.cc, src/tgbatests/ltlprod.cc, src/tgbatests/mixprod.cc, src/tgbatests/reach.cc, src/tgbatests/tripprod.cc: Adjust inclusions. --- ChangeLog | 8 ++++++++ src/tgba/Makefile.am | 2 -- src/tgba/public.hh | 1 - src/tgbaalgos/Makefile.am | 3 +++ src/{tgba => tgbaalgos}/ltl2tgba.cc | 2 +- src/{tgba => tgbaalgos}/ltl2tgba.hh | 2 +- src/tgbatest/explprod.cc | 2 +- src/tgbatest/ltl2tgba.cc | 2 +- src/tgbatest/ltlprod.cc | 2 +- src/tgbatest/mixprod.cc | 2 +- src/tgbatest/tripprod.cc | 2 +- 11 files changed, 18 insertions(+), 10 deletions(-) rename src/{tgba => tgbaalgos}/ltl2tgba.cc (99%) rename src/{tgba => tgbaalgos}/ltl2tgba.hh (88%) diff --git a/ChangeLog b/ChangeLog index f5525b140..606a2bf80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-06-26 Alexandre Duret-Lutz + * src/tgba/ltl2tgba.hh, src/tgba/ltl2tgba.cc: Move ... + * src/tgbaalgos/ltl2tgba.hh, src/tgbaalgos/ltl2tgba.cc: ... here. + * src/tgba/Makefile.am, src/tgbaalgos/Makefile.am: Adjust. + * src/tgba/public.hh: Do not include ltl2tgba.hh. + * src/tgbatests/explprod.cc, src/tgbatests/ltl2tgba.cc, + src/tgbatests/ltlprod.cc, src/tgbatests/mixprod.cc, + src/tgbatests/reach.cc, src/tgbatests/tripprod.cc: Adjust inclusions. + * src/tgba/tgbabddcoredata.hh: Fix some Doxygen comments. * src/ltlast/formula.hh: More Doxygen comments. * src/tgba/tgba.hh: Use in Doxygen comments. diff --git a/src/tgba/Makefile.am b/src/tgba/Makefile.am index 359841ebf..64711678c 100644 --- a/src/tgba/Makefile.am +++ b/src/tgba/Makefile.am @@ -7,7 +7,6 @@ tgba_HEADERS = \ bddfactory.hh \ bddprint.hh \ dictunion.hh \ - ltl2tgba.hh \ public.hh \ state.hh \ statebdd.hh \ @@ -30,7 +29,6 @@ libtgba_la_SOURCES = \ bddfactory.cc \ bddprint.cc \ dictunion.cc \ - ltl2tgba.cc \ statebdd.cc \ succiterconcrete.cc \ tgbabddconcrete.cc \ diff --git a/src/tgba/public.hh b/src/tgba/public.hh index c86039d78..9e5c1739e 100644 --- a/src/tgba/public.hh +++ b/src/tgba/public.hh @@ -4,7 +4,6 @@ # include "tgba.hh" # include "tgbabddconcrete.hh" # include "tgbabddconcreteproduct.hh" -# include "ltl2tgba.hh" # include "bddprint.hh" #endif // SPOT_TGBA_PUBLIC_HH diff --git a/src/tgbaalgos/Makefile.am b/src/tgbaalgos/Makefile.am index 1df3e70e5..48e638471 100644 --- a/src/tgbaalgos/Makefile.am +++ b/src/tgbaalgos/Makefile.am @@ -5,9 +5,12 @@ tgbaalgosdir = $(pkgincludedir)/tgbaalgos tgbaalgos_HEADERS = \ dotty.hh \ + ltl2tgba.hh \ save.hh noinst_LTLIBRARIES = libtgbaalgos.la libtgbaalgos_la_SOURCES = \ dotty.cc \ + ltl2tgba.cc \ save.cc + diff --git a/src/tgba/ltl2tgba.cc b/src/tgbaalgos/ltl2tgba.cc similarity index 99% rename from src/tgba/ltl2tgba.cc rename to src/tgbaalgos/ltl2tgba.cc index c873035c3..9b80c5b8a 100644 --- a/src/tgba/ltl2tgba.cc +++ b/src/tgbaalgos/ltl2tgba.cc @@ -3,7 +3,7 @@ #include "ltlvisit/lunabbrev.hh" #include "ltlvisit/nenoform.hh" #include "ltlvisit/destroy.hh" -#include "tgbabddconcretefactory.hh" +#include "tgba/tgbabddconcretefactory.hh" #include #include "ltl2tgba.hh" diff --git a/src/tgba/ltl2tgba.hh b/src/tgbaalgos/ltl2tgba.hh similarity index 88% rename from src/tgba/ltl2tgba.hh rename to src/tgbaalgos/ltl2tgba.hh index 56a154054..a5c0fd71f 100644 --- a/src/tgba/ltl2tgba.hh +++ b/src/tgbaalgos/ltl2tgba.hh @@ -2,7 +2,7 @@ # define SPOT_TGBA_LTL2TGBA_HH #include "ltlast/formula.hh" -#include "tgbabddconcrete.hh" +#include "tgba/tgbabddconcrete.hh" namespace spot { diff --git a/src/tgbatest/explprod.cc b/src/tgbatest/explprod.cc index 5af25b041..82cde4605 100644 --- a/src/tgbatest/explprod.cc +++ b/src/tgbatest/explprod.cc @@ -1,6 +1,6 @@ #include #include -#include "tgba/ltl2tgba.hh" +#include "tgbaalgos/ltl2tgba.hh" #include "tgba/tgbaexplicit.hh" #include "tgba/tgbaproduct.hh" #include "tgbaparse/public.hh" diff --git a/src/tgbatest/ltl2tgba.cc b/src/tgbatest/ltl2tgba.cc index c7830575b..1489581db 100644 --- a/src/tgbatest/ltl2tgba.cc +++ b/src/tgbatest/ltl2tgba.cc @@ -3,7 +3,7 @@ #include "ltlvisit/destroy.hh" #include "ltlast/allnodes.hh" #include "ltlparse/public.hh" -#include "tgba/ltl2tgba.hh" +#include "tgbaalgos/ltl2tgba.hh" #include "tgba/bddprint.hh" #include "tgba/tgbabddtranslatefactory.hh" #include "tgbaalgos/dotty.hh" diff --git a/src/tgbatest/ltlprod.cc b/src/tgbatest/ltlprod.cc index 78915ad79..7c6833b13 100644 --- a/src/tgbatest/ltlprod.cc +++ b/src/tgbatest/ltlprod.cc @@ -3,7 +3,7 @@ #include "ltlvisit/destroy.hh" #include "ltlast/allnodes.hh" #include "ltlparse/public.hh" -#include "tgba/ltl2tgba.hh" +#include "tgbaalgos/ltl2tgba.hh" #include "tgba/tgbaproduct.hh" #include "tgba/tgbabddconcreteproduct.hh" #include "tgbaalgos/dotty.hh" diff --git a/src/tgbatest/mixprod.cc b/src/tgbatest/mixprod.cc index 910a7348e..9f7d932e0 100644 --- a/src/tgbatest/mixprod.cc +++ b/src/tgbatest/mixprod.cc @@ -3,7 +3,7 @@ #include "ltlvisit/destroy.hh" #include "ltlast/allnodes.hh" #include "ltlparse/public.hh" -#include "tgba/ltl2tgba.hh" +#include "tgbaalgos/ltl2tgba.hh" #include "tgba/tgbaproduct.hh" #include "tgba/tgbabddconcreteproduct.hh" #include "tgbaparse/public.hh" diff --git a/src/tgbatest/tripprod.cc b/src/tgbatest/tripprod.cc index eae80c873..65a8fe40d 100644 --- a/src/tgbatest/tripprod.cc +++ b/src/tgbatest/tripprod.cc @@ -1,6 +1,6 @@ #include #include -#include "tgba/ltl2tgba.hh" +#include "tgbaalgos/ltl2tgba.hh" #include "tgba/tgbaexplicit.hh" #include "tgba/tgbaproduct.hh" #include "tgbaparse/public.hh"