Remove path header

source/base/CMakeLists.txt

@@ -5,7 +5,6 @@ add_library(tactile::base ALIAS tactile-base)
 
 target_sources(tactile-base
                INTERFACE FILE_SET "HEADERS" BASE_DIRS "inc" FILES
-               "inc/tactile/base/container/path.hpp"
                "inc/tactile/base/container/smart_ptr.hpp"
                "inc/tactile/base/container/string.hpp"
                "inc/tactile/base/container/string_map.hpp"

source/base/inc/tactile/base/container/string.hpp

@@ -2,11 +2,11 @@
 
 #pragma once
 
+#include <filesystem>   // path
 #include <string>       // basic_string, string
 #include <string_view>  // basic_string_view, string_view, wstring_view
 #include <type_traits>  // conditional_t
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/prelude.hpp"
 
 #if TACTILE_OS_WINDOWS

source/base/inc/tactile/base/document/document.hpp

@@ -3,9 +3,9 @@
 #pragma once
 
 #include <expected>      // expected
+#include <filesystem>    // path
 #include <system_error>  // error_code
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/io/save/save_format_id.hpp"
 #include "tactile/base/numeric/vec.hpp"
 #include "tactile/base/prelude.hpp"
@@ -53,7 +53,7 @@ class IDocument
    *
    * \param path A save file path.
    */
-  virtual void set_path(Path path) = 0;
+  virtual void set_path(std::filesystem::path path) = 0;
 
   /**
    * Sets the save format used by the document.
@@ -69,7 +69,7 @@ class IDocument
    * The associated file path, if any.
    */
   [[nodiscard]]
-  virtual auto get_path() const -> const Path* = 0;
+  virtual auto get_path() const -> const std::filesystem::path* = 0;
 
   /**
    * Returns the save format used by the document.

source/base/inc/tactile/base/document/map_view.hpp

@@ -3,10 +3,10 @@
 #pragma once
 
 #include <expected>      // expected
+#include <filesystem>    // path
 #include <optional>      // optional
 #include <system_error>  // error_code
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/id.hpp"
 #include "tactile/base/int.hpp"
 #include "tactile/base/io/compress/compression_format.hpp"
@@ -46,7 +46,7 @@ class IMapView
    * A possibly null file path.
    */
   [[nodiscard]]
-  virtual auto get_path() const -> const Path* = 0;
+  virtual auto get_path() const -> const std::filesystem::path* = 0;
 
   /**
    * Returns the logical size of tiles in the map.

source/base/inc/tactile/base/document/tileset_view.hpp

@@ -3,9 +3,9 @@
 #pragma once
 
 #include <expected>      // expected
+#include <filesystem>    // path
 #include <system_error>  // error_code
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/container/string.hpp"
 #include "tactile/base/id.hpp"
 #include "tactile/base/numeric/vec.hpp"
@@ -102,7 +102,7 @@ class ITilesetView
    * An image path.
    */
   [[nodiscard]]
-  virtual auto get_image_path() const -> const Path& = 0;
+  virtual auto get_image_path() const -> const std::filesystem::path& = 0;
 
   /**
    * Returns a view of the associated metadata.

source/base/inc/tactile/base/io/file_io.hpp

@@ -2,12 +2,12 @@
 
 #pragma once
 
-#include <fstream>   // ifstream
-#include <ios>       // ios
-#include <iterator>  // istreambuf_iterator
-#include <optional>  // optional
+#include <filesystem>  // path
+#include <fstream>     // ifstream
+#include <ios>         // ios
+#include <iterator>    // istreambuf_iterator
+#include <optional>    // optional
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/container/string.hpp"
 #include "tactile/base/prelude.hpp"
 
@@ -21,7 +21,7 @@ namespace tactile {
  * \return
  * The file content if successful; an empty optional otherwise.
  */
-inline auto read_binary_file(const Path& path) -> std::optional<String>
+inline auto read_binary_file(const std::filesystem::path& path) -> std::optional<String>
 {
   std::ifstream stream {path, std::ios::in | std::ios::binary};
 

source/base/inc/tactile/base/io/save/ir.hpp

@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <optional>  // optional
-#include <vector>    // vector
+#include <filesystem>  // path
+#include <optional>    // optional
+#include <vector>      // vector
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/container/string.hpp"
 #include "tactile/base/id.hpp"
 #include "tactile/base/io/compress/compression_format.hpp"
@@ -209,7 +209,7 @@ struct Tileset final
   Int2 image_size;
 
   /** The file path to the associated image. */
-  Path image_path;
+  std::filesystem::path image_path;
 
   /** The associated tile descriptors. */
   std::vector<Tile> tiles;

source/base/inc/tactile/base/io/save/save_format.hpp

@@ -3,9 +3,9 @@
 #pragma once
 
 #include <expected>      // expected
+#include <filesystem>    // path
 #include <system_error>  // error_code
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/io/save/ir.hpp"
 #include "tactile/base/prelude.hpp"
 
@@ -19,7 +19,7 @@ class IMapView;
 struct SaveFormatReadOptions final
 {
   /** The parent directory of the map or tileset file. */
-  Path base_dir;
+  std::filesystem::path base_dir;
 
   /** Whether strict parsing is to be enforced. */
   bool strict_mode : 1;
@@ -31,7 +31,7 @@ struct SaveFormatReadOptions final
 struct SaveFormatWriteOptions final
 {
   /** The parent directory of the map or tileset file. */
-  Path base_dir;
+  std::filesystem::path base_dir;
 
   /** Whether tilesets are saved in separate files. */
   bool use_external_tilesets : 1;
@@ -66,7 +66,8 @@ class ISaveFormat
    * An intermediate map if successful; an error code otherwise.
    */
   [[nodiscard]]
-  virtual auto load_map(const Path& map_path, const SaveFormatReadOptions& options) const
+  virtual auto load_map(const std::filesystem::path& map_path,
+                        const SaveFormatReadOptions& options) const
       -> std::expected<ir::Map, std::error_code> = 0;
 
   /**

source/base/inc/tactile/base/meta/attribute.hpp

@@ -4,12 +4,12 @@
 
 #include <cassert>      // assert
 #include <concepts>     // same_as, convertible_to
+#include <filesystem>   // path
 #include <stdexcept>    // logic_error
 #include <type_traits>  // decay_t
 #include <utility>      // move
 #include <variant>      // variant, visit
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/container/string.hpp"
 #include "tactile/base/id.hpp"
 #include "tactile/base/meta/attribute_type.hpp"
@@ -21,18 +21,18 @@
 namespace tactile {
 
 template <typename T>
-concept AttributeValueType = std::same_as<T, bool> ||           //
-                             std::convertible_to<T, String> ||  //
-                             std::convertible_to<T, int32> ||   //
-                             std::convertible_to<T, Int2> ||    //
-                             std::convertible_to<T, Int3> ||    //
-                             std::convertible_to<T, Int4> ||    //
-                             std::convertible_to<T, float> ||   //
-                             std::convertible_to<T, Float2> ||  //
-                             std::convertible_to<T, Float3> ||  //
-                             std::convertible_to<T, Float4> ||  //
-                             std::convertible_to<T, UColor> ||  //
-                             std::convertible_to<T, Path> ||    //
+concept AttributeValueType = std::same_as<T, bool> ||                          //
+                             std::convertible_to<T, String> ||                 //
+                             std::convertible_to<T, int32> ||                  //
+                             std::convertible_to<T, Int2> ||                   //
+                             std::convertible_to<T, Int3> ||                   //
+                             std::convertible_to<T, Int4> ||                   //
+                             std::convertible_to<T, float> ||                  //
+                             std::convertible_to<T, Float2> ||                 //
+                             std::convertible_to<T, Float3> ||                 //
+                             std::convertible_to<T, Float4> ||                 //
+                             std::convertible_to<T, UColor> ||                 //
+                             std::convertible_to<T, std::filesystem::path> ||  //
                              std::convertible_to<T, ObjectRef>;
 
 /**
@@ -66,7 +66,7 @@ class Attribute final
   using float3_type = Float3;
   using float4_type = Float4;
   using color_type = UColor;
-  using path_type = Path;
+  using path_type = std::filesystem::path;
   using objref_type = ObjectRef;
 
   // Remember to update the type indices if the type order changes.

source/base/inc/tactile/base/platform/filesystem.hpp

@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include <algorithm>  // replace
+#include <algorithm>   // replace
+#include <filesystem>  // path
 
-#include "tactile/base/container/path.hpp"
 #include "tactile/base/container/string.hpp"
 #include "tactile/base/prelude.hpp"
 
@@ -19,12 +19,12 @@ namespace tactile {
  * A string that represents the provided path but using forward slashes.
  */
 [[nodiscard]]
-inline auto normalize_path_separators(const Path& path) -> String
+inline auto normalize_path_separators(const std::filesystem::path& path) -> String
 {
   auto path_str = path.string();
 
-  if constexpr (Path::preferred_separator != '/') {
-    std::ranges::replace(path_str, Path::preferred_separator, '/');
+  if constexpr (std::filesystem::path::preferred_separator != '/') {
+    std::ranges::replace(path_str, std::filesystem::path::preferred_separator, '/');
   }
 
   return path_str;

source/base/inc/tactile/base/render/texture.hpp

@@ -2,7 +2,8 @@
 
 #pragma once
 
-#include "tactile/base/container/path.hpp"
+#include <filesystem>  // path
+
 #include "tactile/base/prelude.hpp"
 
 namespace tactile {
@@ -45,7 +46,7 @@ class ITexture
    *    A file path.
    */
   [[nodiscard]]
-  virtual auto get_path() const -> const Path& = 0;
+  virtual auto get_path() const -> const std::filesystem::path& = 0;
 };
 
 }  // namespace tactile

source/base/test/src/meta/attribute_test.cpp

@@ -28,7 +28,7 @@ TEST(Attribute, ExplicitTypeConstructor)
   EXPECT_EQ(Attribute {AttributeType::kFloat4}, Attribute {Float4 {}});
   EXPECT_EQ(Attribute {AttributeType::kBool}, Attribute {bool {}});
   EXPECT_EQ(Attribute {AttributeType::kColor}, Attribute {UColor {}});
-  EXPECT_EQ(Attribute {AttributeType::kPath}, Attribute {Path {}});
+  EXPECT_EQ(Attribute {AttributeType::kPath}, Attribute {std::filesystem::path {}});
   EXPECT_EQ(Attribute {AttributeType::kObject}, Attribute {ObjectRef {}});
 }
 
@@ -76,7 +76,7 @@ TEST(Attribute, ImplicitValueConstructor)
   }
 
   {
-    const Attribute path {Path {"foo/bar"}};
+    const Attribute path {std::filesystem::path {"foo/bar"}};
     EXPECT_EQ(path.get_type(), AttributeType::kPath);
     EXPECT_EQ(path.as_path(), "foo/bar");
   }
@@ -150,7 +150,7 @@ TEST(Attribute, Reset)
 
   attribute.reset(AttributeType::kPath);
   EXPECT_TRUE(attribute.has_default_value());
-  EXPECT_EQ(attribute, Attribute {Path {}});
+  EXPECT_EQ(attribute, Attribute {std::filesystem::path {}});
 
   attribute.reset(AttributeType::kObject);
   EXPECT_TRUE(attribute.has_default_value());
@@ -259,7 +259,7 @@ TEST(Attribute, AsColor)
 // tactile::Attribute::as_path
 TEST(Attribute, AsPath)
 {
-  EXPECT_EQ(Attribute {AttributeType::kPath}.as_path(), Path {});
+  EXPECT_EQ(Attribute {AttributeType::kPath}.as_path(), std::filesystem::path {});
   EXPECT_ANY_THROW((void) Attribute {AttributeType::kStr}.as_path());
 }
 

source/base/test/src/platform/filesystem_test.cpp

@@ -9,7 +9,7 @@ namespace tactile::test {
 // tactile::normalize_path_separators
 TEST(Filesystem, NormalizePathSeparators)
 {
-  const auto path = Path {"f"} / "o" / "o" / "b" / "a" / "r";
+  const auto path = std::filesystem::path {"f"} / "o" / "o" / "b" / "a" / "r";
   EXPECT_EQ(normalize_path_separators(path), "f/o/o/b/a/r");
 }
 

source/base/test/src/util/buffer_test.cpp

@@ -5,12 +5,11 @@
 #include <algorithm>  // fill_n
 #include <array>      // array
 #include <iterator>   // distance, back_inserter
+#include <vector>     // vector
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <vector> // vector
-
 namespace tactile::test {
 
 using testing::Const;

source/core/inc/tactile/core/document/map_document.hpp

@@ -59,12 +59,12 @@ class MapDocument final : public IDocument
 
   void update() override;
 
-  void set_path(Path path) override;
+  void set_path(std::filesystem::path path) override;
 
   void set_format(SaveFormatId format_id) override;
 
   [[nodiscard]]
-  auto get_path() const -> const Path* override;
+  auto get_path() const -> const std::filesystem::path* override;
 
   [[nodiscard]]
   auto get_format() const -> SaveFormatId override;

source/core/inc/tactile/core/document/map_view_impl.hpp

@@ -31,7 +31,7 @@ class MapViewImpl final : public IMapView
       -> std::expected<void, std::error_code> override;
 
   [[nodiscard]]
-  auto get_path() const -> const Path* override;
+  auto get_path() const -> const std::filesystem::path* override;
 
   [[nodiscard]]
   auto get_tile_size() const -> Int2 override;

source/core/inc/tactile/core/document/tileset_view_impl.hpp

@@ -48,7 +48,7 @@ class TilesetViewImpl final : public ITilesetView
   auto get_image_size() const -> Int2 override;
 
   [[nodiscard]]
-  auto get_image_path() const -> const Path& override;
+  auto get_image_path() const -> const std::filesystem::path& override;
 
   [[nodiscard]]
   auto get_meta() const -> const IMetaView& override;