Fix copy construtors and expectation_spec

Author: toroidal-code

include/expectations/expectation.hpp

@@ -38,7 +38,7 @@ class Expectation : public Child {
 
  public:
   Expectation(Expectation const &copy)
-      :  // Child(((Expectation)copy).get_parent())
+      : Child(copy.get_parent()),
         target(copy.target),
         block(copy.block),
         has_block(copy.has_block),

include/matchers/basematcher.hpp

@@ -22,6 +22,12 @@ class BaseMatcher : public Runnable, public Pretty {
   Expectation<Actual> expectation;
 
  public:
+  BaseMatcher(BaseMatcher<Actual, Expected> const &copy)
+      : Runnable(copy.get_parent()),
+        message(copy.message),
+        expected(copy.expected),
+        expectation(copy.expectation){};
+
   BaseMatcher(Expectation<Actual> &expectation)
       : Runnable(*expectation.get_parent()),  // We want the parent of the
                                               // matcher to be the `it` block,

include/runnable.hpp

@@ -34,6 +34,7 @@ class Child {
  public:
   Child(){};
   explicit Child(Child* parent) : parent(parent){};
+  explicit Child(const Child* parent) : parent(const_cast<Child*>(parent)){};
   explicit Child(Child& parent) : parent(&parent){};
 
   /**
@@ -44,6 +45,7 @@ class Child {
 
   /** @brief Get the Child's parent. */
   Child* get_parent() { return parent; }
+  const Child* get_parent() const { return const_cast<Child*>(parent); }
 
   /** @brief Set the Child's parent */
   void set_parent(Child* parent) { this->parent = parent; }
@@ -79,6 +81,8 @@ class Runnable : public Child {
  public:
   Runnable(){};
   explicit Runnable(Child& parent) : Child(parent){};
+  explicit Runnable(Child* parent) : Child(parent){};
+  explicit Runnable(const Child* parent) : Child(parent){};
   virtual bool run() = 0;
 };
 

spec/expectations/expectation_spec.cpp

@@ -2,9 +2,6 @@
 
 // Very simple int<=>int custom matcher
 struct CustomMatcher : public Matchers::BaseMatcher<int, int> {
-  CustomMatcher(CustomMatcher const &copy)
-      : Matchers::BaseMatcher<int,int>(((CustomMatcher)copy).get_expectation(),
-                                       ((CustomMatcher)copy).get_expected()){};
   CustomMatcher(Expectations::Expectation<int> &expectation, int expected)
       : Matchers::BaseMatcher<int,int>(expectation, expected){};
   bool match() { return get_expected() == get_actual(); }
@@ -14,7 +11,7 @@ describe expectation_spec("Expectation", $ {
   context("Extensible .to", _ {
     it("accepts a custom BaseMatcher subclass", _ {
       auto e = expect(2);
-      e.to(CustomMatcher(e, 4));
+      e.to(CustomMatcher(e, 2));
     });
   });
 });