Finalize the changes to ice::Path and ice::HeapPath types.

Dandielo · Dandielo · commit 2924735fc5df · 2026-01-22T23:25:59.000+09:00
#ICE-214 State In Review
diff --git a/source/code/core/utils/public/ice/native_file.hxx b/source/code/core/utils/public/ice/native_file.hxx
@@ -166,7 +166,7 @@ namespace ice::native_file
         (ice::native_file::path_join_string(result, ice::forward<Strings>(strings)), ...);
         if constexpr (ice::has_all(Flags, PathFlags::Normalized))
         {
-            ice::path::normalize(result);
+            result.normalize();
         }
         return result;
     }
diff --git a/source/code/core/utils/public/ice/path_utils.hxx b/source/code/core/utils/public/ice/path_utils.hxx
@@ -134,10 +134,28 @@ namespace ice
     struct HeapPathString : public PathString
     {
         template<typename Self>
-        auto append(this Self& self, ice::path::Path<Self> other) noexcept -> ice::path::Path<Self>
+        auto join(this Self& self, ice::path::Path<Self> other) noexcept -> ice::path::Path<Self>
         {
             return ice::path::Path<Self>{ ice::path::join(self, other) };
         }
+
+        template<typename Self>
+        auto normalize(this Self& self) noexcept -> ice::path::Path<Self>
+        {
+            return ice::path::Path<Self>{ ice::path::normalize(self) };
+        }
+
+        template<typename Self>
+        auto replace_filename(this Self& self, ice::string::String<Self> filename) noexcept -> ice::path::Path<Self>
+        {
+            return ice::path::Path<Self>{ ice::path::replace_filename(self, filename) };
+        }
+
+        template<typename Self>
+        auto replace_extension(this Self& self, ice::string::String<Self> extension) noexcept -> ice::path::Path<Self>
+        {
+            return ice::path::Path<Self>{ ice::path::replace_extension(self, extension) };
+        }
     };
 
     template<ice::concepts::SupportedCharType CharT>
diff --git a/source/code/framework/framework_base/private/framework_main.cxx b/source/code/framework/framework_base/private/framework_main.cxx
@@ -94,8 +94,8 @@ struct ice::app::Config
             , assets{ alloc }
         { }
 
-        ice::HeapString<> shaders;
-        ice::HeapString<> assets;
+        ice::HeapPath shaders;
+        ice::HeapPath assets;
     } dev_dirs;
 };
 
@@ -334,10 +334,10 @@ auto ice_setup(
         config.dev_dirs.assets = ice::app::workingdir();
 
         // Assumes the apps working-dir is in 'build' and no changes where done to shader compilation step
-        ice::path::join(config.dev_dirs.shaders, "obj/VkShaders/GFX-Vulkan-Unoptimized-vk-glslc-1-3/data");
-        ice::path::join(config.dev_dirs.assets, "../source/data");
-        ice::path::normalize(config.dev_dirs.shaders);
-        ice::path::normalize(config.dev_dirs.assets);
+        config.dev_dirs.shaders.join("obj/VkShaders/GFX-Vulkan-Unoptimized-vk-glslc-1-3/data");
+        config.dev_dirs.assets.join("../source/data");
+        config.dev_dirs.shaders.normalize();
+        config.dev_dirs.assets.normalize();
         config.dev_dirs.shaders.push_back('/');
         config.dev_dirs.assets.push_back('/');
         resource_paths.push_back(config.dev_dirs.assets);
diff --git a/source/code/platforms/platform_win32/private/win32_storage.cxx b/source/code/platforms/platform_win32/private/win32_storage.cxx
@@ -22,7 +22,7 @@ namespace ice::platform::win32
     namespace detail
     {
 
-        void get_known_path(ice::HeapString<>& out_path, const GUID& known_path_guid, ice::String appname = {})
+        void get_known_path(ice::HeapPath& out_path, const GUID& known_path_guid, ice::String appname = {})
         {
             PWSTR path;
             if (SHGetKnownFolderPath(known_path_guid, KF_FLAG_CREATE, NULL, &path) == S_OK)
@@ -37,7 +37,7 @@ namespace ice::platform::win32
                     out_path.push_back(appname);
                     out_path.push_back('\\');
                 }
-                ice::path::normalize(out_path);
+                out_path.normalize();
                 CoTaskMemFree(path);
             }
         }
@@ -124,7 +124,7 @@ namespace ice::platform::win32
         // GetTempPathW already returns a path ending with a slash character.
         DWORD const len = GetTempPathW(256, tempbuff);
         ice::wide_to_utf8_append({ tempbuff, ice::u32(len) }, _temp_location);
-        ice::path::normalize(_temp_location);
+        _temp_location.normalize();
     }
 
 } // namespace ice
diff --git a/source/code/systems/resource_system/private/resource_filesystem_baked.cxx b/source/code/systems/resource_system/private/resource_filesystem_baked.cxx
@@ -198,7 +198,7 @@ namespace ice
 
         ice::HeapPath utf8_file_path{ alloc };
         ice::native_file::path_to_string(file_path, utf8_file_path);
-        ice::path::normalize(utf8_file_path);
+        utf8_file_path.normalize();
         IPT_ZONE_TEXT_STR(utf8_file_path);
 
         ice::HeapString<> utf8_uri{ alloc };
diff --git a/source/code/systems/resource_system/private/resource_filesystem_loose.cxx b/source/code/systems/resource_system/private/resource_filesystem_loose.cxx
@@ -318,7 +318,7 @@ namespace ice
         {
             ice::HeapPath utf8_file_path{ alloc };
             ice::native_file::path_to_string(data_filepath, utf8_file_path);
-            ice::path::normalize(utf8_file_path);
+            utf8_file_path.normalize();
             IPT_ZONE_TEXT_STR(utf8_file_path);
 
             // TODO: Decide how to handle the basepath naming.
diff --git a/source/code/systems/resource_system/private/resource_filesystem_writable.cxx b/source/code/systems/resource_system/private/resource_filesystem_writable.cxx
@@ -263,7 +263,7 @@ namespace ice
         {
             ice::HeapPath utf8_file_path{ alloc };
             ice::native_file::path_to_string(data_filepath, utf8_file_path);
-            ice::path::normalize(utf8_file_path);
+            utf8_file_path.normalize();
             IPT_ZONE_TEXT_STR(utf8_file_path);
 
             // TODO: Decide how to handle the basepath naming.
diff --git a/source/code/systems/resource_system/private/resource_provider_custom.cxx b/source/code/systems/resource_system/private/resource_provider_custom.cxx
@@ -142,8 +142,8 @@ namespace ice
             0, origin_size - ice::Path{ root_resource->name() }.filename().size()
         );
 
-        predicted_path.append(relative_uri.path());
-        ice::path::normalize(predicted_path);
+        predicted_path.join(relative_uri.path());
+        predicted_path.normalize();
 
         ice::u64 const resource_hash = ice::hash(ice::String{ predicted_path });
 
diff --git a/source/code/systems/resource_system/private/resource_provider_dynlib.cxx b/source/code/systems/resource_system/private/resource_provider_dynlib.cxx
@@ -25,7 +25,7 @@ namespace ice
             , _resources{ _allocator }
         {
             ice::native_file::path_from_string(_base_path, path);
-            ice::path::normalize(_base_path);
+            _base_path.normalize();
         }
 
         ~ResourceProvider_DynLibs() noexcept override
diff --git a/source/code/systems/resource_system/private/resource_provider_filelist.cxx b/source/code/systems/resource_system/private/resource_provider_filelist.cxx
@@ -174,11 +174,11 @@ namespace ice
 
         ice::FileSystemResource* found_resource = nullptr;
 
-        ice::HeapString<> predicted_path{ (ice::Allocator&)_named_allocator };
+        ice::HeapPath predicted_path{ (ice::Allocator&)_named_allocator };
         for (ice::FileListEntry const& file_entry : _file_paths)
         {
             ice::native_file::path_to_string(file_entry.path, predicted_path);
-            ice::path::normalize(predicted_path);
+            predicted_path.normalize();
 
             if (found_resource = _resources.get(uri.path(), nullptr); found_resource != nullptr)
             {
@@ -228,8 +228,8 @@ namespace ice
             0, origin_size - ice::Path{ root_resource->name() }.filename().size()
         );
 
-        predicted_path.append(relative_uri.path());
-        ice::path::normalize(predicted_path);
+        predicted_path.join(relative_uri.path());
+        predicted_path.normalize();
 
         ice::FileSystemResource const* found_resource = _resources.get(predicted_path, nullptr);
         if (found_resource != nullptr)
diff --git a/source/code/systems/resource_system/private/resource_provider_filesystem.cxx b/source/code/systems/resource_system/private/resource_provider_filesystem.cxx
@@ -32,7 +32,7 @@ namespace ice
         for (ice::String path : paths)
         {
             ice::native_file::path_from_string(base_path, path);
-            ice::path::normalize(base_path);
+            base_path.normalize();
             _base_paths.push_back(base_path);
         }
     }
@@ -169,10 +169,10 @@ namespace ice
             //  While a base path like 'dir/subdir/' will create uris against 'dir/subdir/'
             if (base_path.back() != '/')
             {
-                predicted_path.append("..");
+                predicted_path.join("..");
             }
-            predicted_path.append(uri.path());
-            ice::path::normalize(predicted_path);
+            predicted_path.join(uri.path());
+            predicted_path.normalize();
 
             found_resource = _resources.get(predicted_path, nullptr);
             if (found_resource != nullptr)
@@ -223,8 +223,8 @@ namespace ice
             0, origin_size - ice::Path{ root_resource->name() }.filename().size()
         );
 
-        predicted_path.append(relative_uri.path());
-        ice::path::normalize(predicted_path);
+        predicted_path.join(relative_uri.path());
+        predicted_path.normalize();
 
         return _resources.get(predicted_path, nullptr);
     }
diff --git a/source/code/systems/resource_system/private/resource_writer_filesystem.cxx b/source/code/systems/resource_system/private/resource_writer_filesystem.cxx
@@ -161,10 +161,10 @@ namespace ice
         //  While a base path like 'dir/subdir/' will create uris against 'dir/subdir/'
         if (_base_path.back() != '/')
         {
-            predicted_path.append("..");
+            predicted_path.join("..");
         }
-        predicted_path.append(uri.path());
-        ice::path::normalize(predicted_path);
+        predicted_path.join(uri.path());
+        predicted_path.normalize();
 
         return _resources.get(predicted_path, nullptr);
     }
@@ -209,8 +209,8 @@ namespace ice
             0, origin_size - ice::Path{ root_resource->name() }.filename().size()
         );
 
-        predicted_path.append(relative_uri.path());
-        ice::path::normalize(predicted_path);
+        predicted_path.join(relative_uri.path());
+        predicted_path.normalize();
 
         return _resources.get(predicted_path, nullptr);
     }
@@ -236,17 +236,17 @@ namespace ice
 
             predicted_metapath.resize(0);
             predicted_metapath.reserve(origin_size + _base_path.size());
-            ice::path::join(predicted_metapath, _base_path);
+            predicted_metapath.join(_base_path);
 
             // Remove one directory if neccessary, because it's may be the common value of the base path and the uri path.
             // Note: This is because if a base path like 'dir/subdir' is provided the uri is created against 'dir/'
             //  While a base path like 'dir/subdir/' will create uris against 'dir/subdir/'
             if (_base_path.back() != '/')
             {
-                ice::path::join(predicted_metapath, ISP_PATH_LITERAL(".."));
+                predicted_metapath.join(ISP_PATH_LITERAL(".."));
             }
             ice::native_file::path_join_string(predicted_metapath, uri.path());
-            ice::path::normalize(predicted_metapath);
+            predicted_metapath.normalize();
 
             // Metapath is the actuall file path + .isrm, so we just save the lenght before the appending
             //  to have access to both paths.
diff --git a/source/code/tools/asset_compiler/private/asset_compiler_app.cxx b/source/code/tools/asset_compiler/private/asset_compiler_app.cxx
@@ -286,13 +286,13 @@ class AssetCompilerApp : public ice::tool::ToolApp<AssetCompilerApp>
                 // Replace the extension if a result extension is provided.
                 if (result_extension.not_empty())
                 {
-                    ice::path::replace_extension(final_asset_name, result_extension);
+                    final_asset_name.replace_extension(result_extension);
                 }
             }
             // If asset name has no extension, attach the result extension
             else if (final_asset_name.extension().is_empty())
             {
-                ice::path::replace_extension(final_asset_name, result_extension);
+                final_asset_name.replace_extension(result_extension);
             }
 
             // Warn if the final extension is different than what the resource compiler expects.
diff --git a/source/code/tools/hsc_packer/private/hsc_packer_app.cxx b/source/code/tools/hsc_packer/private/hsc_packer_app.cxx
@@ -14,9 +14,9 @@ auto hscp_process_directory(ice::Allocator& alloc, ice::Path dir) noexcept -> ic
     if (dir.is_relative())
     {
         searched_utf8_path = ice::app::workingdir();
-        searched_utf8_path.append(dir);
+        searched_utf8_path.join(dir);
     }
 
-    ice::path::normalize(searched_utf8_path);
+    searched_utf8_path.normalize();
     return searched_utf8_path;
 }
diff --git a/source/code/tools/tool_base/private/tool.cxx b/source/code/tools/tool_base/private/tool.cxx
@@ -28,10 +28,10 @@ auto ice::tool::path_make_absolute(ice::native_file::FilePath path) noexcept ->
     if (path.is_relative())
     {
         searched_utf8_path.clear();
-        ice::path::join(searched_utf8_path, ice::tool::path_current_directory());
-        ice::path::join(searched_utf8_path, path);
+        searched_utf8_path.join(ice::tool::path_current_directory());
+        searched_utf8_path.join(path);
     }
 
-    ice::path::normalize(searched_utf8_path);
+    searched_utf8_path.normalize();
     return searched_utf8_path;
 }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ namespace ice::native_file`
`166`	`166`	`(ice::native_file::path_join_string(result, ice::forward<Strings>(strings)), ...);`
`167`	`167`	`if constexpr (ice::has_all(Flags, PathFlags::Normalized))`
`168`	`168`	`{`
`169`		`- ice::path::normalize(result);`
	`169`	`+ result.normalize();`
`170`	`170`	`}`
`171`	`171`	`return result;`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ namespace ice::platform::win32`
`22`	`22`	`namespace detail`
`23`	`23`	`{`
`24`	`24`
`25`		`- void get_known_path(ice::HeapString<>& out_path, const GUID& known_path_guid, ice::String appname = {})`
	`25`	`+ void get_known_path(ice::HeapPath& out_path, const GUID& known_path_guid, ice::String appname = {})`
`26`	`26`	`{`
`27`	`27`	`PWSTR path;`
`28`	`28`	`if (SHGetKnownFolderPath(known_path_guid, KF_FLAG_CREATE, NULL, &path) == S_OK)`
`@@ -37,7 +37,7 @@ namespace ice::platform::win32`
`37`	`37`	`out_path.push_back(appname);`
`38`	`38`	`out_path.push_back('\\');`
`39`	`39`	`}`
`40`		`- ice::path::normalize(out_path);`
	`40`	`+ out_path.normalize();`
`41`	`41`	`CoTaskMemFree(path);`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -124,7 +124,7 @@ namespace ice::platform::win32`
`124`	`124`	`// GetTempPathW already returns a path ending with a slash character.`
`125`	`125`	`DWORD const len = GetTempPathW(256, tempbuff);`
`126`	`126`	`ice::wide_to_utf8_append({ tempbuff, ice::u32(len) }, _temp_location);`
`127`		`- ice::path::normalize(_temp_location);`
	`127`	`+ _temp_location.normalize();`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`} // namespace ice`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ namespace ice`
`318`	`318`	`{`
`319`	`319`	`ice::HeapPath utf8_file_path{ alloc };`
`320`	`320`	`ice::native_file::path_to_string(data_filepath, utf8_file_path);`
`321`		`- ice::path::normalize(utf8_file_path);`
	`321`	`+ utf8_file_path.normalize();`
`322`	`322`	`IPT_ZONE_TEXT_STR(utf8_file_path);`
`323`	`323`
`324`	`324`	`// TODO: Decide how to handle the basepath naming.`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ namespace ice`
`263`	`263`	`{`
`264`	`264`	`ice::HeapPath utf8_file_path{ alloc };`
`265`	`265`	`ice::native_file::path_to_string(data_filepath, utf8_file_path);`
`266`		`- ice::path::normalize(utf8_file_path);`
	`266`	`+ utf8_file_path.normalize();`
`267`	`267`	`IPT_ZONE_TEXT_STR(utf8_file_path);`
`268`	`268`
`269`	`269`	`// TODO: Decide how to handle the basepath naming.`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ namespace ice`
`25`	`25`	`, _resources{ _allocator }`
`26`	`26`	`{`
`27`	`27`	`ice::native_file::path_from_string(_base_path, path);`
`28`		`- ice::path::normalize(_base_path);`
	`28`	`+ _base_path.normalize();`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`~ResourceProvider_DynLibs() noexcept override`