summaryrefslogtreecommitdiffhomepage
path: root/dev/kernel/NeKit
diff options
context:
space:
mode:
Diffstat (limited to 'dev/kernel/NeKit')
-rw-r--r--dev/kernel/NeKit/Defines.h11
-rw-r--r--dev/kernel/NeKit/Json.h46
-rw-r--r--dev/kernel/NeKit/KString.h26
-rw-r--r--dev/kernel/NeKit/KString.inl28
-rw-r--r--dev/kernel/NeKit/Ref.h3
-rw-r--r--dev/kernel/NeKit/Variant.h7
6 files changed, 64 insertions, 57 deletions
diff --git a/dev/kernel/NeKit/Defines.h b/dev/kernel/NeKit/Defines.h
index c5f02e0a..ed979e03 100644
--- a/dev/kernel/NeKit/Defines.h
+++ b/dev/kernel/NeKit/Defines.h
@@ -12,7 +12,7 @@
#define NEKIT_VERSION_BCD 0x0001
#ifndef __cplusplus
-#error Kernel compiles with a C++ compiler.
+#error !!! Kernel compiles only with a C++ compiler. !!!
#endif
#if __cplusplus <= 201703L
@@ -39,7 +39,7 @@ using Int32 = __INT32_TYPE__;
using UShort = __UINT16_TYPE__;
using UInt16 = __UINT16_TYPE__;
using Short = short;
-using Int16 = short;
+using Int16 = __INT16_TYPE__;
using UInt = __UINT32_TYPE__;
using UInt32 = __UINT32_TYPE__;
using Long = __INT64_TYPE__;
@@ -49,11 +49,13 @@ using UInt64 = __UINT64_TYPE__;
using Boolean = bool;
using Bool = bool;
using Char = char;
+using Int8 = __INT8_TYPE__;
+using Char8 = char8_t;
using UChar = __UINT8_TYPE__;
using UInt8 = __UINT8_TYPE__;
-using SSize = Int64;
-using SSizeT = Int64;
+using SSize = long;
+using SSizeT = long;
using Size = __SIZE_TYPE__;
using SizeT = __SIZE_TYPE__;
using IntPtr = __INTPTR_TYPE__;
@@ -83,6 +85,7 @@ typedef UInt32 PhysicalAddressKind;
typedef UIntPtr VirtualAddressKind;
using Void = void;
+using Any = void*;
using Lba = UInt64;
diff --git a/dev/kernel/NeKit/Json.h b/dev/kernel/NeKit/Json.h
index 24357dd7..35f53b57 100644
--- a/dev/kernel/NeKit/Json.h
+++ b/dev/kernel/NeKit/Json.h
@@ -7,7 +7,7 @@
#pragma once
-// last-rev: 02/04/25
+/// @brief Kernel JSON API.
#include <CompilerKit/CompilerKit.h>
#include <NeKit/Defines.h>
@@ -15,58 +15,58 @@
#include <NeKit/Stream.h>
#include <NeKit/Utils.h>
-#define kJSONMaxLen (8196)
-#define kJSONLen (256)
-#define kJSONNullArr "[]"
-#define kJSONNullObj "{}"
+#define kNeJsonMaxLen (8196)
+#define kNeJsonLen (256)
+#define kNeJsonNullArr "[]"
+#define kNeJsonNullObj "{}"
namespace Kernel {
/// @brief JavaScript object class
-class Json final {
+class JsonObject final {
public:
- explicit Json() {
- auto len = kJSONMaxLen;
- BasicKString<> key = KString(len);
- key += kJSONNullObj;
+ explicit JsonObject() {
+ auto len = kNeJsonMaxLen;
+ KBasicString<> key = KString(len);
+ key += kNeJsonNullObj;
this->AsKey() = key;
this->AsValue() = key;
}
- explicit Json(SizeT lhsLen, SizeT rhsLen) : fKey(lhsLen), fValue(rhsLen) {}
+ explicit JsonObject(SizeT lhsLen, SizeT rhsLen) : fKey(lhsLen), fValue(rhsLen) {}
- ~Json() = default;
+ ~JsonObject() = default;
- NE_COPY_DEFAULT(Json)
+ NE_COPY_DEFAULT(JsonObject)
Bool& IsUndefined() { return fUndefined; }
private:
Bool fUndefined; // is this instance undefined?
- BasicKString<> fKey;
- BasicKString<> fValue;
+ KBasicString<> fKey;
+ KBasicString<> fValue;
public:
/// @brief returns the key of the json
/// @return the key as string view.
- BasicKString<>& AsKey() { return fKey; }
+ KBasicString<>& AsKey() { return fKey; }
/// @brief returns the value of the json.
/// @return the key as string view.
- BasicKString<>& AsValue() { return fValue; }
+ KBasicString<>& AsValue() { return fValue; }
- static Json kNull;
+ static JsonObject kNull;
};
-/// @brief Json stream reader helper.
+/// @brief JsonObject stream reader helper.
struct JsonStreamReader final {
- STATIC Json In(const Char* full_array) {
+ STATIC JsonObject In(const Char* full_array) {
auto start_val = '{';
auto end_val = '}';
Boolean probe_value = false;
if (full_array[0] != start_val) {
- if (full_array[0] != '[') return Json::kNull;
+ if (full_array[0] != '[') return JsonObject::kNull;
start_val = '[';
end_val = ']';
@@ -79,7 +79,7 @@ struct JsonStreamReader final {
SizeT key_len = 0;
SizeT value_len = 0;
- Json type(kJSONMaxLen, kJSONMaxLen);
+ JsonObject type(kNeJsonMaxLen, kNeJsonMaxLen);
for (SizeT i = 1; i < len; ++i) {
if (full_array[i] == '\r' || full_array[i] == '\n') continue;
@@ -125,5 +125,5 @@ struct JsonStreamReader final {
}
};
-using JsonStream = Stream<JsonStreamReader, Json>;
+using JsonStream = Stream<JsonStreamReader, JsonObject>;
} // namespace Kernel
diff --git a/dev/kernel/NeKit/KString.h b/dev/kernel/NeKit/KString.h
index ec883a2f..6a1b04d2 100644
--- a/dev/kernel/NeKit/KString.h
+++ b/dev/kernel/NeKit/KString.h
@@ -12,14 +12,14 @@
#include <NeKit/KernelPanic.h>
#include <NeKit/Utils.h>
-#define kMinimumStringSize (8196U)
-
namespace Kernel {
+inline auto kMinimumStringSize = 8196;
+
/// @brief Kernel string class, not dynamic.
template <typename CharKind = Char>
-class BasicKString final {
+class KBasicString final {
public:
- explicit BasicKString() {
+ explicit KBasicString() {
fDataSz = kMinimumStringSize;
fData = new CharKind[fDataSz];
@@ -28,7 +28,7 @@ class BasicKString final {
rt_set_memory(fData, 0, fDataSz);
}
- explicit BasicKString(SizeT Sz) : fDataSz(Sz) {
+ explicit KBasicString(SizeT Sz) : fDataSz(Sz) {
MUST_PASS(Sz > 1);
fData = new CharKind[Sz];
@@ -37,14 +37,14 @@ class BasicKString final {
rt_set_memory(fData, 0, Sz);
}
- ~BasicKString() {
+ ~KBasicString() {
if (fData) {
delete[] fData;
fData = nullptr;
}
}
- NE_COPY_DEFAULT(BasicKString)
+ NE_COPY_DEFAULT(KBasicString)
CharKind* Data();
const CharKind* CData() const;
@@ -53,11 +53,11 @@ class BasicKString final {
bool operator==(const CharKind* rhs) const;
bool operator!=(const CharKind* rhs) const;
- bool operator==(const BasicKString<CharKind>& rhs) const;
- bool operator!=(const BasicKString<CharKind>& rhs) const;
+ bool operator==(const KBasicString<CharKind>& rhs) const;
+ bool operator!=(const KBasicString<CharKind>& rhs) const;
- BasicKString<CharKind>& operator+=(const CharKind* rhs);
- BasicKString<CharKind>& operator+=(const BasicKString<CharKind>& rhs);
+ KBasicString<CharKind>& operator+=(const CharKind* rhs);
+ KBasicString<CharKind>& operator+=(const KBasicString<CharKind>& rhs);
operator const char*() { return fData; }
@@ -73,13 +73,13 @@ class BasicKString final {
friend class KStringBuilder;
};
-using KString = BasicKString<>;
+using KString = KBasicString<>;
using KStringOr = ErrorOr<KString>;
class KStringBuilder final {
public:
template <typename CharKind = Char>
- static ErrorOr<BasicKString<CharKind>> Construct(const CharKind* data);
+ static ErrorOr<KBasicString<CharKind>> Construct(const CharKind* data);
template <typename CharKind = Char>
static const CharKind* FromBool(const CharKind* fmt, bool n);
template <typename CharKind = Char>
diff --git a/dev/kernel/NeKit/KString.inl b/dev/kernel/NeKit/KString.inl
index 4bb48415..d238818c 100644
--- a/dev/kernel/NeKit/KString.inl
+++ b/dev/kernel/NeKit/KString.inl
@@ -4,7 +4,7 @@
------------------------------------------- */
-/// @file BasicKString.inl
+/// @file KBasicString.inl
/// @brief Kernel String manipulation file.
namespace Kernel {
@@ -19,22 +19,22 @@ inline void ort_string_append(CharKind* lhs, const CharKind* rhs, Int32 cur) {
}
template <typename CharKind>
-inline CharKind* BasicKString<CharKind>::Data() {
+inline CharKind* KBasicString<CharKind>::Data() {
return this->fData;
}
template <typename CharKind>
-inline const CharKind* BasicKString<CharKind>::CData() const {
+inline const CharKind* KBasicString<CharKind>::CData() const {
return const_cast<const CharKind*>(this->fData);
}
template <typename CharKind>
-inline SizeT BasicKString<CharKind>::Length() const {
+inline SizeT KBasicString<CharKind>::Length() const {
return this->fDataSz;
}
template <typename CharKind>
-inline bool BasicKString<CharKind>::operator==(const BasicKString<CharKind>& rhs) const {
+inline bool KBasicString<CharKind>::operator==(const KBasicString<CharKind>& rhs) const {
if (rhs.Length() != this->Length()) return false;
for (Size index = 0; index < this->Length(); ++index) {
@@ -45,7 +45,7 @@ inline bool BasicKString<CharKind>::operator==(const BasicKString<CharKind>& rhs
}
template <typename CharKind>
-inline bool BasicKString<CharKind>::operator==(const CharKind* rhs) const {
+inline bool KBasicString<CharKind>::operator==(const CharKind* rhs) const {
if (ort_string_len<CharKind>(rhs) != this->Length()) return false;
for (Size index = 0; index < ort_string_len<CharKind>(rhs); ++index) {
@@ -56,7 +56,7 @@ inline bool BasicKString<CharKind>::operator==(const CharKind* rhs) const {
}
template <typename CharKind>
-inline bool BasicKString<CharKind>::operator!=(const BasicKString<CharKind>& rhs) const {
+inline bool KBasicString<CharKind>::operator!=(const KBasicString<CharKind>& rhs) const {
if (rhs.Length() != this->Length()) return false;
for (Size index = 0; index < rhs.Length(); ++index) {
@@ -67,7 +67,7 @@ inline bool BasicKString<CharKind>::operator!=(const BasicKString<CharKind>& rhs
}
template <typename CharKind>
-inline bool BasicKString<CharKind>::operator!=(const CharKind* rhs) const {
+inline bool KBasicString<CharKind>::operator!=(const CharKind* rhs) const {
if (ort_string_len<CharKind>(rhs) != this->Length()) return false;
for (Size index = 0; index < ort_string_len<CharKind>(rhs); ++index) {
@@ -78,7 +78,7 @@ inline bool BasicKString<CharKind>::operator!=(const CharKind* rhs) const {
}
template <typename CharKind>
-inline BasicKString<CharKind>& BasicKString<CharKind>::operator+=(const BasicKString<CharKind>& rhs) {
+inline KBasicString<CharKind>& KBasicString<CharKind>::operator+=(const KBasicString<CharKind>& rhs) {
if (ort_string_len<CharKind>(rhs.fData) > this->Length()) return *this;
ort_string_append(this->fData, const_cast<CharKind*>(rhs.fData), this->fCur);
@@ -88,7 +88,7 @@ inline BasicKString<CharKind>& BasicKString<CharKind>::operator+=(const BasicKSt
}
template <typename CharKind>
-inline BasicKString<CharKind>& BasicKString<CharKind>::operator+=(const CharKind* rhs) {
+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));
@@ -96,13 +96,13 @@ inline BasicKString<CharKind>& BasicKString<CharKind>::operator+=(const CharKind
}
template <typename CharKind>
-inline ErrorOr<BasicKString<CharKind>> KStringBuilder::Construct(const CharKind* data) {
- if (!data || *data == 0) return ErrorOr<BasicKString<CharKind>>(nullptr);
+inline ErrorOr<KBasicString<CharKind>> KStringBuilder::Construct(const CharKind* data) {
+ if (!data || *data == 0) return ErrorOr<KBasicString<CharKind>>(nullptr);
- BasicKString<CharKind>* view = new BasicKString<CharKind>(ort_string_len<CharKind>(data));
+ KBasicString<CharKind>* view = new KBasicString<CharKind>(ort_string_len<CharKind>(data));
(*view) += data;
- return ErrorOr<BasicKString<CharKind>>(*view);
+ return ErrorOr<KBasicString<CharKind>>(*view);
}
template <typename CharKind>
inline const CharKind* KStringBuilder::FromBool(const CharKind* fmt, bool i) {
diff --git a/dev/kernel/NeKit/Ref.h b/dev/kernel/NeKit/Ref.h
index 6f7eca21..566f7486 100644
--- a/dev/kernel/NeKit/Ref.h
+++ b/dev/kernel/NeKit/Ref.h
@@ -65,6 +65,9 @@ class NonNullRef final {
private:
Ref<T> fRef{};
};
+
+using RefAny = Ref<Any>;
+using NonNullRefAny = NonNullRef<Any>;
} // namespace Kernel
#endif // ifndef _NEKIT_REF_H_
diff --git a/dev/kernel/NeKit/Variant.h b/dev/kernel/NeKit/Variant.h
index 51548272..700c9d9a 100644
--- a/dev/kernel/NeKit/Variant.h
+++ b/dev/kernel/NeKit/Variant.h
@@ -33,9 +33,10 @@ class Variant final {
~Variant() = default;
public:
- explicit Variant(KString* stringView) : fPtr((VoidPtr) stringView), fKind(VariantKind::kString) {}
+ template <typename CharKind>
+ explicit Variant(KBasicString<CharKind>* stringView) : fPtr((VoidPtr) stringView), fKind(VariantKind::kString) {}
- explicit Variant(Json* json) : fPtr((VoidPtr) json), fKind(VariantKind::kJson) {}
+ explicit Variant(JsonObject* json) : fPtr((VoidPtr) json), fKind(VariantKind::kJson) {}
explicit Variant(nullPtr ptr) : fPtr(ptr), fKind(VariantKind::kNull) {}
@@ -55,7 +56,7 @@ class Variant final {
VariantKind& Kind();
private:
- voidPtr fPtr{nullptr};
+ VoidPtr fPtr{nullptr};
VariantKind fKind{VariantKind::kNull};
};
} // namespace Kernel
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-13 16:50:28 +0000