diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-10-11 07:18:04 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-10-11 07:18:04 +0200 |
| commit | faf6a99a3dd3cbf4fbacc0392dc89555db42016e (patch) | |
| tree | 72713287e8c1f2349b01f3f836f0968bb856e19b /dev/zka/NewKit | |
| parent | bb074eb78074d9231c1f08ca8339937360b5ce8c (diff) | |
IMP: Drive Manager improvements and to the JSON C++ API.
Diffstat (limited to 'dev/zka/NewKit')
| -rw-r--r-- | dev/zka/NewKit/Json.hxx | 20 | ||||
| -rw-r--r-- | dev/zka/NewKit/Variant.hxx | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/dev/zka/NewKit/Json.hxx b/dev/zka/NewKit/Json.hxx index a5893147..614eb78e 100644 --- a/dev/zka/NewKit/Json.hxx +++ b/dev/zka/NewKit/Json.hxx @@ -22,10 +22,10 @@ namespace Kernel { /// @brief Json class - class JsonType final + class JSON final { public: - explicit JsonType() + explicit JSON() { auto len = cJSONLen; StringView key = StringView(len); @@ -35,14 +35,14 @@ namespace Kernel this->AsValue() = key; } - explicit JsonType(SizeT lhsLen, SizeT rhsLen) + explicit JSON(SizeT lhsLen, SizeT rhsLen) : fKey(lhsLen), fValue(rhsLen) { } - ~JsonType() = default; + ~JSON() = default; - ZKA_COPY_DEFAULT(JsonType); + ZKA_COPY_DEFAULT(JSON); const Bool& IsUndefined() { @@ -69,13 +69,13 @@ namespace Kernel return fValue; } - static JsonType kNull; + static JSON kNull; }; /// @brief Json stream reader helper. struct JsonStreamReader final { - STATIC JsonType In(const Char* full_array) + STATIC JSON In(const Char* full_array) { auto start_val = '{'; auto end_val = '}'; @@ -84,7 +84,7 @@ namespace Kernel if (full_array[0] != start_val) { if (full_array[0] != '[') - return JsonType::kNull; + return JSON::kNull; start_val = '['; end_val = ']'; @@ -97,7 +97,7 @@ namespace Kernel SizeT key_len = 0; SizeT value_len = 0; - JsonType type(cMaxJsonPath, cMaxJsonPath); + JSON type(cMaxJsonPath, cMaxJsonPath); for (SizeT i = 1; i < len; ++i) { @@ -147,5 +147,5 @@ namespace Kernel } }; - using JsonStream = Stream<JsonStreamReader, JsonType>; + using JsonStream = Stream<JsonStreamReader, JSON>; } // namespace Kernel diff --git a/dev/zka/NewKit/Variant.hxx b/dev/zka/NewKit/Variant.hxx index 6b0f30bd..f1fc3287 100644 --- a/dev/zka/NewKit/Variant.hxx +++ b/dev/zka/NewKit/Variant.hxx @@ -38,7 +38,7 @@ namespace Kernel { } - explicit Variant(JsonType* json) + explicit Variant(JSON* json) : fPtr((VoidPtr)json), fKind(VariantKind::kJson) { } |