Rebasing

.github/workflows/ci.yml

@@ -38,7 +38,9 @@ jobs:
             cmake_args: "-DCMAKE_CXX_FLAGS=-m64"
           - os: windows-latest
             arch: x86
-            cmake_args: "-G \"Visual Studio 17 2022\" -A Win32"
+            # /arch:IA32 means these are builds without SIMD, due to really bad compiler ICEs
+            # see https://github.com/Langulus/SIMD/issues/22 for more info and updates on the situation
+            cmake_args: "-G \"Visual Studio 17 2022\" -A Win32 -DCMAKE_CXX_FLAGS=\"/arch:IA32\""
           - os: windows-latest
             arch: x64
             cmake_args: "-G \"Visual Studio 17 2022\" -A x64"

CMakeLists.txt

@@ -5,21 +5,17 @@ project(LangulusAnyness
     HOMEPAGE_URL    https://langulus.com
 )
 
-# Check if this project is built as standalone, or a part of something else 
-if(PROJECT_IS_TOP_LEVEL OR NOT LANGULUS)
+# Check if this project is built as standalone, or a part of something else		
+if (PROJECT_IS_TOP_LEVEL OR NOT LANGULUS)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
-
     include(LangulusUtilities.cmake)
 
-    # Add Langulus::Core/Logger/RTTI/Fractalloc/SIMD libraries              
-    fetch_langulus_module(Core   GIT_TAG 35756f11d2f9c475f27b094b8d4c82cd453969fc)
-    fetch_langulus_module(Logger GIT_TAG dafbeb825071ec60d8403254143f75606151a7e6)
-    fetch_langulus_module(RTTI   GIT_TAG fc49750884ac943dff4261ac5b8dfb2c148423d7)
+    fetch_langulus_module(RTTI GIT_TAG af0c2f6bf25d0436caf098b354350c7b681d1036)
     if(LANGULUS_FEATURE_MANAGED_MEMORY)
-        fetch_langulus_module(Fractalloc GIT_TAG 66408e8557b1bb3c80615909129342bcebd3fb9f)
+        fetch_langulus_module(Fractalloc GIT_TAG cbb71d9b33c741e8856e8522632559b3082a39e9)
     endif()
-    fetch_langulus_module(SIMD   GIT_TAG ead5493049e2800b4c3c02d385c0c6314efac69c)
+    fetch_langulus_module(SIMD GIT_TAG 1238344af641de5d2fbe82e6a1743b041d996c52)
 endif()
 
 file(GLOB_RECURSE
@@ -28,18 +24,21 @@ file(GLOB_RECURSE
 	source/*.cpp
 )
 
-# Build and install Anyness library                                         
+# Build and install Anyness library												
 add_langulus_library(LangulusAnyness
     $<TARGET_OBJECTS:LangulusLogger>
     $<TARGET_OBJECTS:LangulusRTTI>
     $<$<BOOL:${LANGULUS_FEATURE_MANAGED_MEMORY}>:$<TARGET_OBJECTS:LangulusFractalloc>>
+	$<$<BOOL:${LANGULUS_FEATURE_PROFILING}>:$<TARGET_OBJECTS:LangulusProfiler>>
     ${LANGULUS_ANYNESS_SOURCES}
 )
 
-target_include_directories(LangulusAnyness PUBLIC include
-    $<TARGET_PROPERTY:LangulusLogger,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:LangulusRTTI,INTERFACE_INCLUDE_DIRECTORIES>
-    $<$<BOOL:${LANGULUS_FEATURE_MANAGED_MEMORY}>:$<TARGET_PROPERTY:LangulusFractalloc,INTERFACE_INCLUDE_DIRECTORIES>>
+target_include_directories(LangulusAnyness
+	PUBLIC		$<TARGET_PROPERTY:LangulusLogger,INTERFACE_INCLUDE_DIRECTORIES>
+				$<TARGET_PROPERTY:LangulusRTTI,INTERFACE_INCLUDE_DIRECTORIES>
+				$<$<BOOL:${LANGULUS_FEATURE_MANAGED_MEMORY}>:$<TARGET_PROPERTY:LangulusFractalloc,INTERFACE_INCLUDE_DIRECTORIES>>
+				$<$<BOOL:${LANGULUS_FEATURE_PROFILING}>:$<TARGET_PROPERTY:LangulusProfiler,INTERFACE_INCLUDE_DIRECTORIES>>
+				include
 )
 
 target_link_libraries(LangulusAnyness
@@ -52,6 +51,6 @@ target_compile_definitions(LangulusAnyness
 )
 
 if(LANGULUS_TESTING)
-    enable_testing()
+	enable_testing()
 	add_subdirectory(test)
 endif()

LangulusUtilities.cmake

@@ -1,13 +1,33 @@
 include(FetchContent)
 
+
+# Utility for fetching Langulus libraries using FetchContent					
 function(fetch_langulus_module NAME GIT_TAG TAG)
+	if (LANGULUS)
+		message(FATAL_ERROR "You can't fetch Langulus::${NAME}, because this build \
+		indicates LANGULUS is being build along your project. The library you're \
+		trying to fetch should already be available locally.")
+	endif()
+
     if(NOT DEFINED LANGULUS_EXTERNAL_DIRECTORY)
         set(LANGULUS_EXTERNAL_DIRECTORY "${CMAKE_SOURCE_DIR}/external" CACHE PATH
             "Place where external dependencies will be downloaded")
-        message(WARNING "LANGULUS_EXTERNAL_DIRECTORY not defined, using default: ${LANGULUS_EXTERNAL_DIRECTORY}")
+        message(WARNING "LANGULUS_EXTERNAL_DIRECTORY not defined, using default: \
+		${LANGULUS_EXTERNAL_DIRECTORY}")
     endif()
 
-    message(STATUS "Fetching external Langulus::${NAME}...")
+	# Completely avoid downloading or updating anything, once the appropriate	
+	# folder exists																
+	string(TOUPPER ${NAME} UPPERCASE_NAME)
+	if (EXISTS "${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src")
+		set(FETCHCONTENT_SOURCE_DIR_LANGULUS${UPPERCASE_NAME} "${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src" CACHE INTERNAL "" FORCE)
+		message(STATUS "Reusing external library Langulus::${NAME}... \
+		(delete ${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src manually in order to redownload)")
+	else()
+		unset(FETCHCONTENT_SOURCE_DIR_LANGULUS${UPPERCASE_NAME} CACHE)
+		message(STATUS "Downloading external library Langulus::${NAME}...")
+	endif()
+
     FetchContent_Declare(
         Langulus${NAME}
         GIT_REPOSITORY  https://github.com/Langulus/${NAME}.git
@@ -19,14 +39,28 @@ function(fetch_langulus_module NAME GIT_TAG TAG)
     FetchContent_MakeAvailable(Langulus${NAME})
 endfunction()
 
+
+# Utility for fetching external libraries using FetchContent					
 function(fetch_external_module NAME GIT_REPOSITORY REPO GIT_TAG TAG)
     if(NOT DEFINED LANGULUS_EXTERNAL_DIRECTORY)
         set(LANGULUS_EXTERNAL_DIRECTORY "${CMAKE_SOURCE_DIR}/external" CACHE PATH
             "Place where external dependencies will be downloaded")
-        message(WARNING "LANGULUS_EXTERNAL_DIRECTORY not defined, using default: ${LANGULUS_EXTERNAL_DIRECTORY}")
+        message(WARNING "LANGULUS_EXTERNAL_DIRECTORY not defined, \
+		using default: ${LANGULUS_EXTERNAL_DIRECTORY}")
     endif()
 
-    message(STATUS "Fetching external library ${NAME}...")
+	# Completely avoid downloading or updating anything, once the appropriate	
+	# folder exists																
+	string(TOUPPER ${NAME} UPPERCASE_NAME)
+	if (EXISTS "${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src")
+		set(FETCHCONTENT_SOURCE_DIR_${UPPERCASE_NAME} "${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src" CACHE INTERNAL "" FORCE)
+		message(STATUS "Reusing external library ${NAME}... \
+		(delete ${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src manually in order to redownload)")
+	else()
+		unset(FETCHCONTENT_SOURCE_DIR_${UPPERCASE_NAME} CACHE)
+		message(STATUS "Downloading external library ${NAME}...")
+	endif()
+
     FetchContent_Declare(
         ${NAME}
         GIT_REPOSITORY  ${REPO}
@@ -41,4 +75,4 @@ function(fetch_external_module NAME GIT_REPOSITORY REPO GIT_TAG TAG)
 	string(TOLOWER ${NAME} LOWERCASE_NAME)
     set(${NAME}_SOURCE_DIR "${${LOWERCASE_NAME}_SOURCE_DIR}" CACHE INTERNAL "${NAME} source directory")
     set(${NAME}_BINARY_DIR "${${LOWERCASE_NAME}_BINARY_DIR}" CACHE INTERNAL "${NAME} binary directory")
-endfunction()
+endfunction()

include/Anyness/Bytes.hpp → include/Langulus/Anyness/Bytes.hpp

@@ -6,6 +6,6 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/many/TMany.inl"
-#include "../../source/many/Bytes.inl"
-#include "../../source/maps/TMap.inl"
+#include "../../../source/many/TMany.inl"
+#include "../../../source/many/Bytes.inl"
+#include "../../../source/maps/TMap.inl"

include/Anyness/Construct.hpp → include/Langulus/Anyness/Construct.hpp

@@ -6,5 +6,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/many/Construct.inl"
-#include "../../source/text/Text.inl"
+#include "../../../source/many/Construct.inl"
+#include "../../../source/text/Text.inl"

include/Anyness/Edit.hpp → include/Langulus/Anyness/Edit.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/TEdit.inl"
+#include "../../../source/TEdit.inl"

include/Anyness/Many.hpp → include/Langulus/Anyness/Many.hpp

@@ -6,11 +6,11 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/many/Many.inl"
-#include "../../source/many/TMany.inl"
-#include "../../source/maps/TMap.inl"
-#include "../../source/text/Text.inl"
-#include "../../source/many/Neat.inl"
-#include "../../source/many/Construct.inl"
-#include "../../source/many/Bytes.inl"
-#include "../../source/verbs/Verb.inl"
+#include "../../../source/many/Many.inl"
+#include "../../../source/many/TMany.inl"
+#include "../../../source/maps/TMap.inl"
+#include "../../../source/text/Text.inl"
+#include "../../../source/many/Neat.inl"
+#include "../../../source/many/Construct.inl"
+#include "../../../source/many/Bytes.inl"
+#include "../../../source/verbs/Verb.inl"

include/Anyness/Map.hpp → include/Langulus/Anyness/Map.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/maps/Map.inl"
+#include "../../../source/maps/Map.inl"

include/Anyness/Neat.hpp → include/Langulus/Anyness/Neat.hpp

@@ -6,8 +6,8 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/many/Neat.inl"
-#include "../../source/many/Construct.inl"
-#include "../../source/many/Bytes.inl"
-#include "../../source/verbs/Verb.inl"
-#include "../../source/text/Text.inl"
+#include "../../../source/many/Neat.inl"
+#include "../../../source/many/Construct.inl"
+#include "../../../source/many/Bytes.inl"
+#include "../../../source/verbs/Verb.inl"
+#include "../../../source/text/Text.inl"

include/Anyness/Own.hpp → include/Langulus/Anyness/Own.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/one/Own.inl"
+#include "../../../source/one/Own.inl"

include/Anyness/Pair.hpp → include/Langulus/Anyness/Pair.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/pairs/Pair.inl"
+#include "../../../source/pairs/Pair.inl"

include/Anyness/Path.hpp → include/Langulus/Anyness/Path.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/text/Path.inl"
+#include "../../../source/text/Path.inl"

include/Anyness/Ref.hpp → include/Langulus/Anyness/Ref.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/one/Ref.inl"
+#include "../../../source/one/Ref.inl"

include/Anyness/Serial.hpp → include/Langulus/Anyness/Serial.hpp

@@ -6,6 +6,6 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/text/Text.inl"
-#include "../../source/many/Bytes.inl"
+#include "../../../source/text/Text.inl"
+#include "../../../source/many/Bytes.inl"
 

include/Anyness/Set.hpp → include/Langulus/Anyness/Set.hpp

@@ -7,4 +7,4 @@
 ///                                                                           
 #pragma once
 #include "Many.hpp"
-#include "../../source/sets/Set.inl"
+#include "../../../source/sets/Set.inl"

include/Anyness/THive.hpp → include/Langulus/Anyness/THive.hpp

@@ -6,5 +6,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/many/THive.inl"
-#include "../../source/maps/TMap.inl"
+#include "../../../source/many/THive.inl"
+#include "../../../source/maps/TMap.inl"

include/Anyness/TMap.hpp → include/Langulus/Anyness/TMap.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/maps/TMap.inl"
+#include "../../../source/maps/TMap.inl"

include/Anyness/TPair.hpp → include/Langulus/Anyness/TPair.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/pairs/TPair.inl"
+#include "../../../source/pairs/TPair.inl"

include/Anyness/TSet.hpp → include/Langulus/Anyness/TSet.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/sets/TSet.inl"
+#include "../../../source/sets/TSet.inl"

include/Anyness/Text.hpp → include/Langulus/Anyness/Text.hpp

@@ -6,5 +6,5 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/text/Text.inl"
-#include "../../source/maps/TMap.inl"
+#include "../../../source/text/Text.inl"
+#include "../../../source/maps/TMap.inl"

include/Anyness/Trait.hpp → include/Langulus/Anyness/Trait.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/many/TTrait.inl"
+#include "../../../source/many/TTrait.inl"

include/Anyness/Verb.hpp → include/Langulus/Anyness/Verb.hpp

@@ -6,4 +6,4 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include "../../source/verbs/Verb.inl"
+#include "../../../source/verbs/Verb.inl"

source/Charge.hpp

@@ -45,20 +45,20 @@ namespace Langulus::Anyness
          Real = DefaultPriority
       ) noexcept;
 
-      NOD() constexpr bool operator == (const Charge&) const noexcept;
+      constexpr bool    operator == (const Charge&) const noexcept;
 
-      NOD() constexpr Charge operator * (const Real&) const noexcept;
-      NOD() constexpr Charge operator ^ (const Real&) const noexcept;
+      constexpr Charge  operator *  (const Real&) const noexcept;
+      constexpr Charge  operator ^  (const Real&) const noexcept;
 
-      NOD() constexpr Charge& operator *= (const Real&) noexcept;
-      NOD() constexpr Charge& operator ^= (const Real&) noexcept;
+      constexpr Charge& operator *= (const Real&) noexcept;
+      constexpr Charge& operator ^= (const Real&) noexcept;
 
-      NOD() constexpr bool IsDefault() const noexcept;
-      NOD() constexpr bool IsFlowDependent() const noexcept;
-      NOD() Hash GetHash() const noexcept;
+      constexpr bool IsDefault() const noexcept;
+      constexpr bool IsFlowDependent() const noexcept;
+      Hash GetHash() const noexcept;
       void Reset() noexcept;
 
-      NOD() operator Text() const;
+      operator Text() const;
    };
 
 } // namespace Langulus::Anyness

source/Config.hpp

@@ -6,8 +6,7 @@
 /// SPDX-License-Identifier: GPL-3.0-or-later                                 
 ///                                                                           
 #pragma once
-#include <Core/Common.hpp>
-#include <RTTI/Meta.hpp>
+#include <Langulus/MetaOf.hpp>
 
 
 #if defined(LANGULUS_EXPORT_ALL) or defined(LANGULUS_EXPORT_ANYNESS)
@@ -18,7 +17,7 @@
 
 /// Enable memory manager                                                     
 #if LANGULUS_FEATURE(MANAGED_MEMORY)
-   #include <Fractalloc/Allocator.hpp>
+   #include <Langulus/Fractalloc.hpp>
 #else
    #include "memory/NoAllocator.hpp"
 #endif
@@ -149,3 +148,11 @@ namespace Langulus
    } // namespace Langulus::Anyness
 
 } // namespace Langulus
+
+#if 0
+   #define VERBOSE_COMPARE(...)     Logger::Verbose(__VA_ARGS__)
+   #define VERBOSE_COMPARE_TAB(...) const auto tab = Logger::Verbose(__VA_ARGS__, Logger::Tabs {})
+#else
+   #define VERBOSE_COMPARE(...)     LANGULUS(NOOP)
+   #define VERBOSE_COMPARE_TAB(...) LANGULUS(NOOP)
+#endif