diff options
Diffstat (limited to 'dev/kernel/NeKit')
| -rw-r--r-- | dev/kernel/NeKit/KString.inl | 36 | ||||
| -rw-r--r-- | dev/kernel/NeKit/Ref.h | 5 | ||||
| -rw-r--r-- | dev/kernel/NeKit/Utils.h | 25 |
3 files changed, 39 insertions, 27 deletions
diff --git a/dev/kernel/NeKit/KString.inl b/dev/kernel/NeKit/KString.inl index 2ee5afba..50f46837 100644 --- a/dev/kernel/NeKit/KString.inl +++ b/dev/kernel/NeKit/KString.inl @@ -10,7 +10,7 @@ namespace Kernel { template <typename CharKind> inline void ort_string_append(CharKind* lhs, const CharKind* rhs, Int32 cur) { - SizeT sz_rhs = ort_string_len<CharKind>(rhs); + SizeT sz_rhs = oe_string_len<CharKind>(rhs); SizeT rhs_i = 0; for (; rhs_i < sz_rhs; ++rhs_i) { @@ -46,9 +46,9 @@ inline bool KBasicString<CharKind>::operator==(const KBasicString<CharKind>& rhs template <typename CharKind> inline bool KBasicString<CharKind>::operator==(const CharKind* rhs) const { - if (ort_string_len<CharKind>(rhs) != this->Length()) return false; + if (oe_string_len<CharKind>(rhs) != this->Length()) return false; - for (Size index = 0; index < ort_string_len<CharKind>(rhs); ++index) { + for (Size index = 0; index < oe_string_len<CharKind>(rhs); ++index) { if (rhs[index] != this->fData[index]) return false; } @@ -68,9 +68,9 @@ inline bool KBasicString<CharKind>::operator!=(const KBasicString<CharKind>& rhs template <typename CharKind> inline bool KBasicString<CharKind>::operator!=(const CharKind* rhs) const { - if (ort_string_len<CharKind>(rhs) != this->Length()) return false; + if (oe_string_len<CharKind>(rhs) != this->Length()) return false; - for (Size index = 0; index < ort_string_len<CharKind>(rhs); ++index) { + for (Size index = 0; index < oe_string_len<CharKind>(rhs); ++index) { if (rhs[index] == this->fData[index]) return false; } @@ -79,10 +79,10 @@ inline bool KBasicString<CharKind>::operator!=(const CharKind* rhs) const { template <typename CharKind> inline KBasicString<CharKind>& KBasicString<CharKind>::operator+=(const KBasicString<CharKind>& rhs) { - if (ort_string_len<CharKind>(rhs.fData) > this->Length()) return *this; + if (oe_string_len<CharKind>(rhs.fData) > this->Length()) return *this; ort_string_append(this->fData, const_cast<CharKind*>(rhs.fData), this->fCur); - this->fCur += ort_string_len<CharKind>(const_cast<CharKind*>(rhs.fData)); + this->fCur += oe_string_len<CharKind>(const_cast<CharKind*>(rhs.fData)); return *this; } @@ -90,7 +90,7 @@ inline KBasicString<CharKind>& KBasicString<CharKind>::operator+=(const KBasicSt template <typename CharKind> inline KBasicString<CharKind>& KBasicString<CharKind>::operator+=(const CharKind* rhs) { ort_string_append(this->fData, const_cast<CharKind*>(rhs), this->fCur); - this->fCur += ort_string_len<CharKind>(const_cast<CharKind*>(rhs)); + this->fCur += oe_string_len<CharKind>(const_cast<CharKind*>(rhs)); return *this; } @@ -99,7 +99,7 @@ template <typename CharKind> inline ErrorOr<KBasicString<CharKind>> KStringBuilder::Construct(const CharKind* data) { if (!data || *data == 0) return ErrorOr<KBasicString<CharKind>>(nullptr); - KBasicString<CharKind>* view = new KBasicString<CharKind>(ort_string_len<CharKind>(data)); + KBasicString<CharKind>* view = new KBasicString<CharKind>(oe_string_len<CharKind>(data)); (*view) += data; return ErrorOr<KBasicString<CharKind>>(*view); @@ -109,12 +109,12 @@ inline const CharKind* KStringBuilder::FromBool(const CharKind* fmt, bool i) { if (!fmt) return ("?"); const CharKind* boolean_expr = i ? "YES" : "NO"; - CharKind* ret = (CharKind*) RTL_ALLOCA(ort_string_len<CharKind>(boolean_expr) + ort_string_len<CharKind>(fmt)); + CharKind* ret = (CharKind*) RTL_ALLOCA(oe_string_len<CharKind>(boolean_expr) + oe_string_len<CharKind>(fmt)); if (!ret) return ("?"); - const auto fmt_len = ort_string_len<CharKind>(fmt); - const auto res_len = ort_string_len<CharKind>(boolean_expr); + const auto fmt_len = oe_string_len<CharKind>(fmt); + const auto res_len = oe_string_len<CharKind>(boolean_expr); for (Size idx = 0; idx < fmt_len; ++idx) { if (fmt[idx] == '%') { @@ -135,9 +135,9 @@ inline const CharKind* KStringBuilder::FromBool(const CharKind* fmt, bool i) { } template <typename CharKind> inline bool KStringBuilder::Equals(const CharKind* lhs, const CharKind* rhs) { - if (ort_string_len<CharKind>(rhs) != ort_string_len<CharKind>(lhs)) return false; + if (oe_string_len<CharKind>(rhs) != oe_string_len<CharKind>(lhs)) return false; - for (Size index = 0; index < ort_string_len<CharKind>(rhs); ++index) { + for (Size index = 0; index < oe_string_len<CharKind>(rhs); ++index) { if (rhs[index] != lhs[index]) return false; } @@ -147,17 +147,17 @@ template <typename CharKind> inline const CharKind* KStringBuilder::Format(const CharKind* fmt, const CharKind* fmt2) { if (!fmt || !fmt2) return ("?"); - CharKind* ret = (CharKind*) RTL_ALLOCA(sizeof(char) * (ort_string_len<CharKind>(fmt2) + ort_string_len<CharKind>(fmt))); + CharKind* ret = (CharKind*) RTL_ALLOCA(sizeof(char) * (oe_string_len<CharKind>(fmt2) + oe_string_len<CharKind>(fmt))); if (!ret) return ("?"); - const auto len = ort_string_len<CharKind>(fmt); + const auto len = oe_string_len<CharKind>(fmt); for (Size idx = 0; idx < len; ++idx) { - if (fmt[idx] == '%' && idx < ort_string_len<CharKind>(fmt) && fmt[idx] == 's') { + if (fmt[idx] == '%' && idx < oe_string_len<CharKind>(fmt) && fmt[idx] == 's') { Size result_cnt = idx; - for (Size y_idx = 0; y_idx < ort_string_len<CharKind>(fmt2); ++y_idx) { + for (Size y_idx = 0; y_idx < oe_string_len<CharKind>(fmt2); ++y_idx) { ret[result_cnt] = fmt2[y_idx]; ++result_cnt; } diff --git a/dev/kernel/NeKit/Ref.h b/dev/kernel/NeKit/Ref.h index 08b1538d..a95cec7b 100644 --- a/dev/kernel/NeKit/Ref.h +++ b/dev/kernel/NeKit/Ref.h @@ -14,6 +14,9 @@ #include <NeKit/KernelPanic.h> namespace Kernel { +/// =========================================================== /// +/// @brief Reference wrapper class. /// +/// =========================================================== /// template <typename T> class Ref final { public: @@ -66,7 +69,7 @@ class NonNullRef final { Ref<T> fRef{}; }; -using RefAny = Ref<Any>; +using RefAny = Ref<Any>; using NonNullRefAny = NonNullRef<Any>; } // namespace Kernel diff --git a/dev/kernel/NeKit/Utils.h b/dev/kernel/NeKit/Utils.h index f2cffd8c..b622eda0 100644 --- a/dev/kernel/NeKit/Utils.h +++ b/dev/kernel/NeKit/Utils.h @@ -9,7 +9,9 @@ #include <NeKit/Defines.h> namespace Kernel { -/// ASCII API +/// =========================================================== /// +/// @brief ASCII API +/// =========================================================== /// Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len); Int rt_move_memory(const voidPtr src, voidPtr dst, Size len); @@ -20,29 +22,36 @@ const Char* rt_alloc_string(const Char* text); Size rt_string_len(const Char* str); Size rt_string_len(const Char* str, SizeT _len); Boolean rt_to_string(Char* str_out, UInt64 base, Int32 limit); -Boolean rt_is_newln(Char chr); -Boolean rt_is_space(Char chr); -Int32 rt_is_alnum(Int32 character); +Boolean rt_is_newln(Int chr); +Boolean rt_is_space(Int chr); +Int32 rt_is_alnum(Int character); Int rt_to_uppercase(Int c); Int rt_to_lower(Int c); voidPtr rt_string_in_string(const Char* in, const Char* needle); char* rt_string_has_char(Char* str, Char chr); -// Safe memory functions +/// =========================================================== /// +/// @brief Safe memory functions API +/// =========================================================== /// + Int rt_copy_memory_safe(const voidPtr src, voidPtr dst, Size len, Size dst_size); voidPtr rt_set_memory_safe(voidPtr dst, UInt32 value, Size len, Size dst_size); -/// UNICODE API +/// =========================================================== /// +/// @brief UNICODE API +/// =========================================================== /// Int urt_string_cmp(const Utf8Char* src, const Utf8Char* cmp, Size len); Void urt_set_memory(const voidPtr src, UInt32 dst, Size len); Int urt_copy_memory(const voidPtr src, voidPtr dst, Size len); Size urt_string_len(const Utf8Char* str); -/// OpenTemplate UTILS API +/// =========================================================== /// +/// @brief OpenEncoding API +/// =========================================================== /// template <typename CharType = Char> -inline SizeT ort_string_len(const CharType* str) { +inline SizeT oe_string_len(const CharType* str) { if (!str) return 0; SizeT len{0}; |
