add lict.hpp

Author: luk036

CMakeLists.txt

@@ -10,7 +10,7 @@ option(INSTALL_ONLY "Enable for installation only" OFF)
 # Note: update this to your new project's name and version
 project(
   Py2Cpp
-  VERSION 1.4.3
+  VERSION 1.4.4
   LANGUAGES CXX
 )
 

include/py2cpp/lict.hpp

@@ -7,37 +7,37 @@
 namespace py {
 
 template <typename T> class Lict {
+public:
   using key_type = size_t;
   using value_type = std::pair<size_t, T>;
   using iterator = py::Range<key_type>::iterator;
+  using const_iterator = py::Range<key_type>::iterator;
 
 private:
-  std::vector<T> _lst;
   py::Range<key_type> _rng;
+  std::vector<T> _lst;
 
 public:
   Lict(std::vector<T> lst)
-      : _lst(std::move(lst)), _rng{py::range(lst.size())} {}
+      : _rng{py::range(lst.size())}, _lst(std::move(lst)) {}
 
   T &operator[](const key_type &key) { return this->_lst[key]; }
 
   const T &operator[](const key_type &key) const { return this->_lst[key]; }
 
   // void __delitem__() { throw std::runtime_error("NotImplementedError"); }
 
-  iterator begin() { return this->_rng.begin(); }
+  iterator begin() const { return this->_rng.begin(); }
 
-  iterator end() { return this->_rng.end(); }
+  iterator end() const { return this->_rng.end(); }
 
-  bool contains(const key_type& key) const {
-    return this->_rng.contains(key);
-  }
+  bool contains(const key_type &key) const { return this->_rng.contains(key); }
 
-  size_t size() { return this->_lst.size(); }
+  size_t size() const { return this->_rng.size(); }
 
-  auto& values() { return this->_lst; }
+  auto &values() { return this->_lst; }
 
-  const auto& values() const { return this->_lst; }
+  const auto &values() const { return this->_lst; }
 
   auto items() { return py::enumerate(this->_lst); }
 };

include/py2cpp/range.hpp

@@ -66,17 +66,14 @@ template <typename T> struct Range {
   }
 };
 
-
-template <typename T>
-CONSTEXPR14 auto range(T start, T stop) -> Range<T> {
+template <typename T> CONSTEXPR14 auto range(T start, T stop) -> Range<T> {
   if (stop < start) {
     stop = start;
   }
   return Range<T>{start, stop};
 }
 
-template <typename T>
-CONSTEXPR14 auto range(T stop) -> Range<T> {
+template <typename T> CONSTEXPR14 auto range(T stop) -> Range<T> {
   return range(T(0), stop);
 }
 

test/source/test_dict.cpp

@@ -1,16 +1,16 @@
 #include <doctest/doctest.h> // for ResultBuilder, TestCase, CHECK, TEST_CASE
 
-// #include <py2cpp/dict.hpp>  // for dict, key_iterator
+#include <py2cpp/dict.hpp>  // for dict, key_iterator
 // #include <unordered_map>    // for operator!=, __hash_map_const_iterator
-// #include <utility>          // for pair
-//
-// TEST_CASE("Test set") {
-//     using E = std::pair<double, int>;
-//     const auto S = py::dict<double, int>{E{0.1, 1}, E{0.3, 3}, E{0.4, 4}};
-//     auto count = 0;
-//     for (const auto& p : S) {
-//         static_assert(sizeof(p) >= 0, "make compiler happy");
-//         ++count;
-//     }
-//     CHECK(count == 3);
-// }
+#include <utility>          // for pair
+
+TEST_CASE("Test py::dict") {
+    using E = std::pair<double, int>;
+    const auto S = py::dict<double, int>{E{0.1, 1}, E{0.3, 3}, E{0.4, 4}};
+    auto count = 0;
+    for (const auto& p : S) {
+        static_assert(sizeof(p) >= 0, "make compiler happy");
+        ++count;
+    }
+    CHECK(count == 3);
+}

test/source/test_lict.cpp

@@ -0,0 +1,16 @@
+#include <doctest/doctest.h> // for ResultBuilder, TestCase, CHECK, TEST_CASE
+
+#include <py2cpp/lict.hpp>  // for Lict, key_iterator
+#include <vector>
+
+TEST_CASE("Test Lict") {
+    const auto S = py::Lict<double>{std::vector<double>{0.6, 0.7, 0.8}};
+    CHECK_EQ(S.size(), 3U);
+    CHECK(S.contains(1));
+    auto count = 0;
+    for (const auto& p : S) {
+        static_assert(sizeof(p) >= 0, "make compiler happy");
+        ++count;
+    }
+    CHECK(count == 3);
+}