Fix pedantic issues

Author: toroidal-code

CMakeLists.txt

@@ -35,7 +35,7 @@ target_link_libraries(c++spec INTERFACE
   cxx-prettyprint
   argparse
 )
-target_compile_options(c++spec INTERFACE -Wno-missing-template-arg-list-after-template-kw)
+target_compile_options(c++spec INTERFACE -Wno-missing-template-arg-list-after-template-kw -Wno-dollar-in-identifier-extension)
 
 FILE(GLOB_RECURSE c++spec_headers ${CMAKE_CURRENT_LIST_DIR}/include/*.hpp)
 
@@ -79,7 +79,7 @@ if(CPPSPEC_BUILD_TESTS)
   enable_testing()
 
   # Tests
-  discover_specs(spec)
+  add_subdirectory(spec)
 endif(CPPSPEC_BUILD_TESTS)
 
 if(CPPSPEC_BUILD_EXAMPLES)

examples/CMakeLists.txt

@@ -1,3 +1,5 @@
+add_compile_options(-Wall -Wextra -Wpedantic)
+
 add_subdirectory(sample)
 #add_subdirectory(skip)
-#add_subdirectory(xml_output)
+#add_subdirectory(xml_output)

examples/sample/CMakeLists.txt

@@ -7,6 +7,7 @@ target_link_libraries(cppspec_sample c++spec)
 add_executable(jasmine_intro jasmine_intro.cpp)
 target_link_libraries(jasmine_intro c++spec)
 
+
 set_target_properties(cppspec_sample jasmine_intro PROPERTIES
   CXX_STANDARD 23
   CXX_STANDARD_REQUIRED YES

include/child.hpp

@@ -71,8 +71,8 @@ class Child {
   /*--------- Parent helper functions -------------*/
 
   /** @brief Check to see if the Child has a parent. */
-  const bool has_parent() noexcept { return parent != nullptr; }
-  [[nodiscard]] const bool has_parent() const noexcept { return parent != nullptr; }
+  bool has_parent() noexcept { return parent != nullptr; }
+  [[nodiscard]] bool has_parent() const noexcept { return parent != nullptr; }
 
   // TODO: Look in to making these references instead of pointer returns
   /** @brief Get the Child's parent. */

include/cppspec.hpp

@@ -19,13 +19,8 @@
 #define specify it
 
 // Apparently MSVC++ doesn't conform to C++14 14.2/4. Annoying.
-#if defined(_MSC_VER) && !defined(__clang__)
 #define context self.context
 #define expect self.expect
-#else
-#define context self.template context
-#define expect self.template expect
-#endif
 #define explain context  // Piggybacks off of the `context` macro
 
 #define is_expected self.is_expected

include/expectations/expectation.hpp

@@ -55,8 +55,6 @@ class Expectation : public Child {
   bool ignore_failure_ = false;
 
  public:
-  Expectation(const Expectation &) = default;
-
   /**
    * @brief Create an Expectation using a value.
    *
@@ -399,8 +397,6 @@ class ExpectationValue : public Expectation<A> {
   A value;
 
  public:
-  ExpectationValue(ExpectationValue const &copy) : Expectation<A>(copy), value(copy.value) {}
-
   /**
    * @brief Create an ExpectationValue using a value.
    *

include/formatters/formatters_base.hpp

@@ -45,10 +45,10 @@ class BaseFormatter {
 
   virtual ~BaseFormatter() = default;
 
-  virtual void format(const Description &description) {}
-  virtual void format(const ItBase &it) {}
+  virtual void format(const Description & /* description */) {}
+  virtual void format(const ItBase & /* it */) {}
   virtual void format(const std::string &message) { out_stream << message << std::endl; }
-  virtual void format_failure(const std::string &message) {}
+  virtual void format_failure(const std::string & /* message */) {}
   virtual void flush() {}
   virtual void cleanup() {}
 

include/matchers/pretty_matchers.hpp

@@ -129,12 +129,12 @@ inline std::string Pretty::to_word<bool>(bool &item) {
 }
 
 template <>
-inline std::string Pretty::to_word<std::true_type>(std::true_type &item) {
+inline std::string Pretty::to_word<std::true_type>(std::true_type & /* item */) {
   return "true";
 }
 
 template <>
-inline std::string Pretty::to_word<std::false_type>(std::false_type &item) {
+inline std::string Pretty::to_word<std::false_type>(std::false_type & /* item */) {
   return "false";
 }
 

spec/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_compile_options(-Wno-unused-parameter -Wno-missing-template-arg-list-after-template-kw)
+discover_specs(${CMAKE_CURRENT_SOURCE_DIR})