Merge pull request #237 from parbo/rtti-option

emil-e · web-flow · commit d9482c683429 · 2019-08-15T17:24:20.000+02:00
Add option for using rtti
diff --git a/.travis.yml b/.travis.yml
@@ -77,7 +77,7 @@ script:
   - export PATH="${HOME}/bin:${PATH}"
   - ln -sf /usr/bin/ccache ${HOME}/bin/"${CXX}"
   - which ${CXX}
-  - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DRC_ENABLE_TESTS=ON -DRC_ENABLE_EXAMPLES=ON -DRC_ENABLE_GTEST=ON -DRC_ENABLE_GMOCK=ON -DRC_ENABLE_BOOST=ON -DRC_ENABLE_BOOST_TEST=ON -G Ninja ..
+  - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DRC_ENABLE_TESTS=ON -DRC_ENABLE_EXAMPLES=ON -DRC_ENABLE_GTEST=ON -DRC_ENABLE_GMOCK=ON -DRC_ENABLE_BOOST=ON -DRC_ENABLE_BOOST_TEST=ON -DRC_ENABLE_RTTI=ON -G Ninja ..
   - ccache --show-stats > ccache_before # collect stats
   - ninja -j1 # Don't run out of memory, please
   - ccache --show-stats > ccache_after
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,6 +10,7 @@ set(CMAKE_CXX_STANDARD 11)
 
 option(RC_ENABLE_TESTS "Build RapidCheck tests" OFF)
 option(RC_ENABLE_EXAMPLES "Build RapidCheck examples" OFF)
+option(RC_ENABLE_RTTI "Build RapidCheck with RTTI" ON)
 
 if(MSVC)
   # /bigobj - some object files become very large so we need this
@@ -101,6 +102,10 @@ if(MINGW)
   target_compile_definitions(rapidcheck PRIVATE RC_SEED_SYSTEM_TIME)
 endif()
 
+if(RC_ENABLE_RTTI)
+  add_definitions(-DRC_USE_RTTI)
+endif()
+
 add_subdirectory(ext)
 
 if(RC_ENABLE_TESTS)
diff --git a/appveyor.yml b/appveyor.yml
@@ -23,7 +23,7 @@ build_script:
 - md build
 - cd build
 - "\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" %ARCH%"
-- cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DRC_ENABLE_TESTS=ON -DRC_ENABLE_EXAMPLES=ON -DRC_ENABLE_GTEST=ON -DRC_ENABLE_GMOCK=ON -DRC_ENABLE_BOOST=ON -DRC_ENABLE_BOOST_TEST=ON -G "NMake Makefiles" ..
+- cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DRC_ENABLE_TESTS=ON -DRC_ENABLE_EXAMPLES=ON -DRC_ENABLE_GTEST=ON -DRC_ENABLE_GMOCK=ON -DRC_ENABLE_BOOST=ON -DRC_ENABLE_BOOST_TEST=ON -DRC_ENABLE_RTTI=ON -G "NMake Makefiles" ..
 - nmake
 
 test_script:
diff --git a/include/rapidcheck/detail/Any.hpp b/include/rapidcheck/detail/Any.hpp
@@ -15,7 +15,9 @@ class Any::IAnyImpl {
   virtual void *get() = 0;
   virtual void showType(std::ostream &os) const = 0;
   virtual void showValue(std::ostream &os) const = 0;
+#ifdef RC_USE_RTTI
   virtual const std::type_info &typeInfo() const = 0;
+#endif // RC_USE_RTTI
   virtual ~IAnyImpl() = default;
 };
 
@@ -32,7 +34,9 @@ class Any::AnyImpl : public Any::IAnyImpl {
 
   void showValue(std::ostream &os) const override { show(m_value, os); }
 
+#ifdef RC_USE_RTTI
   const std::type_info &typeInfo() const override { return typeid(T); }
+#endif // RC_USE_RTTI
 
 private:
   T m_value;
@@ -49,14 +53,18 @@ Any Any::of(T &&value) {
 template <typename T>
 const T &Any::get() const {
   assert(m_impl);
+#ifdef RC_USE_RTTI
   assert(m_impl->typeInfo() == typeid(T));
+#endif // RC_USE_RTTI
   return *static_cast<T *>(m_impl->get());
 }
 
 template <typename T>
 T &Any::get() {
   assert(m_impl);
+#ifdef RC_USE_RTTI
   assert(m_impl->typeInfo() == typeid(T));
+#endif // RC_USE_RTTI
   return *static_cast<T *>(m_impl->get());
 }
 
diff --git a/include/rapidcheck/detail/ShowType.hpp b/include/rapidcheck/detail/ShowType.hpp
@@ -44,7 +44,11 @@ struct ShowMultipleTypes<Type, Types...> {
 template <typename T>
 struct ShowType {
   static void showType(std::ostream &os) {
+#ifdef RC_USE_RTTI
     os << detail::demangle(typeid(T).name());
+#else
+    os << "[unknown type]";
+#endif // RC_USE_RTTI
   }
 };
 
diff --git a/include/rapidcheck/state/Command.hpp b/include/rapidcheck/state/Command.hpp
@@ -17,7 +17,11 @@ void Command<Model, Sut>::run(const Model &s0, Sut &sut) const {}
 
 template <typename Model, typename Sut>
 void Command<Model, Sut>::show(std::ostream &os) const {
+#ifdef RC_USE_RTTI
   os << ::rc::detail::demangle(typeid(*this).name());
+#else
+  os << "[unknown command]";
+#endif // RC_USE_RTTI
 }
 
 template <typename Model, typename Sut>
diff --git a/test/detail/ShowTypeTests.cpp b/test/detail/ShowTypeTests.cpp
@@ -8,6 +8,7 @@ using namespace rc;
 using namespace rc::test;
 using namespace rc::detail;
 
+#ifdef RC_USE_RTTI
 TEST_CASE("typeToString") {
   SECTION("shows primitive types correctly") {
     REQUIRE(typeToString<void>() == "void");
@@ -166,3 +167,4 @@ TEST_CASE("typeToString") {
             "std::shared_ptr<const FFoo *>");
   }
 }
+#endif // RC_USE_RTTI
diff --git a/test/state/gen/ExecCommandsTests.cpp b/test/state/gen/ExecCommandsTests.cpp
@@ -50,6 +50,7 @@ struct GeneratesOnConstrution : public IntVecCmd {
 #endif // defined(__GNUC__) || defined(__clang__)
 
 TEST_CASE("state::gen::execOneOf") {
+#ifdef RC_USE_RTTI
   prop("returns one of the commands",
        [](const GenParams &params, const IntVec &s0) {
          const auto cmd =
@@ -73,6 +74,7 @@ TEST_CASE("state::gen::execOneOf") {
          }
          RC_SUCCEED("All generated");
        });
+#endif
 
   prop("uses state constructor if there is one, passing it the state",
        [](const GenParams &params, const IntVec &s0) {
@@ -96,6 +98,7 @@ TEST_CASE("state::gen::execOneOf") {
 #endif // defined(__GNUC__) || defined(__clang__)
 
 TEST_CASE("state::gen::execOneOfWithArgs") {
+#ifdef RC_USE_RTTI
   prop("returns one of the commands",
        [](const GenParams &params, const IntVec &s0) {
          const auto cmd = state::gen::execOneOfWithArgs<A, B, C>()()(
@@ -119,6 +122,7 @@ TEST_CASE("state::gen::execOneOfWithArgs") {
          }
          RC_SUCCEED("All generated");
        });
+#endif
 
   prop("uses args constructor if there is one, passing it the state",
        [](const GenParams &params, const std::string &str, int num) {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ using namespace rc;`
`8`	`8`	`using namespace rc::test;`
`9`	`9`	`using namespace rc::detail;`
`10`	`10`
	`11`	`+#ifdef RC_USE_RTTI`
`11`	`12`	`TEST_CASE("typeToString") {`
`12`	`13`	`SECTION("shows primitive types correctly") {`
`13`	`14`	`REQUIRE(typeToString<void>() == "void");`
`@@ -166,3 +167,4 @@ TEST_CASE("typeToString") {`
`166`	`167`	`"std::shared_ptr<const FFoo *>");`
`167`	`168`	`}`
`168`	`169`	`}`
	`170`	`+#endif // RC_USE_RTTI`