diff options
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/configuration.cpp | 8 | ||||
-rw-r--r-- | src/base/configuration.h | 10 | ||||
-rw-r--r-- | src/base/configuration_private.h | 8 | ||||
-rw-r--r-- | src/base/cvc4_assert.cpp | 4 | ||||
-rw-r--r-- | src/base/cvc4_assert.h | 8 | ||||
-rw-r--r-- | src/base/cvc4_check.cpp | 2 | ||||
-rw-r--r-- | src/base/cvc4_check.h | 8 | ||||
-rw-r--r-- | src/base/exception.cpp | 2 | ||||
-rw-r--r-- | src/base/exception.h | 8 | ||||
-rw-r--r-- | src/base/git_versioninfo.cpp.in | 17 | ||||
-rw-r--r-- | src/base/listener.cpp | 2 | ||||
-rw-r--r-- | src/base/listener.h | 10 | ||||
-rw-r--r-- | src/base/map_util.h | 8 | ||||
-rw-r--r-- | src/base/modal_exception.h | 10 | ||||
-rw-r--r-- | src/base/output.cpp | 4 | ||||
-rw-r--r-- | src/base/output.h | 8 |
16 files changed, 69 insertions, 48 deletions
diff --git a/src/base/configuration.cpp b/src/base/configuration.cpp index f154e5c90..a7fa79395 100644 --- a/src/base/configuration.cpp +++ b/src/base/configuration.cpp @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Morgan Deters, Aina Niemetz, Mathias Preiner ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -114,7 +114,7 @@ std::string Configuration::getVersionExtra() { std::string Configuration::copyright() { std::stringstream ss; - ss << "Copyright (c) 2009-2018 by the authors and their institutional\n" + ss << "Copyright (c) 2009-2019 by the authors and their institutional\n" << "affiliations listed at http://cvc4.cs.stanford.edu/authors\n\n"; if (Configuration::licenseIsGpl()) { @@ -130,7 +130,7 @@ std::string Configuration::copyright() { ss << "THIS SOFTWARE IS PROVIDED AS-IS, WITHOUT ANY WARRANTIES.\n" << "USE AT YOUR OWN RISK.\n\n"; - + ss << "CVC4 incorporates code from ANTLR3 (http://www.antlr.org).\n" << "See licenses/antlr3-LICENSE for copyright and licensing information." << "\n\n"; @@ -250,6 +250,8 @@ bool Configuration::isBuiltWithCryptominisat() { return IS_CRYPTOMINISAT_BUILD; } +bool Configuration::isBuiltWithDrat2Er() { return IS_DRAT2ER_BUILD; } + bool Configuration::isBuiltWithReadline() { return IS_READLINE_BUILD; } diff --git a/src/base/configuration.h b/src/base/configuration.h index b6e2a1963..fc149587b 100644 --- a/src/base/configuration.h +++ b/src/base/configuration.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Morgan Deters, Francois Bobot, Mathias Preiner ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -18,8 +18,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__CONFIGURATION_H -#define __CVC4__CONFIGURATION_H +#ifndef CVC4__CONFIGURATION_H +#define CVC4__CONFIGURATION_H #include <string> @@ -97,6 +97,8 @@ public: static bool isBuiltWithCryptominisat(); + static bool isBuiltWithDrat2Er(); + static bool isBuiltWithReadline(); static bool isBuiltWithLfsc(); @@ -130,4 +132,4 @@ public: }/* CVC4 namespace */ -#endif /* __CVC4__CONFIGURATION_H */ +#endif /* CVC4__CONFIGURATION_H */ diff --git a/src/base/configuration_private.h b/src/base/configuration_private.h index 77f3f5e77..3b06a9e6a 100644 --- a/src/base/configuration_private.h +++ b/src/base/configuration_private.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Christopher L. Conway, Morgan Deters, Mathias Preiner ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -15,8 +15,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CONFIGURATION_PRIVATE_H -#define __CVC4__CONFIGURATION_PRIVATE_H +#ifndef CVC4__CONFIGURATION_PRIVATE_H +#define CVC4__CONFIGURATION_PRIVATE_H #include <string> @@ -174,4 +174,4 @@ namespace CVC4 { }/* CVC4 namespace */ -#endif /* __CVC4__CONFIGURATION_PRIVATE_H */ +#endif /* CVC4__CONFIGURATION_PRIVATE_H */ diff --git a/src/base/cvc4_assert.cpp b/src/base/cvc4_assert.cpp index 3af6a9909..1150f41f1 100644 --- a/src/base/cvc4_assert.cpp +++ b/src/base/cvc4_assert.cpp @@ -2,9 +2,9 @@ /*! \file cvc4_assert.cpp ** \verbatim ** Top contributors (to current version): - ** Morgan Deters, Tim King, Andres Noetzli + ** Morgan Deters, Tim King, Chad Brewbaker ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim diff --git a/src/base/cvc4_assert.h b/src/base/cvc4_assert.h index ed69daf23..a29e6f545 100644 --- a/src/base/cvc4_assert.h +++ b/src/base/cvc4_assert.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Morgan Deters, Tim King ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -16,8 +16,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__ASSERT_H -#define __CVC4__ASSERT_H +#ifndef CVC4__ASSERT_H +#define CVC4__ASSERT_H #include <cstdarg> #include <cstdio> @@ -317,4 +317,4 @@ void debugAssertionFailed(const AssertionException& thisException, } /* CVC4 namespace */ -#endif /* __CVC4__ASSERT_H */ +#endif /* CVC4__ASSERT_H */ diff --git a/src/base/cvc4_check.cpp b/src/base/cvc4_check.cpp index 5976ac3f7..f0b602849 100644 --- a/src/base/cvc4_check.cpp +++ b/src/base/cvc4_check.cpp @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Tim King ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim diff --git a/src/base/cvc4_check.h b/src/base/cvc4_check.h index 5cb3315f4..703931108 100644 --- a/src/base/cvc4_check.h +++ b/src/base/cvc4_check.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Tim King ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -34,8 +34,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__CHECK_H -#define __CVC4__CHECK_H +#ifndef CVC4__CHECK_H +#define CVC4__CHECK_H #include <ostream> @@ -143,4 +143,4 @@ class OstreamVoider } // namespace CVC4 -#endif /* __CVC4__CHECK_H */ +#endif /* CVC4__CHECK_H */ diff --git a/src/base/exception.cpp b/src/base/exception.cpp index 831220a2b..c1c174d1d 100644 --- a/src/base/exception.cpp +++ b/src/base/exception.cpp @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Tim King, Morgan Deters, Andres Noetzli ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim diff --git a/src/base/exception.h b/src/base/exception.h index 54f6aa92d..51829c86c 100644 --- a/src/base/exception.h +++ b/src/base/exception.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Morgan Deters, Tim King, Andres Noetzli ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -16,8 +16,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__EXCEPTION_H -#define __CVC4__EXCEPTION_H +#ifndef CVC4__EXCEPTION_H +#define CVC4__EXCEPTION_H #include <cstdarg> #include <cstdlib> @@ -166,4 +166,4 @@ private: }/* CVC4 namespace */ -#endif /* __CVC4__EXCEPTION_H */ +#endif /* CVC4__EXCEPTION_H */ diff --git a/src/base/git_versioninfo.cpp.in b/src/base/git_versioninfo.cpp.in index 20da094bc..5c18d4e2b 100644 --- a/src/base/git_versioninfo.cpp.in +++ b/src/base/git_versioninfo.cpp.in @@ -1,3 +1,20 @@ +/********************* */ +/*! \file git_versioninfo.cpp.in + ** \verbatim + ** Top contributors (to current version): + ** Aina Niemetz, Mathias Preiner + ** This file is part of the CVC4 project. + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS + ** in the top-level source directory) and their institutional affiliations. + ** All rights reserved. See the file COPYING in the top-level source + ** directory for licensing information.\endverbatim + ** + ** \brief [[ Add one-line brief description here ]] + ** + ** [[ Add lengthier description here ]] + ** \todo document this file + **/ + #include "base/configuration.h" const bool ::CVC4::Configuration::IS_GIT_BUILD = @GIT_BUILD@; const char* const ::CVC4::Configuration::GIT_BRANCH_NAME = "@GIT_BRANCH@"; diff --git a/src/base/listener.cpp b/src/base/listener.cpp index 3b67b8a06..44e5563e7 100644 --- a/src/base/listener.cpp +++ b/src/base/listener.cpp @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Tim King ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim diff --git a/src/base/listener.h b/src/base/listener.h index 88bcee742..842567646 100644 --- a/src/base/listener.h +++ b/src/base/listener.h @@ -2,9 +2,9 @@ /*! \file listener.h ** \verbatim ** Top contributors (to current version): - ** Tim King + ** Tim King, Andres Noetzli ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -20,8 +20,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__LISTENER_H -#define __CVC4__LISTENER_H +#ifndef CVC4__LISTENER_H +#define CVC4__LISTENER_H #include <list> @@ -161,4 +161,4 @@ class ListenerRegistrationList { }/* CVC4 namespace */ -#endif /* __CVC4__LISTENER_H */ +#endif /* CVC4__LISTENER_H */ diff --git a/src/base/map_util.h b/src/base/map_util.h index 2e17c9290..786e22ae0 100644 --- a/src/base/map_util.h +++ b/src/base/map_util.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Tim King ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -35,8 +35,8 @@ #include "cvc4_private.h" -#ifndef __CVC4__BASE__MAP_UTIL_H -#define __CVC4__BASE__MAP_UTIL_H +#ifndef CVC4__BASE__MAP_UTIL_H +#define CVC4__BASE__MAP_UTIL_H #include "base/cvc4_check.h" @@ -94,4 +94,4 @@ const MapMappedTypeT<M>& FindOrDie(const M& map, const MapKeyTypeT<M>& key) } // namespace CVC4 -#endif /* __CVC4__BASE__MAP_UTIL_H */ +#endif /* CVC4__BASE__MAP_UTIL_H */ diff --git a/src/base/modal_exception.h b/src/base/modal_exception.h index fefb5aed9..4fa9349fb 100644 --- a/src/base/modal_exception.h +++ b/src/base/modal_exception.h @@ -2,9 +2,9 @@ /*! \file modal_exception.h ** \verbatim ** Top contributors (to current version): - ** Morgan Deters, Andres Noetzli, Tim King + ** Morgan Deters, Andres Noetzli ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -19,8 +19,8 @@ #include "cvc4_public.h" -#ifndef __CVC4__SMT__MODAL_EXCEPTION_H -#define __CVC4__SMT__MODAL_EXCEPTION_H +#ifndef CVC4__SMT__MODAL_EXCEPTION_H +#define CVC4__SMT__MODAL_EXCEPTION_H #include "base/exception.h" @@ -58,4 +58,4 @@ class CVC4_PUBLIC RecoverableModalException : public CVC4::ModalException { }/* CVC4 namespace */ -#endif /* __CVC4__SMT__MODAL_EXCEPTION_H */ +#endif /* CVC4__SMT__MODAL_EXCEPTION_H */ diff --git a/src/base/output.cpp b/src/base/output.cpp index 787d26bf6..fee8b1d8d 100644 --- a/src/base/output.cpp +++ b/src/base/output.cpp @@ -2,9 +2,9 @@ /*! \file output.cpp ** \verbatim ** Top contributors (to current version): - ** Morgan Deters, Tim King + ** Morgan Deters ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim diff --git a/src/base/output.h b/src/base/output.h index fef8af876..c3a073580 100644 --- a/src/base/output.h +++ b/src/base/output.h @@ -4,7 +4,7 @@ ** Top contributors (to current version): ** Morgan Deters, Andres Noetzli, Dejan Jovanovic ** This file is part of the CVC4 project. - ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS + ** Copyright (c) 2009-2019 by the authors listed in the file AUTHORS ** in the top-level source directory) and their institutional affiliations. ** All rights reserved. See the file COPYING in the top-level source ** directory for licensing information.\endverbatim @@ -16,8 +16,8 @@ #include "cvc4_private_library.h" -#ifndef __CVC4__OUTPUT_H -#define __CVC4__OUTPUT_H +#ifndef CVC4__OUTPUT_H +#define CVC4__OUTPUT_H #include <ios> #include <iostream> @@ -543,4 +543,4 @@ inline IndentedScope::~IndentedScope() {} }/* CVC4 namespace */ -#endif /* __CVC4__OUTPUT_H */ +#endif /* CVC4__OUTPUT_H */ |