- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Initialization machinery improved.
by Roberto Bagnara 20 Jan '15

20 Jan '15

Module: ppl/ppl Branch: master Commit: 74d3a39c15fe5a1feeb3513859470f4fa9d74cd9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=74d3a39c15fe… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Jan 20 13:01:00 2015 +0100 Initialization machinery improved. Previously there was undefined behavior for the case where the user defined PPL_NO_AUTOMATIC_INITIALIZATION. (Thanks to Esseger.) --- src/Init.cc | 32 ++++++++++++++++++++++++++++++-- src/initializer.hh | 19 ++++++++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/src/Init.cc b/src/Init.cc index 8359b96..b572ab7 100644 --- a/src/Init.cc +++ b/src/Init.cc @@ -92,9 +92,9 @@ namespace Implementation { int (* volatile ppl_check_function_p)() = ppl_check_function; int (* volatile ppl_setround_function_p)(int) = ppl_setround_function; -} // Implementation +} // namespace Implementation -} // Parma_Polyhedra_Library +} // namespace Parma_Polyhedra_Library namespace { @@ -214,3 +214,31 @@ PPL::Init::~Init() { Coefficient_constants_finalize(); } } + +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +namespace { + +static Parma_Polyhedra_Library::Init* Parma_Polyhedra_Library_initializer_p; + +} // namespace + +void +initialize_aux() { + if (Parma_Polyhedra_Library_initializer_p == 0) { + Parma_Polyhedra_Library_initializer_p = new Init(); + } +} + +void +finalize_aux() { + PPL_ASSERT(Parma_Polyhedra_Library_initializer_p != 0); + delete Parma_Polyhedra_Library_initializer_p; + Parma_Polyhedra_Library_initializer_p = 0; +} + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library diff --git a/src/initializer.hh b/src/initializer.hh index 6963c0f..d10f54d 100644 --- a/src/initializer.hh +++ b/src/initializer.hh @@ -32,7 +32,16 @@ static Parma_Polyhedra_Library::Init Parma_Polyhedra_Library_initializer; #else -static Parma_Polyhedra_Library::Init* Parma_Polyhedra_Library_initializer_p; +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +void initialize_aux(); +void finalize_aux(); + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library #endif @@ -42,9 +51,7 @@ namespace Parma_Polyhedra_Library { inline void initialize() { #ifdef PPL_NO_AUTOMATIC_INITIALIZATION - if (Parma_Polyhedra_Library_initializer_p == 0) { - Parma_Polyhedra_Library_initializer_p = new Init(); - } + Implementation::initialize_aux(); #endif } @@ -52,9 +59,7 @@ initialize() { inline void finalize() { #ifdef PPL_NO_AUTOMATIC_INITIALIZATION - PPL_ASSERT(Parma_Polyhedra_Library_initializer_p != 0); - delete Parma_Polyhedra_Library_initializer_p; - Parma_Polyhedra_Library_initializer_p = 0; + Implementation::finalize_aux(); #endif }

1 0

[GIT] ppl/ppl(master): Version number bumped.
by Roberto Bagnara 20 Jan '15

20 Jan '15

Module: ppl/ppl Branch: master Commit: 23898e6e459da64263f6a1c37573f99a1dcc61ed URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=23898e6e459d… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Jan 20 12:55:48 2015 +0100 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index b4e8d0e..5d892d0 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [1.2pre5], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [1.2pre6], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0

[GIT] ppl/ppl(master): Improved.
by Roberto Bagnara 01 Jan '15

01 Jan '15

Module: ppl/ppl Branch: master Commit: e7ffebb0ea621ba9c90f961ab93239f2098b106a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e7ffebb0ea62… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jan 1 11:17:39 2015 +0100 Improved. --- devtools/bump_copyright_years | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devtools/bump_copyright_years b/devtools/bump_copyright_years index 7eb9a1c..dc4a511 100755 --- a/devtools/bump_copyright_years +++ b/devtools/bump_copyright_years @@ -2,7 +2,7 @@ temp_file=`mktemp /tmp/bump_copyright_years.XXXXXXXXXX` || exit 1 find . -type f -print0 | while read -d $'\0' file do - sed -e "s/Copyright (C) 2010-2015 BUGSENG srl/Copyright (C) 2010-2016 BUGSENG srl/g" <$file >$temp_file - chmod --reference=$file $temp_file - mv -f $temp_file $file + sed -e "s/Copyright (C) 2010-2015 BUGSENG srl/Copyright (C) 2010-2016 BUGSENG srl/g" <"${file}" >"${temp_file}" + chmod --reference="${file}" "${temp_file}" + mv -f "${temp_file}" "${file}" done

1 0

[GIT] ppl/ppl(master): Extended copyright years.
by Roberto Bagnara 01 Jan '15

01 Jan '15

Module: ppl/ppl Branch: master Commit: 073e9bd3b423ea3e9eb5b7a62912b8b1e5f6b8fb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=073e9bd3b423… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Thu Jan 1 10:59:51 2015 +0100 Extended copyright years. --- devtools/bump_copyright_years | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/devtools/bump_copyright_years b/devtools/bump_copyright_years index bd03f2b..7eb9a1c 100755 --- a/devtools/bump_copyright_years +++ b/devtools/bump_copyright_years @@ -2,7 +2,7 @@ temp_file=`mktemp /tmp/bump_copyright_years.XXXXXXXXXX` || exit 1 find . -type f -print0 | while read -d $'\0' file do - sed -e "s/Copyright (C) 2010-2015 BUGSENG srl/Copyright (C) 2010-2015 BUGSENG srl/g" <$file >$temp_file + sed -e "s/Copyright (C) 2010-2015 BUGSENG srl/Copyright (C) 2010-2016 BUGSENG srl/g" <$file >$temp_file chmod --reference=$file $temp_file mv -f $temp_file $file done

1 0

[GIT] ppl/ppl(master): Extended copyright years.
by Roberto Bagnara 01 Jan '15

01 Jan '15

1 0

[GIT] ppl/ppl(master): Corrected several header inclusions.
by Roberto Bagnara 24 Dec '14

24 Dec '14

Module: ppl/ppl Branch: master Commit: bde8814132c937849986d838c3a0b83e46f5f3d6 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bde8814132c9… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Wed Dec 24 12:10:06 2014 +0100 Corrected several header inclusions. Fixes violations of rule UCGP1.F1 detected by ECLAIR. --- demos/ppl_lpsol/dummy.cc | 4 +++- demos/ppl_lpsol/ppl_lpsol.c | 2 +- src/BDS_Status.cc | 2 ++ src/Box_Status.cc | 2 ++ src/Floating_Point_Expression_defs.hh | 2 +- src/Interval_defs.hh | 2 +- src/MIP_Problem.cc | 12 ++++++------ src/NNC_Polyhedron_defs.hh | 2 +- src/OR_Matrix_defs.hh | 2 +- src/Og_Status.cc | 2 ++ 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/demos/ppl_lpsol/dummy.cc b/demos/ppl_lpsol/dummy.cc index 77ed707..9ee2793 100644 --- a/demos/ppl_lpsol/dummy.cc +++ b/demos/ppl_lpsol/dummy.cc @@ -10,4 +10,6 @@ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -// This file intentionally contains only this comment :-) +// This file intentionally contains only the following inclusion. +#include "ppl-config.h" + diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c index 52d1cce..e5ce611 100644 --- a/demos/ppl_lpsol/ppl_lpsol.c +++ b/demos/ppl_lpsol/ppl_lpsol.c @@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ -#include <ppl-config.h> +#include "ppl-config.h" #include "ppl_c.h" #include <gmp.h> #include <stdio.h> diff --git a/src/BDS_Status.cc b/src/BDS_Status.cc index 81e979e..0e67012 100644 --- a/src/BDS_Status.cc +++ b/src/BDS_Status.cc @@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ +#include "ppl-config.h" + namespace Parma_Polyhedra_Library { namespace Implementation { diff --git a/src/Box_Status.cc b/src/Box_Status.cc index b12709d..222ee41 100644 --- a/src/Box_Status.cc +++ b/src/Box_Status.cc @@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ +#include "ppl-config.h" + namespace Parma_Polyhedra_Library { namespace Implementation { diff --git a/src/Floating_Point_Expression_defs.hh b/src/Floating_Point_Expression_defs.hh index a69dc87..38d3cbd 100644 --- a/src/Floating_Point_Expression_defs.hh +++ b/src/Floating_Point_Expression_defs.hh @@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Floating_Point_Expression_defs_hh #define PPL_Floating_Point_Expression_defs_hh 1 -#include "globals_defs.hh" #include "Floating_Point_Expression_types.hh" +#include "globals_defs.hh" #include "Linear_Form_types.hh" #include "Box_types.hh" #include <cmath> diff --git a/src/Interval_defs.hh b/src/Interval_defs.hh index 52385d1..376a5f3 100644 --- a/src/Interval_defs.hh +++ b/src/Interval_defs.hh @@ -24,11 +24,11 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_Interval_defs_hh #define PPL_Interval_defs_hh 1 +#include "Interval_types.hh" #include "globals_defs.hh" #include "meta_programming.hh" #include "assign_or_swap.hh" #include "intervals_defs.hh" -#include "Interval_types.hh" #include "Interval_Info_defs.hh" #include <iosfwd> diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc index 1ca83d6..38e97d7 100644 --- a/src/MIP_Problem.cc +++ b/src/MIP_Problem.cc @@ -34,12 +34,6 @@ site: http://bugseng.com/products/ppl/ . */ #include "Scalar_Products_inlines.hh" #include "math_utilities_defs.hh" -#include <stdexcept> -#include <deque> -#include <vector> -#include <algorithm> -#include <cmath> - // TODO: Remove this when the sparse working cost has been tested enough. #if PPL_USE_SPARSE_MATRIX @@ -58,6 +52,12 @@ site: http://bugseng.com/products/ppl/ . */ #define PPL_SIMPLEX_USE_MIP_HEURISTIC 1 #endif +#include <stdexcept> +#include <deque> +#include <vector> +#include <algorithm> +#include <cmath> + #if PPL_NOISY_SIMPLEX #include <iostream> #endif diff --git a/src/NNC_Polyhedron_defs.hh b/src/NNC_Polyhedron_defs.hh index 962d201..1dbfb76 100644 --- a/src/NNC_Polyhedron_defs.hh +++ b/src/NNC_Polyhedron_defs.hh @@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_NNC_Polyhedron_defs_hh #define PPL_NNC_Polyhedron_defs_hh 1 -#include "C_Polyhedron_types.hh" #include "NNC_Polyhedron_types.hh" +#include "C_Polyhedron_types.hh" #include "Polyhedron_defs.hh" #include "Grid_types.hh" diff --git a/src/OR_Matrix_defs.hh b/src/OR_Matrix_defs.hh index 9ee49d3..8a12b3d 100644 --- a/src/OR_Matrix_defs.hh +++ b/src/OR_Matrix_defs.hh @@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */ #ifndef PPL_OR_Matrix_defs_hh #define PPL_OR_Matrix_defs_hh 1 -#include "globals_defs.hh" #include "OR_Matrix_types.hh" +#include "globals_defs.hh" #include "DB_Row_defs.hh" #include "Checked_Number_defs.hh" #include <cstddef> diff --git a/src/Og_Status.cc b/src/Og_Status.cc index b5314f6..e79dc05 100644 --- a/src/Og_Status.cc +++ b/src/Og_Status.cc @@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. For the most up-to-date information see the Parma Polyhedra Library site: http://bugseng.com/products/ppl/ . */ +#include "ppl-config.h" + namespace Parma_Polyhedra_Library { namespace Implementation {

1 0

[GIT] ppl/ppl(master): Provided virtual method anchor.
by Roberto Bagnara 23 Dec '14

23 Dec '14

Module: ppl/ppl Branch: master Commit: 888f37dcafe2dee1e306b505fcba51709bc4aaf8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=888f37dcafe2… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 23 22:01:32 2014 +0100 Provided virtual method anchor. Fixes a violation of rule UCGP1.L4 detected by ECLAIR. --- src/Handler.cc | 6 ++++++ src/Handler_inlines.hh | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Handler.cc b/src/Handler.cc index 49438fc..275ec62 100644 --- a/src/Handler.cc +++ b/src/Handler.cc @@ -28,3 +28,9 @@ namespace PPL = Parma_Polyhedra_Library; PPL::Implementation::Watchdog::Handler::~Handler() { } + +void +PPL::Implementation::Watchdog::Handler_Function::act() const { + (*f)(); +} + diff --git a/src/Handler_inlines.hh b/src/Handler_inlines.hh index bd11dfe..5d10b90 100644 --- a/src/Handler_inlines.hh +++ b/src/Handler_inlines.hh @@ -49,11 +49,6 @@ Handler_Function::Handler_Function(void (* const function)()) : f(function) { } -inline void -Handler_Function::act() const { - (*f)(); -} - } // namespace Watchdog } // namespace Implementation

1 0

[GIT] ppl/ppl(master): Spurious `inline' qualifier removed.
by Roberto Bagnara 23 Dec '14

23 Dec '14

Module: ppl/ppl Branch: master Commit: f680d732a425fd5efcc58762b0784d1bf92303ba URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f680d732a425… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 23 13:12:22 2014 +0100 Spurious `inline' qualifier removed. --- src/Handler.cc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/Handler.cc b/src/Handler.cc index f77b7d9..49438fc 100644 --- a/src/Handler.cc +++ b/src/Handler.cc @@ -26,6 +26,5 @@ site: http://bugseng.com/products/ppl/ . */ namespace PPL = Parma_Polyhedra_Library; -inline PPL::Implementation::Watchdog::Handler::~Handler() { }

1 0

[GIT] ppl/ppl(master): Corrected several header inclusions.
by Roberto Bagnara 23 Dec '14

23 Dec '14

Module: ppl/ppl Branch: master Commit: d78536b521e1cf5b4b37fe4b8d22c8bdcffda497 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d78536b521e1… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Tue Dec 23 10:20:36 2014 +0100 Corrected several header inclusions. Fixes violations of rule UCGP1.F1 detected by ECLAIR. --- src/BHRZ03_Certificate_defs.hh | 1 - src/BHRZ03_Certificate_inlines.hh | 2 ++ src/Bit_Matrix_inlines.hh | 10 ++++------ src/Coefficient_defs.hh | 3 ++- src/Determinate_defs.hh | 1 - src/Float_defs.hh | 1 - src/Float_inlines.hh | 3 ++- src/GMP_Integer_types.hh | 2 +- src/Grid_Certificate_defs.hh | 1 - src/Grid_Certificate_inlines.hh | 2 ++ src/H79_Certificate_defs.hh | 1 - src/Interval_Info_defs.hh | 1 - src/Interval_defs.hh | 3 --- src/Linear_Expression_Impl_defs.hh | 2 +- src/Linear_System_templates.hh | 3 +-- src/PIP_Problem_defs.hh | 3 +-- src/Partial_Function_inlines.hh | 2 +- src/Powerset_inlines.hh | 7 +++---- src/Powerset_templates.hh | 5 ++--- src/Ptr_Iterator_inlines.hh | 3 --- src/Swapping_Vector_defs.hh | 2 -- src/Swapping_Vector_inlines.hh | 2 ++ src/Threshold_Watcher_inlines.hh | 6 +++--- src/algorithms.hh | 1 - src/checked_defs.hh | 6 +++--- src/intervals_defs.hh | 3 +-- src/math_utilities_inlines.hh | 2 +- 27 files changed, 32 insertions(+), 46 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=d78536b5…

1 0

[GIT] ppl/ppl(master): The interface file shall contain declarations only.
by Roberto Bagnara 21 Dec '14

21 Dec '14

Module: ppl/ppl Branch: master Commit: 9f12958e6c82d30c1af400c6e786d8ff60cc6893 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f12958e6c82… Author: Roberto Bagnara <roberto.bagnara(a)bugseng.com> Date: Sun Dec 21 22:29:58 2014 +0100 The interface file shall contain declarations only. Fixes violations of rule EP1.31 detected by ECLAIR. --- src/BDS_Status.cc | 40 ++++++++++++++++++++++++++++++++++++++++ src/BDS_Status_inlines.hh | 10 +++++----- src/Box_Status.cc | 39 +++++++++++++++++++++++++++++++++++++++ src/Box_Status_inlines.hh | 8 ++++---- src/Makefile.am | 3 +++ src/Og_Status.cc | 39 +++++++++++++++++++++++++++++++++++++++ src/Og_Status_inlines.hh | 8 ++++---- 7 files changed, 134 insertions(+), 13 deletions(-) diff --git a/src/BDS_Status.cc b/src/BDS_Status.cc new file mode 100644 index 0000000..81e979e --- /dev/null +++ b/src/BDS_Status.cc @@ -0,0 +1,40 @@ +/* BD_Shape<T>::Status class implementation: data objects. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +namespace BD_Shapes { + +// These are the keywords that indicate the individual assertions. +const char* zero_dim_univ = "ZE"; +const char* empty = "EM"; +const char* sp_closed = "SPC"; +const char* sp_reduced = "SPR"; + +} // namespace BD_Shapes + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library diff --git a/src/BDS_Status_inlines.hh b/src/BDS_Status_inlines.hh index 8fade89..7a17cee 100644 --- a/src/BDS_Status_inlines.hh +++ b/src/BDS_Status_inlines.hh @@ -189,10 +189,10 @@ namespace Implementation { namespace BD_Shapes { // These are the keywords that indicate the individual assertions. -const std::string zero_dim_univ = "ZE"; -const std::string empty = "EM"; -const std::string sp_closed = "SPC"; -const std::string sp_reduced = "SPR"; +extern const char* zero_dim_univ; +extern const char* empty; +extern const char* sp_closed; +extern const char* sp_reduced; const char yes = '+'; const char no = '-'; const char separator = ' '; @@ -205,7 +205,7 @@ const char separator = ' '; is on; it is set to <CODE>false</CODE> otherwise. */ inline bool -get_field(std::istream& s, const std::string& keyword, bool& positive) { +get_field(std::istream& s, const char* keyword, bool& positive) { std::string str; if (!(s >> str) || (str[0] != yes && str[0] != no) diff --git a/src/Box_Status.cc b/src/Box_Status.cc new file mode 100644 index 0000000..b12709d --- /dev/null +++ b/src/Box_Status.cc @@ -0,0 +1,39 @@ +/* Box<ITV>::Status class implementation: data objects. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +namespace Boxes { + +// These are the keywords that indicate the individual assertions. +const char* empty_up_to_date = "EUP"; +const char* empty = "EM"; +const char* universe = "UN"; + +} // namespace Boxes + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library diff --git a/src/Box_Status_inlines.hh b/src/Box_Status_inlines.hh index 99c6289..de06585 100644 --- a/src/Box_Status_inlines.hh +++ b/src/Box_Status_inlines.hh @@ -155,9 +155,9 @@ namespace Implementation { namespace Boxes { // These are the keywords that indicate the individual assertions. -const std::string empty_up_to_date = "EUP"; -const std::string empty = "EM"; -const std::string universe = "UN"; +extern const char* empty_up_to_date; +extern const char* empty; +extern const char* universe; const char yes = '+'; const char no = '-'; const char separator = ' '; @@ -170,7 +170,7 @@ const char separator = ' '; is on; it is set to <CODE>false</CODE> otherwise. */ inline bool -get_field(std::istream& s, const std::string& keyword, bool& positive) { +get_field(std::istream& s, const char* keyword, bool& positive) { std::string str; if (!(s >> str) || (str[0] != yes && str[0] != no) diff --git a/src/Makefile.am b/src/Makefile.am index 963e58b..bcfb73b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -484,6 +484,9 @@ checked.cc \ Checked_Number.cc \ Float.cc \ fpu-ia32.cc \ +BDS_Status.cc \ +Box_Status.cc \ +Og_Status.cc \ Concrete_Expression.cc \ Constraint.cc \ Constraint_System.cc \ diff --git a/src/Og_Status.cc b/src/Og_Status.cc new file mode 100644 index 0000000..b5314f6 --- /dev/null +++ b/src/Og_Status.cc @@ -0,0 +1,39 @@ +/* BD_Shape<T>::Status class implementation: data objects. + Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> + Copyright (C) 2010-2014 BUGSENG srl (http://bugseng.com) + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://bugseng.com/products/ppl/ . */ + +namespace Parma_Polyhedra_Library { + +namespace Implementation { + +namespace Octagonal_Shapes { + +// These are the keywords that indicate the individual assertions. +const char* zero_dim_univ = "ZE"; +const char* empty = "EM"; +const char* strong_closed = "SC"; + +} // namespace Octagonal_Shapes + +} // namespace Implementation + +} // namespace Parma_Polyhedra_Library diff --git a/src/Og_Status_inlines.hh b/src/Og_Status_inlines.hh index f29ce12..090947e 100644 --- a/src/Og_Status_inlines.hh +++ b/src/Og_Status_inlines.hh @@ -153,9 +153,9 @@ namespace Implementation { namespace Octagonal_Shapes { // These are the keywords that indicate the individual assertions. -const std::string zero_dim_univ = "ZE"; -const std::string empty = "EM"; -const std::string strong_closed = "SC"; +extern const char* zero_dim_univ; +extern const char* empty; +extern const char* strong_closed; const char yes = '+'; const char no = '-'; const char separator = ' '; @@ -168,7 +168,7 @@ const char separator = ' '; is on; it is set to <CODE>false</CODE> otherwise. */ inline bool -get_field(std::istream& s, const std::string& keyword, bool& positive) { +get_field(std::istream& s, const char* keyword, bool& positive) { std::string str; if (!(s >> str) || (str[0] != yes && str[0] != no)

1 0