From: Jacob Lifshay Date: Sat, 24 Jun 2017 00:03:14 +0000 (-0700) Subject: work on util::filesystem X-Git-Tag: gsoc-2017~86 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=aa1151137191a4bbc223482c904905e341bb4454;p=kazan.git work on util::filesystem --- diff --git a/src/util/filesystem.h b/src/util/filesystem.h index 52f9997..7ede999 100644 --- a/src/util/filesystem.h +++ b/src/util/filesystem.h @@ -38,8 +38,6 @@ #include "text.h" #include -#error finish - namespace vulkan_cpu { namespace util @@ -685,7 +683,6 @@ private: typename string_view_type::iterator(), Path_kind()))) { - constexpr Char_type dot = '.'; constexpr Char_type colon = ':'; typedef typename std::char_traits::int_type Int_type; constexpr Int_type eof = std::char_traits::eof(); @@ -781,42 +778,54 @@ private: parse(value, [&](typename string_view_type::iterator part_string_begin, typename string_view_type::iterator part_string_end, - Path_kind part_kind) noexcept + Path_kind part_kind) { if(part_index >= parts.size()) parts.emplace_back(); - parts[part_index].value.assign(part_string_begin, part_string_end); + // copy manually because libstdc++ allocates a new string in basic_string.assign + parts[part_index].value.clear(); + parts[part_index].value.reserve(part_string_end - part_string_begin); + for(auto i = part_string_begin; i != part_string_end; ++i) + parts[part_index].value.push_back(*i); parts[part_index].kind = part_kind; part_index++; }, fmt); } - static void convert_source(string_type &output_value, const string_type &source) - { - output_value = source; - } - template - static void convert_source(string_type &output_value, - const std::basic_string &source) - { - convert_source(output_value, source.begin(), source.end()); - } - template - static void convert_source(string_type &output_value, - const basic_string_view &source) + std::size_t get_filename_start_index() noexcept { - convert_source(output_value, source.begin(), source.end()); + std::size_t retval = value.size(); + auto value_view = string_view_type(value); + parse(value, + [&](typename string_view_type::iterator part_string_begin, + [[gnu::unused]] typename string_view_type::iterator part_string_end, + Path_kind part_kind) noexcept + { + if(part_kind == Path_kind::file_name) + retval = part_string_begin - value_view.begin(); + }); + return retval; } - template - static void convert_source(string_type &output_value, const Char_type2 *source) + std::size_t get_extension_start_index() noexcept { - convert_source(output_value, basic_string_view(source)); + constexpr Char_type dot = '.'; + std::size_t index = get_filename_start_index(); + if(index >= value.size()) + return value.size(); + if(value[index] == dot) + index++; + std::size_t retval = value.size(); + while(index < value.size()) + { + if(value[index] == dot) + retval = index; + index++; + } + return retval; } - template < - public : basic_path() noexcept : parts(), - value(), - kind(Path_kind::multiple_parts) +public: + basic_path() noexcept : parts(), value(), kind(Path_kind::multiple_parts) { } basic_path(const basic_path &) = default; @@ -828,18 +837,119 @@ private: } template basic_path(const Source &source, format fmt = auto_format) - : basic_path() + : basic_path(Path_convert_source::to_string(source), fmt) { - convert_source(value, source); - parse(fmt); } template basic_path(Input_iterator first, Input_iterator last, format fmt = auto_format) - : basic_path() + : basic_path(Path_convert_range::to_string(first, last), fmt) { - convert_source(value, first, last); - parse(fmt); } + basic_path &operator=(const basic_path &rt) = default; + basic_path &operator=(basic_path &&rt) noexcept = default; + basic_path &operator=(string_type &&new_value) + { + value = std::move(new_value); + parse(); + return *this; + } + template + basic_path &operator=(const Source &source) + { + assign(source); + return *this; + } + basic_path &assign(string_type &&new_value) + { + return operator=(new_value); + } + template + basic_path &assign(const Source &source) + { + assign(Path_convert_source::to_string(source)); + return *this; + } + template + basic_path &assign(Input_iterator first, Input_iterator last) + { + assign(Path_convert_range::to_string(first, last)); + return *this; + } + const Char_type *c_str() const noexcept + { + return value.c_str(); + } + const string_type &native() const noexcept + { + return value; + } + operator string_type() const + { + return value; + } + void clear() noexcept + { + value.clear(); + parse(); + } + basic_path &make_preferred() + { + for(auto &ch : value) + { + if(is_separator(ch)) + ch = preferred_separator; + } + for(auto &part : parts) + { + part.make_preferred(); + } + return *this; + } + basic_path &remove_filename() + { + std::size_t filename_start_index = get_filename_start_index(); + if(filename_start_index < value.size()) + { + value.resize(filename_start_index); + parse(); + } + return *this; + } + basic_path &replace_filename(const basic_path &replacement) + { + remove_filename(); + operator/=(replacement); + return *this; + } + basic_path &replace_extension(const basic_path &replacement = basic_path()) + { + constexpr Char_type dot = '.'; + std::size_t extension_start_index = get_extension_start_index(); + if(extension_start_index < value.size()) + value.resize(extension_start_index); + else if(replacement.value.empty()) + return *this; + if(!replacement.value.empty() && replacement.value.front() != dot) + { + value.reserve(value.size() + 1 + replacement.value.size()); + value += dot; + value += replacement.value; + } + else + { + value += replacement.value; + } + parse(); + return *this; + } + void swap(basic_path &other) noexcept + { + using std::swap; + swap(value, other.value); + parts.swap(other.parts); + swap(kind, other.kind); + } +#error finish }; template