From b054139e6d4c4856ae53a59c37aca7c05164be0d Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 3 Jan 2005 17:39:43 +0000 Subject: [PATCH] * doc/Doxyfile.in (FILE_PATTERNS): Remove *.hxx. * src/sanity/80columns.test, src/sanity/style.test: Process *.hxx files. * src/tgbaalgos/ndfs_result.hh: Rename as .. * src/tgbaalgos/ndfs_result.hxx: ... this, so it does not get documented (and so Doxygen do not complain). * src/tgbaalgos/magic.cc, src/tgbaalgos/se05.cc, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03opt.cc: Adjust include. * src/tgbaalgos/Makefile.am: Rename ndfs_result.hh as ndfs_result.hxx and do not install it, this is a private header. --- ChangeLog | 10 ++++++++++ HACKING | 2 ++ doc/Doxyfile.in | 3 +-- src/sanity/80columns.test | 4 +++- src/sanity/style.test | 6 ++++-- src/tgbaalgos/Makefile.am | 4 ++-- src/tgbaalgos/magic.cc | 4 ++-- src/tgbaalgos/{ndfs_result.hh => ndfs_result.hxx} | 0 src/tgbaalgos/se05.cc | 4 ++-- src/tgbaalgos/tau03.cc | 4 ++-- src/tgbaalgos/tau03opt.cc | 4 ++-- 11 files changed, 30 insertions(+), 15 deletions(-) rename src/tgbaalgos/{ndfs_result.hh => ndfs_result.hxx} (100%) diff --git a/ChangeLog b/ChangeLog index 7ad48b76f..36b0b554a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2005-01-03 Alexandre Duret-Lutz + * doc/Doxyfile.in (FILE_PATTERNS): Remove *.hxx. + * src/sanity/80columns.test, src/sanity/style.test: Process *.hxx files. + * src/tgbaalgos/ndfs_result.hh: Rename as .. + * src/tgbaalgos/ndfs_result.hxx: ... this, so it does not get + documented (and so Doxygen do not complain). + * src/tgbaalgos/magic.cc, src/tgbaalgos/se05.cc, src/tgbaalgos/tau03.cc, + src/tgbaalgos/tau03opt.cc: Adjust include. + * src/tgbaalgos/Makefile.am: Rename ndfs_result.hh as ndfs_result.hxx + and do not install it, this is a private header. + * src/tgbaalgos/emptiness.hh: Declare Doxygen group emptiness_check_stats. * src/tgbaalgos/emptiness_stats.hh: Use it. diff --git a/HACKING b/HACKING index 8fdad5fbd..747e73678 100644 --- a/HACKING +++ b/HACKING @@ -232,6 +232,8 @@ Naming * C Macros are all uppercase. + * Use *.hxx for the implementation of templates that are private + to Spot (i.e. not installed) and need to be included multiple times. Other style recommandations =========================== diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 678e2e085..e303e891f 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -458,8 +458,7 @@ INPUT = @srcdir@/mainpage.dox \ # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm -FILE_PATTERNS = *.hh \ - *.hxx +FILE_PATTERNS = *.hh # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. diff --git a/src/sanity/80columns.test b/src/sanity/80columns.test index 489659682..54ce7c572 100755 --- a/src/sanity/80columns.test +++ b/src/sanity/80columns.test @@ -8,7 +8,9 @@ rm -f failures for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do - find "$dir" \( -name "${1-*}.hh" -o -name "${1-*}.cc" \ + find "$dir" \( -name "${1-*}.hh" \ + -o -name "${1-*}.hxx" \ + -o -name "${1-*}.cc" \ -o -name "${1-*}.test" \) -a -type f -a -print | while read file; do x='........................................' diff --git a/src/sanity/style.test b/src/sanity/style.test index d1a677294..0435a41d3 100755 --- a/src/sanity/style.test +++ b/src/sanity/style.test @@ -26,8 +26,10 @@ tmp=incltest.tmp for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do - find "$dir" \( -name "${1-*}.hh" -o -name "${1-*}.cc" \) \ - -a -type f -a -print | + find "$dir" \( -name "${1-*}.hh" \ + -o -name "${1-*}.hxx" \ + -o -name "${1-*}.cc" \) \ + -a -type f -a -print | while read file; do if grep 'GNU Bison' "$file" >/dev/null || grep 'generated by flex' "$file" >/dev/null ; then diff --git a/src/tgbaalgos/Makefile.am b/src/tgbaalgos/Makefile.am index dea69bf89..1b814093c 100644 --- a/src/tgbaalgos/Makefile.am +++ b/src/tgbaalgos/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +## Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), ## département Systèmes Répartis Coopératifs (SRC), Université Pierre ## et Marie Curie. ## @@ -38,7 +38,6 @@ tgbaalgos_HEADERS = \ ltl2tgba_fm.hh \ ltl2tgba_lacim.hh \ magic.hh \ - ndfs_result.hh \ neverclaim.hh \ powerset.hh \ projrun.hh \ @@ -67,6 +66,7 @@ libtgbaalgos_la_SOURCES = \ ltl2tgba_fm.cc \ ltl2tgba_lacim.cc \ magic.cc \ + ndfs_result.hxx \ neverclaim.cc \ powerset.cc \ projrun.cc \ diff --git a/src/tgbaalgos/magic.cc b/src/tgbaalgos/magic.cc index e4104909a..539ef9a76 100644 --- a/src/tgbaalgos/magic.cc +++ b/src/tgbaalgos/magic.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // @@ -35,7 +35,7 @@ #include "emptiness.hh" #include "emptiness_stats.hh" #include "magic.hh" -#include "ndfs_result.hh" +#include "ndfs_result.hxx" namespace spot { diff --git a/src/tgbaalgos/ndfs_result.hh b/src/tgbaalgos/ndfs_result.hxx similarity index 100% rename from src/tgbaalgos/ndfs_result.hh rename to src/tgbaalgos/ndfs_result.hxx diff --git a/src/tgbaalgos/se05.cc b/src/tgbaalgos/se05.cc index 771b3753f..e4b76f7ba 100644 --- a/src/tgbaalgos/se05.cc +++ b/src/tgbaalgos/se05.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // @@ -35,7 +35,7 @@ #include "emptiness.hh" #include "emptiness_stats.hh" #include "se05.hh" -#include "ndfs_result.hh" +#include "ndfs_result.hxx" /// FIXME: make compiling depedent the taking into account of weights. diff --git a/src/tgbaalgos/tau03.cc b/src/tgbaalgos/tau03.cc index 23418584d..1897c7822 100644 --- a/src/tgbaalgos/tau03.cc +++ b/src/tgbaalgos/tau03.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // @@ -38,7 +38,7 @@ #include "emptiness.hh" #include "emptiness_stats.hh" #include "tau03.hh" -#include "ndfs_result.hh" +#include "ndfs_result.hxx" namespace spot { diff --git a/src/tgbaalgos/tau03opt.cc b/src/tgbaalgos/tau03opt.cc index aff01e439..5e3542123 100644 --- a/src/tgbaalgos/tau03opt.cc +++ b/src/tgbaalgos/tau03opt.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6), +// Copyright (C) 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // département Systèmes Répartis Coopératifs (SRC), Université Pierre // et Marie Curie. // @@ -47,7 +47,7 @@ #include "emptiness_stats.hh" #include "tau03opt.hh" #include "weight.hh" -#include "ndfs_result.hh" +#include "ndfs_result.hxx" namespace spot {