Fix a bug with Map

.vscode/tasks.json

@@ -3,7 +3,7 @@
         {
             "label": "build",
             "type": "shell",
-            "command": "cmake -S. -B./build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ && cmake --build build",
+            "command": "cmake -S. -B./build -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DIA_BUILD_SAMPLES=ON && cmake --build build",
             "group": {
                 "kind": "build",
                 "isDefault": true

CMakeLists.txt

@@ -9,4 +9,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 project(IACore)
 add_subdirectory(Src/IACore)
-add_subdirectory(Src/IACoreTest)
+
+if(IA_BUILD_SAMPLES)
+    add_subdirectory(Src/IACoreTest)
+endif()

Src/IACore/imp/inl/IACore/hashable/iihashable.inl

@@ -1,16 +1,16 @@
-// IACore-OSS; The Core Library for All IA Open Source Projects 
+// IACore-OSS; The Core Library for All IA Open Source Projects
 // Copyright (C) 2024 IAS (ias@iasoft.dev)
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
@@ -20,18 +20,23 @@
 
 namespace ia
 {
-  template<typename _type>
+    template<typename _type>
-  concept hashable_type = std::derived_from<_type, IIHashable>;
+    concept hashable_type = std::derived_from<_type, IIHashable>;
 
-  INLINE UINT64 IIHashable::fnv_1a(IN PCUINT8 data, IN SIZE_T dataLength)
+    template<typename T>
-  {
+    concept comparible_type = requires(T a, T b) {
-    // Implemented as described at http://isthe.com/chongo/tech/comp/fnv/#google_vignette
+        { a == b } -> std::same_as<bool>;
-    UINT64 hash = 14695981039346656037llu;
+    };
-    for(SIZE_T i = 0; i < dataLength; i++)
+
+    INLINE UINT64 IIHashable::fnv_1a(IN PCUINT8 data, IN SIZE_T dataLength)
     {
-      hash = hash ^ data[i];
+        // Implemented as described at http://isthe.com/chongo/tech/comp/fnv/#google_vignette
-      hash = hash * 1099511628211ul;
+        UINT64 hash = 14695981039346656037llu;
+        for (SIZE_T i = 0; i < dataLength; i++)
+        {
+            hash = hash ^ data[i];
+            hash = hash * 1099511628211ul;
+        }
+        return hash;
     }
-    return hash;
+} // namespace ia
-  }
-}

Src/IACore/imp/inl/IACore/map/interface/map.interface.inl

@@ -23,7 +23,7 @@
 namespace ia
 {
   template<typename _key_type, typename _value_type, typename _allocator_type = GeneralAllocator<_value_type>, CONST SIZE_T _alignment = 1>
-  requires hashable_type<_key_type> && valid_allocator_type<_allocator_type, _value_type>
+  requires (hashable_type<_key_type> || std::is_integral_v<_key_type>) && valid_allocator_type<_allocator_type, _value_type>
   class Map
   {
     STATIC CONSTEXPR SIZE_T BUCKET_COUNT = 1000;

Src/IACore/imp/inl/IACore/map/map.inl

@@ -1,16 +1,16 @@
-// IACore-OSS; The Core Library for All IA Open Source Projects 
+// IACore-OSS; The Core Library for All IA Open Source Projects
 // Copyright (C) 2024 IAS (ias@iasoft.dev)
-// 
+//
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation, either version 3 of the License, or
 // (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
@@ -18,66 +18,77 @@
 
 #include "interface/map.interface.inl"
 
-#define __template template<typename _key_type, typename _value_type, typename _allocator_type, CONST SIZE_T _alignment> requires hashable_type<_key_type> && valid_allocator_type<_allocator_type, _value_type>
+#define __template                                                                                                     \
+    template<typename _key_type, typename _value_type, typename _allocator_type, CONST SIZE_T _alignment>              \
+        requires(hashable_type<_key_type> || std::is_integral_v<_key_type>) &&                                         \
+                valid_allocator_type<_allocator_type, _value_type>
 #define __ia_identifier Map<_key_type, _value_type, _allocator_type, _alignment>
 #define define_member_function(return_type, name, ...) __template return_type __ia_identifier::name(__VA_ARGS__)
-#define define_const_member_function(return_type, name, ...) __template return_type __ia_identifier::name(__VA_ARGS__) CONST
+#define define_const_member_function(return_type, name, ...)                                                           \
+    __template return_type __ia_identifier::name(__VA_ARGS__) CONST
 
 namespace ia
 {
-  define_member_function(, Map, )
+    define_member_function(, Map, )
-  {
-    m_buckets.resize(BUCKET_COUNT);
-  }
-
-  define_member_function(, ~Map, )
-  {
-  }
-}
-
-namespace ia
-{
-  define_member_function(VOID, set, IN CONST key_type& key, IN value_type&& value)
-  {
-    const auto listEntry = getBucket(key).append({ key, IA_MOVE(value) });
-    m_insertedOrder.pushBack(*listEntry);
-  }
-
-  define_const_member_function(CONST _value_type*, get, IN CONST key_type& key)
-  {
-    auto& bucket = getBucket(key);
-    for(auto it = bucket.first(); it; it = bucket.next(it))
     {
-      if(static_cast<KeyValuePair>(*it).Key == key)
+        m_buckets.resize(BUCKET_COUNT);
-        return &(*it)->Value;
     }
-    return nullptr;
-  }
 
-  define_const_member_function(BOOL, contains, IN CONST key_type& key)
+    define_member_function(, ~Map, )
-  {
-    auto& bucket = getBucket(key);
-    for(auto it = bucket.first(); it; it = bucket.next(it))
     {
-      if(static_cast<KeyValuePair>(*it).Key == key)
-        return true;
     }
-    return false;
+} // namespace ia
-  }
-}
 
 namespace ia
 {
-  define_member_function(List<typename __ia_identifier::KeyValuePair>&, getBucket, IN CONST key_type& key)
+    define_member_function(VOID, set, IN CONST key_type &key, IN value_type &&value)
-  {
+    {
-    return m_buckets[key.hash() % BUCKET_COUNT];
+        const auto listEntry = getBucket(key).append({key, IA_MOVE(value)});
-  }
+        m_insertedOrder.pushBack(*listEntry);
+    }
 
-  define_const_member_function(CONST List<typename __ia_identifier::KeyValuePair>&, getBucket, IN CONST key_type& key)
+    define_const_member_function(CONST _value_type *, get, IN CONST key_type &key)
-  {
+    {
-    return m_buckets[key.hash() % BUCKET_COUNT];
+        auto &bucket = getBucket(key);
-  }
+        for (auto it = bucket.first(); it; it = bucket.next(it))
-}
+        {
+            if (static_cast<KeyValuePair>(*it).Key == key)
+                return &(*it)->Value;
+        }
+        return nullptr;
+    }
+
+    define_const_member_function(BOOL, contains, IN CONST key_type &key)
+    {
+        auto &bucket = getBucket(key);
+        for (auto it = bucket.first(); it; it = bucket.next(it))
+        {
+            if (static_cast<KeyValuePair>(*it).Key == key)
+                return true;
+        }
+        return false;
+    }
+} // namespace ia
+
+namespace ia
+{
+    define_member_function(List<typename __ia_identifier::KeyValuePair> &, getBucket, IN CONST key_type &key)
+    {
+        if constexpr (std::is_integral_v<key_type>)
+            return m_buckets[key % BUCKET_COUNT];
+        else
+            return m_buckets[key.hash() % BUCKET_COUNT];
+    }
+
+    define_const_member_function(CONST List<typename __ia_identifier::KeyValuePair> &, getBucket,
+                                 IN CONST key_type &key)
+    {
+        if constexpr (std::is_integral_v<key_type>)
+            return m_buckets[key % BUCKET_COUNT];
+        else
+            return m_buckets[key.hash() % BUCKET_COUNT];
+    }
+} // namespace ia
 
 #undef __template
 #undef __ia_identifier

Src/IACore/inc/hpp/IACore/Exception.hpp

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <IACore/String.hpp>
+#include <IACore/Logger.hpp>
 
 namespace ia {
 enum class ExceptionKind {
@@ -131,7 +131,9 @@ private:
   DO(SECURITY_BYPASS)
 #define DEFINE_THROWER(name)                                                   \
   template <typename... Args> NORETURN VOID THROW_##name(Args... args) {       \
-    throw RuntimeException(ExceptionKind::name, BuildString(args...));         \
+    const auto msg = BuildString(args...); \
+    Logger::Error("EXCEPT", "(", #name, "): ", msg); \
+    throw RuntimeException(ExceptionKind::name, msg);         \
   }
 FOR_EACH_RUNTIME_EXCEPT_TYPE(DEFINE_THROWER);
 #undef DEFINE_THROWER

Src/IACore/inc/hpp/IACore/Logger.hpp

@@ -18,6 +18,10 @@
 
 #include <IACore/String.hpp>
 
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
+
 namespace ia
 {
     class Logger
@@ -27,21 +31,44 @@ namespace ia
         {
             StringStream ss;
             UNUSED((ss << ... << args));
-            printf("\033[32m[INFO]: [%s] %s\033[39m\n", tag, ss.str().c_str());
+#ifdef __ANDROID__
+            __android_log_print(ANDROID_LOG_DEBUG, "IAApp", ss.str().c_str());
+#else
+            printf("\033[0;37m[INFO]: [%s] %s\033[39m\n", tag, ss.str().c_str());
+#endif
+        }
+
+        template<typename... Args> STATIC VOID Success(PCCHAR tag, Args... args)
+        {
+            StringStream ss;
+            UNUSED((ss << ... << args));
+#ifdef __ANDROID__
+            __android_log_print(ANDROID_LOG_INFO, "IAApp", ss.str().c_str());
+#else
+            printf("\033[32m[SUCCESS]: [%s] %s\033[39m\n", tag, ss.str().c_str());
+#endif
         }
 
         template<typename... Args> STATIC VOID Warn(PCCHAR tag, Args... args)
         {
             StringStream ss;
             UNUSED((ss << ... << args));
+#ifdef __ANDROID__
+            __android_log_print(ANDROID_LOG_DEBUG, "IAApp", ss.str().c_str());
+#else
             printf("\033[33m[WARN]: [%s] %s\033[39m\n", tag, ss.str().c_str());
+#endif
         }
 
         template<typename... Args> STATIC VOID Error(PCCHAR tag, Args... args)
         {
             StringStream ss;
             UNUSED((ss << ... << args));
+#ifdef __ANDROID__
+            __android_log_print(ANDROID_LOG_ERROR, "IAApp", ss.str().c_str());
+#else
             printf("\033[31m[ERROR]: [%s] %s\033[39m\n", tag, ss.str().c_str());
+#endif
         }
 
       private: