Fix optional copy-assignment leak/self-assignment bug and set iterator types (#31)

include/optional.h

@@ -54,7 +54,10 @@ using optional_t = std::optional<T>;
 
  optional& operator=(optional const& other)
  {
- _value = nullptr;
+ if (this == &other) {
+ return *this;
+ }
+ reset();
  if (other.has_value()) {
  _value = new T{other.value()};
  }

include/set.h

@@ -1065,25 +1065,25 @@ namespace fcpp {
  }
 
  // Returns the begin iterator, useful for other standard library algorithms
- [[nodiscard]] typename std::set<TKey>::iterator begin()
+ [[nodiscard]] typename std::set<TKey, TCompare>::iterator begin()
  {
  return m_set.begin();
  }
 
  // Returns the const begin iterator, useful for other standard library algorithms
- [[nodiscard]] typename std::set<TKey>::const_iterator begin() const
+ [[nodiscard]] typename std::set<TKey, TCompare>::const_iterator begin() const
  {
  return m_set.begin();
  }
 
  // Returns the end iterator, useful for other standard library algorithms
- [[nodiscard]] typename std::set<TKey>::iterator end()
+ [[nodiscard]] typename std::set<TKey, TCompare>::iterator end()
  {
  return m_set.end();
  }
 
  // Returns the const end iterator, useful for other standard library algorithms
- [[nodiscard]] typename std::set<TKey>::const_iterator end() const
+ [[nodiscard]] typename std::set<TKey, TCompare>::const_iterator end() const
  {
  return m_set.end();
  }

tests/optional_test.cc

@@ -108,3 +108,14 @@ TEST(OptionalTest, CopyConstructorNullTest)
  const optional_t<int> v1(v2);
  EXPECT_FALSE(v1.has_value());
 }
+
+TEST(OptionalTest, SelfAssignmentTest)
+{
+ optional_t<int> v(5);
+ // Assign through an alias so the self-assignment is not diagnosed by the
+ // compiler but still exercises operator=(optional const&) with this == &other.
+ const optional_t<int>& alias = v;
+ v = alias;
+ EXPECT_TRUE(v.has_value());
+ EXPECT_EQ(5, v.value());
+}