[libcxx] Fix indentation for macros in filesystem header

Co-authored-by: Hxnter999 <[email protected]>

Author: moleium

libcxx/include/__filesystem/u8path.h

@@ -13,9 +13,8 @@
 #include <__algorithm/unwrap_iter.h>
 #include <__config>
 #include <__filesystem/path.h>
-
-#if _LIBCPP_HAS_LOCALIZATION
-#include <__locale>
+#if !defined(_LIBCPP_WIN32API) || _LIBCPP_HAS_LOCALIZATION
+#  include <__locale>
 #endif
 #include <string>
 
@@ -27,50 +26,60 @@
 
 _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
 
-#  if !defined(_LIBCPP_WIN32API) || _LIBCPP_HAS_LOCALIZATION
-template <class _InputIt, __enable_if_t<__is_pathable<_InputIt>::value, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f, _InputIt __l) {
+#  if defined(_LIBCPP_WIN32API) && _LIBCPP_HAS_LOCALIZATION
+#    define _LIBCPP_FS_U8PATH_CONVERTS_ENCODING 1
+#  else
+#    define _LIBCPP_FS_U8PATH_CONVERTS_ENCODING 0
+#  endif
+
+#  if _LIBCPP_FS_U8PATH_CONVERTS_ENCODING
+template <class _InputIt, class _Sentinel>
+_LIBCPP_HIDE_FROM_ABI string __make_tmp_string_for_u8path(_InputIt __f, _Sentinel __l) {
+  static_assert(__is_pathable<_InputIt>::value);
   static_assert(
 #    if _LIBCPP_HAS_CHAR8_T
-        is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
+      is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
 #    endif
-            is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
-        "u8path(Iter, Iter) requires Iter have a value_type of type 'char'"
-        " or 'char8_t'");
-#    if defined(_LIBCPP_WIN32API)
-    string __tmp(__f, __l);
-    using _CVT = __widen_from_utf8<sizeof(wchar_t) * __CHAR_BIT__>;
-    std::wstring __w;
-    __w.reserve(__tmp.size());
-    _CVT()(back_inserter(__w), __tmp.data(), __tmp.data() + __tmp.size());
-    return path(__w);
-#    else
-    return path(__f, __l);
-#    endif /* !_LIBCPP_WIN32API */
+      is_same<typename __is_pathable<_InputIt>::__char_type, char>::value);
+
+  if constexpr (is_same_v<_Sentinel, _NullSentinel>) {
+    string __tmp;
+    constexpr char __sentinel{};
+    for (; *__f != __sentinel; ++__f)
+      __tmp.push_back(*__f);
+    return __tmp;
+  } else {
+    static_assert(is_same_v<_InputIt, _Sentinel>);
+    return string(__f, __l);
+  }
+}
+#  endif // _LIBCPP_FS_U8PATH_CONVERTS_ENCODING
+
+template <class _InputIt, class _Sentinel>
+_LIBCPP_HIDE_FROM_ABI path __u8path(_InputIt __f, _Sentinel __l) {
+#  if _LIBCPP_FS_U8PATH_CONVERTS_ENCODING
+  auto __tmp = std::filesystem::__make_tmp_string_for_u8path(__f, __l);
+  using _CVT = __widen_from_utf8<sizeof(wchar_t) * __CHAR_BIT__>;
+  std::wstring __w;
+  __w.reserve(__tmp.size());
+  _CVT()(back_inserter(__w), __tmp.data(), __tmp.data() + __tmp.size());
+  return path(__w);
+#  else
+  return path(__f, __l);
+#  endif // _LIBCPP_FS_U8PATH_CONVERTS_ENCODING
 }
-#  endif /* !_LIBCPP_WIN32API || _LIBCPP_HAS_LOCALIZATION */
 
-#  if defined(_LIBCPP_WIN32API) && _LIBCPP_HAS_LOCALIZATION
 template <class _InputIt, __enable_if_t<__is_pathable<_InputIt>::value, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f, _NullSentinel) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f, _InputIt __l) {
   static_assert(
-#    if _LIBCPP_HAS_CHAR8_T
+#  if _LIBCPP_HAS_CHAR8_T
       is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
-#    endif
+#  endif
           is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
       "u8path(Iter, Iter) requires Iter have a value_type of type 'char'"
       " or 'char8_t'");
-  string __tmp;
-  const char __sentinel = char{};
-  for (; *__f != __sentinel; ++__f)
-    __tmp.push_back(*__f);
-  using _CVT = __widen_from_utf8<sizeof(wchar_t) * __CHAR_BIT__>;
-  std::wstring __w;
-  __w.reserve(__tmp.size());
-  _CVT()(back_inserter(__w), __tmp.data(), __tmp.data() + __tmp.size());
-  return path(__w);
+  return std::filesystem::__u8path(__f, __l);
 }
-#  endif /* _LIBCPP_WIN32API && _LIBCPP_HAS_LOCALIZATION */
 
 template <class _Source, __enable_if_t<__is_pathable<_Source>::value, int> = 0>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(const _Source& __s) {
@@ -81,15 +90,19 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(const _Source&
           is_same<typename __is_pathable<_Source>::__char_type, char>::value,
       "u8path(Source const&) requires Source have a character type of type "
       "'char' or 'char8_t'");
-#  if defined(_LIBCPP_WIN32API)
+#  if _LIBCPP_FS_U8PATH_CONVERTS_ENCODING
   using _Traits = __is_pathable<_Source>;
-  return u8path(std::__unwrap_iter(_Traits::__range_begin(__s)), std::__unwrap_iter(_Traits::__range_end(__s)));
+  return std::filesystem::__u8path(
+      std::__unwrap_iter(_Traits::__range_begin(__s)), std::__unwrap_iter(_Traits::__range_end(__s)));
 #  else
   return path(__s);
-#  endif
+#  endif // _LIBCPP_FS_U8PATH_CONVERTS_ENCODING
 }
 
+#  undef _LIBCPP_FS_U8PATH_CONVERTS_ENCODING
+
 _LIBCPP_END_NAMESPACE_FILESYSTEM
+
 #endif // _LIBCPP_STD_VER >= 17
 
 #endif // _LIBCPP___FILESYSTEM_U8PATH_H