summaryrefslogtreecommitdiffhomepage
path: root/include/ocl
diff options
context:
space:
mode:
Diffstat (limited to 'include/ocl')
-rw-r--r--include/ocl/tproc/detail/rope_fwd.hpp22
-rw-r--r--include/ocl/tproc/detail/rope_fwd.inl39
2 files changed, 37 insertions, 24 deletions
diff --git a/include/ocl/tproc/detail/rope_fwd.hpp b/include/ocl/tproc/detail/rope_fwd.hpp
index 7541795..51754d7 100644
--- a/include/ocl/tproc/detail/rope_fwd.hpp
+++ b/include/ocl/tproc/detail/rope_fwd.hpp
@@ -29,17 +29,17 @@ namespace ocl::tproc
using const_reference = const CharT&;
using pointer = std::allocator_traits<Allocator>::pointer;
using const_pointer = const std::allocator_traits<Allocator>::pointer;
- using iterator_type = basic_rope<CharT, Traits, Allocator>*;
+ using iterator_ptr = basic_rope<CharT, Traits, Allocator>*;
- iterator_type rbegin();
- iterator_type rend();
+ iterator_ptr rbegin();
+ iterator_ptr rend();
- iterator_type begin();
- iterator_type end();
+ iterator_ptr begin();
+ iterator_ptr end();
- /// \todo do we need const_iterator_type now?
- const iterator_type cbegin();
- const iterator_type cend();
+ /// \todo do we need const_iterator_ptr now?
+ const iterator_ptr cbegin();
+ const iterator_ptr cend();
/// \brief Extarcts a needle from a position of n length.
basic_rope<CharT, Traits, Allocator>& substr(size_type pos, const size_type n = 0);
@@ -56,6 +56,10 @@ namespace ocl::tproc
size_type size();
bool empty() const;
+ iterator_ptr insert(size_type pos,
+ const boost::core::basic_string_view<CharT>&,
+ iterator_ptr) const;
+
boost::core::basic_string_view<value_type> data();
const boost::core::basic_string_view<value_type> c_str();
@@ -75,7 +79,7 @@ namespace ocl::tproc
bool operator!=(const boost::core::basic_string_view<CharT>&);
bool operator==(const boost::core::basic_string_view<CharT>&);
- iterator_type concat(iterator_type right);
+ iterator_ptr concat(iterator_ptr right);
public:
static constexpr size_type npos = (size_type)(-1);
diff --git a/include/ocl/tproc/detail/rope_fwd.inl b/include/ocl/tproc/detail/rope_fwd.inl
index 01e5bbe..fffbce3 100644
--- a/include/ocl/tproc/detail/rope_fwd.inl
+++ b/include/ocl/tproc/detail/rope_fwd.inl
@@ -118,10 +118,10 @@ namespace ocl::tproc
if (!right)
return left;
- auto res = std::basic_string<CharT>(left->data().data(), left->data().size());
- res += std::basic_string<CharT>(right->data().data(), right->data().size());
+ auto view_new_text = std::basic_string<CharT>(left->data().data(), left->data().size());
+ view_new_text += std::basic_string<CharT>(right->data().data(), right->data().size());
- auto* new_rope = new basic_rope<CharT, Traits, Allocator>(res);
+ auto* new_rope = new basic_rope<CharT, Traits, Allocator>(view_new_text);
new_rope->impl_->left_ = left;
new_rope->impl_->right_ = right;
@@ -151,19 +151,16 @@ namespace ocl::tproc
// Internal node
if (pos < weight_)
{
- // Split in left subtree
auto [ll, lr] = left_->impl_->split(pos, left_, alloc);
return {ll, concat(lr, right_, alloc)};
}
else if (pos > weight_)
{
- // Split in right subtree
auto [rl, rr] = right_->impl_->split(pos - weight_, right_, alloc);
return {concat(left_, rl, alloc), rr};
}
else
{
- // Split exactly at this node
return {left_, right_};
}
}
@@ -281,10 +278,12 @@ namespace ocl::tproc
{
if (!left_)
return false;
+
size_type left_check = std::min(weight_ - rope_pos, suffix.size() - suffix_pos);
if (!left_->impl_->check_suffix(suffix, rope_pos, suffix_pos))
return false;
+
suffix_pos += left_check;
if (suffix_pos >= suffix.size())
@@ -299,6 +298,7 @@ namespace ocl::tproc
if (right_)
return right_->impl_->check_suffix(suffix, rope_pos, suffix_pos);
+
return suffix_pos >= suffix.size();
}
};
@@ -334,7 +334,7 @@ namespace ocl::tproc
}
template <class CharT, class Traits, class Allocator>
- basic_rope<CharT, Traits, Allocator>::iterator_type basic_rope<CharT, Traits, Allocator>::begin()
+ basic_rope<CharT, Traits, Allocator>::iterator_ptr basic_rope<CharT, Traits, Allocator>::begin()
{
if (impl_->is_leaf())
return this;
@@ -343,19 +343,19 @@ namespace ocl::tproc
}
template <class CharT, class Traits, class Allocator>
- basic_rope<CharT, Traits, Allocator>::iterator_type basic_rope<CharT, Traits, Allocator>::end()
+ basic_rope<CharT, Traits, Allocator>::iterator_ptr basic_rope<CharT, Traits, Allocator>::end()
{
return nullptr;
}
template <class CharT, class Traits, class Allocator>
- const basic_rope<CharT, Traits, Allocator>::iterator_type basic_rope<CharT, Traits, Allocator>::cbegin()
+ const basic_rope<CharT, Traits, Allocator>::iterator_ptr basic_rope<CharT, Traits, Allocator>::cbegin()
{
return this->begin();
}
template <class CharT, class Traits, class Allocator>
- const basic_rope<CharT, Traits, Allocator>::iterator_type basic_rope<CharT, Traits, Allocator>::cend()
+ const basic_rope<CharT, Traits, Allocator>::iterator_ptr basic_rope<CharT, Traits, Allocator>::cend()
{
return this->end();
}
@@ -374,13 +374,13 @@ namespace ocl::tproc
}
template <class CharT, class Traits, class Allocator>
- basic_rope<CharT, Traits, Allocator>::iterator_type basic_rope<CharT, Traits, Allocator>::rbegin()
+ basic_rope<CharT, Traits, Allocator>::iterator_ptr basic_rope<CharT, Traits, Allocator>::rbegin()
{
return this->begin();
}
template <class CharT, class Traits, class Allocator>
- basic_rope<CharT, Traits, Allocator>::iterator_type basic_rope<CharT, Traits, Allocator>::rend()
+ basic_rope<CharT, Traits, Allocator>::iterator_ptr basic_rope<CharT, Traits, Allocator>::rend()
{
return this->end();
}
@@ -390,6 +390,7 @@ namespace ocl::tproc
basic_rope<CharT, Traits, Allocator>::substr(size_type pos, const size_type n)
{
static basic_rope<CharT, Traits, Allocator> empty_rope("");
+
if (!impl_)
return empty_rope;
@@ -439,9 +440,8 @@ namespace ocl::tproc
if (!impl_ || !other.impl_)
return false;
- // Get the string representation and use the string_view version
- // This is inefficient but works
size_type other_size = other.impl_->size();
+
if (other_size > impl_->size())
return false;
@@ -499,6 +499,7 @@ namespace ocl::tproc
{
if (!impl_ && !other.impl_)
return true;
+
if (!impl_ || !other.impl_)
return false;
@@ -516,6 +517,7 @@ namespace ocl::tproc
{
if (!impl_)
return str.empty();
+
return impl_->equals(str);
}
@@ -543,6 +545,13 @@ namespace ocl::tproc
return impl_->concat(this, right);
}
+ template <class CharT, class Traits, class Allocator>
+ basic_rope<CharT, Traits, Allocator>* basic_rope<CharT, Traits, Allocator>::insert(size_type pos,
+ const boost::core::basic_string_view<CharT>& text,
+ iterator_ptr l) const
+ {
+ return impl_->insert(pos, text, l);
+ }
} // namespace ocl::tproc
-#endif \ No newline at end of file
+#endif
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-12 22:52:30 +0000