From 71f84d7c147b67af4b539e0190d542cecabe94ca Mon Sep 17 00:00:00 2001
From: AWE Henry <mouth11or12@outlook.com>
Date: Mon, 24 Jun 2024 01:42:11 +0800
Subject: [PATCH] Cleanup

---
 include/papilio/access.hpp                         |  8 ++++----
 .../papilio/{access/misc.inl => accessor/misc.hpp} | 13 +++++++++++--
 .../{access/ranges.inl => accessor/ranges.hpp}     | 14 +++++++++++---
 .../{access/tuple.inl => accessor/tuple.hpp}       | 11 ++++++++++-
 4 files changed, 36 insertions(+), 10 deletions(-)
 rename include/papilio/{access/misc.inl => accessor/misc.hpp} (84%)
 rename include/papilio/{access/ranges.inl => accessor/ranges.hpp} (97%)
 rename include/papilio/{access/tuple.inl => accessor/tuple.hpp} (94%)

diff --git a/include/papilio/access.hpp b/include/papilio/access.hpp
index 807517c..de1dd11 100644
--- a/include/papilio/access.hpp
+++ b/include/papilio/access.hpp
@@ -374,10 +374,10 @@ class accessor_traits : public detail::accessor_traits_base
 };
 } // namespace papilio
 
-#include "access/tuple.inl"
-#include "access/ranges.inl"
-#include "access/misc.inl"
-
 #include "detail/suffix.hpp"
 
+#include "accessor/tuple.hpp"
+#include "accessor/ranges.hpp"
+#include "accessor/misc.hpp"
+
 #endif
diff --git a/include/papilio/access/misc.inl b/include/papilio/accessor/misc.hpp
similarity index 84%
rename from include/papilio/access/misc.inl
rename to include/papilio/accessor/misc.hpp
index 9b79a6f..b5c9023 100644
--- a/include/papilio/access/misc.inl
+++ b/include/papilio/accessor/misc.hpp
@@ -1,6 +1,11 @@
-#include <string_view>
+#ifndef PAPILIO_ACCESSOR_MISC_HPP
+#define PAPILIO_ACCESSOR_MISC_HPP
+
+#pragma once
+
 #include <typeindex>
-#include "../utility.hpp"
+#include "../access.hpp"
+#include "../detail/prefix.hpp"
 
 namespace papilio
 {
@@ -34,3 +39,7 @@ struct accessor<std::type_index, Context>
     }
 };
 } // namespace papilio
+
+#include "../detail/suffix.hpp"
+
+#endif
diff --git a/include/papilio/access/ranges.inl b/include/papilio/accessor/ranges.hpp
similarity index 97%
rename from include/papilio/access/ranges.inl
rename to include/papilio/accessor/ranges.hpp
index 574e25e..7f075cd 100644
--- a/include/papilio/access/ranges.inl
+++ b/include/papilio/accessor/ranges.hpp
@@ -1,11 +1,15 @@
-#include <string_view>
+#ifndef PAPILIO_ACCESSOR_RANGES_HPP
+#define PAPILIO_ACCESSOR_RANGES_HPP
+
+#pragma once
+
 #include <span>
 #include <ranges>
 #include <vector>
 #include <map>
 #include <utility>
-#include "../utility.hpp"
-#include "../utf/string.hpp"
+#include "../access.hpp"
+#include "../detail/prefix.hpp"
 
 namespace papilio
 {
@@ -279,3 +283,7 @@ struct accessor<fixed_flat_map<Key, T, Capacity, Compare>, Context> :
     public map_accessor<fixed_flat_map<Key, T, Capacity, Compare>, Context>
 {};
 } // namespace papilio
+
+#include "../detail/suffix.hpp"
+
+#endif
diff --git a/include/papilio/access/tuple.inl b/include/papilio/accessor/tuple.hpp
similarity index 94%
rename from include/papilio/access/tuple.inl
rename to include/papilio/accessor/tuple.hpp
index 66c2fd7..ebbb909 100644
--- a/include/papilio/access/tuple.inl
+++ b/include/papilio/accessor/tuple.hpp
@@ -1,6 +1,11 @@
-#include <string_view>
+#ifndef PAPILIO_ACCESSOR_TUPLE_HPP
+#define PAPILIO_ACCESSOR_TUPLE_HPP
+
+#pragma once
+
 #include <tuple>
 #include "../utility.hpp"
+#include "../detail/prefix.hpp"
 
 namespace papilio
 {
@@ -91,3 +96,7 @@ struct accessor<compressed_pair<T1, T2>, Context> :
     public tuple_accessor<compressed_pair<T1, T2>, Context, true>
 {};
 } // namespace papilio
+
+#include "../detail/suffix.hpp"
+
+#endif