summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/boot/BootKit/Qr.h4
-rw-r--r--src/kernel/NeKit/ArrayList.h2
-rw-r--r--src/kernel/NeKit/ErrorOr.h7
-rw-r--r--src/kernel/NeKit/KString.h20
-rw-r--r--src/kernel/NeKit/KString.inl51
-rw-r--r--src/kernel/NeKit/KernelPanic.h12
-rw-r--r--src/kernel/NeKit/OwnPtr.h2
-rw-r--r--src/kernel/SignalKit/Signals.h2
8 files changed, 50 insertions, 50 deletions
diff --git a/src/boot/BootKit/Qr.h b/src/boot/BootKit/Qr.h
index ab4696cc..a07e03c9 100644
--- a/src/boot/BootKit/Qr.h
+++ b/src/boot/BootKit/Qr.h
@@ -1,12 +1,12 @@
#ifndef QR_H
#define QR_H
+#include <BootKit/QrPrelude.h>
#include <BootKit/Shared/base.h>
#include <BootKit/Shared/bit.h>
-#include <NeKit/KernelPanic.h>
-#include <BootKit/QrPrelude.h>
#include <BootKit/Support.h>
#include <CompilerKit/Detail.h>
+#include <NeKit/KernelPanic.h>
#include <modules/CoreGfx/CoreGfx.h>
/// @note the QR code is still code 128, it utilizes the same concept of having it's own character
diff --git a/src/kernel/NeKit/ArrayList.h b/src/kernel/NeKit/ArrayList.h
index d3225a50..5787fe98 100644
--- a/src/kernel/NeKit/ArrayList.h
+++ b/src/kernel/NeKit/ArrayList.h
@@ -28,7 +28,7 @@ class ArrayList final {
return fList[index];
}
- operator bool() { return fList; }
+ explicit operator bool() { return fList; }
SizeT Count() const { return fLen; }
diff --git a/src/kernel/NeKit/ErrorOr.h b/src/kernel/NeKit/ErrorOr.h
index f0740488..7de7434d 100644
--- a/src/kernel/NeKit/ErrorOr.h
+++ b/src/kernel/NeKit/ErrorOr.h
@@ -26,12 +26,9 @@ class ErrorOr final {
public:
explicit ErrorOr(ErrorT err) : mRef((T*) RTL_ALLOCA(sizeof(T))), mId(err) {}
-
explicit ErrorOr(nullPtr) {}
-
- explicit ErrorOr(T* Class) : mRef(Class) {}
-
- explicit ErrorOr(T Class) : mRef(Class) {}
+ explicit ErrorOr(T* klass) : mRef(klass) {}
+ explicit ErrorOr(T klass) : mRef(klass) {}
ErrorOr& operator=(const ErrorOr&) = default;
ErrorOr(const ErrorOr&) = default;
diff --git a/src/kernel/NeKit/KString.h b/src/kernel/NeKit/KString.h
index fa0ebcbf..a27084cb 100644
--- a/src/kernel/NeKit/KString.h
+++ b/src/kernel/NeKit/KString.h
@@ -13,14 +13,14 @@
#include <NeKit/Utils.h>
namespace Kernel {
-inline auto kMinimumStringSize = 8196;
+inline constexpr Int kMinimumStringSize = 8196;
/// @brief Kernel string class, not dynamic.
-template <typename CharKind = Char>
+template <typename CharKind = Char, Int MinSz = kMinimumStringSize>
class KBasicString final {
public:
explicit KBasicString() {
- fDataSz = kMinimumStringSize;
+ fDataSz = MinSz;
fData = new CharKind[fDataSz];
MUST_PASS(fData);
@@ -53,15 +53,15 @@ class KBasicString final {
bool operator==(const CharKind* rhs) const;
bool operator!=(const CharKind* rhs) const;
- bool operator==(const KBasicString<CharKind>& rhs) const;
- bool operator!=(const KBasicString<CharKind>& rhs) const;
+ bool operator==(const KBasicString<CharKind, MinSz>& rhs) const;
+ bool operator!=(const KBasicString<CharKind, MinSz>& rhs) const;
- KBasicString<CharKind>& operator+=(const CharKind* rhs);
- KBasicString<CharKind>& operator+=(const KBasicString<CharKind>& rhs);
+ KBasicString<CharKind, MinSz>& operator+=(const CharKind* rhs);
+ KBasicString<CharKind, MinSz>& operator+=(const KBasicString<CharKind, MinSz>& rhs);
operator const char*() { return fData; }
- operator bool() { return fData; }
+ explicit operator bool() { return fData; }
bool operator!() { return fData; }
@@ -78,8 +78,8 @@ using KStringOr = ErrorOr<KString>;
class KStringBuilder final {
public:
- template <typename CharKind = Char>
- static ErrorOr<KBasicString<CharKind>> Construct(const CharKind* data);
+ template <typename CharKind = Char, Int MinSz = kMinimumStringSize>
+ static ErrorOr<KBasicString<CharKind, MinSz>> Construct(const CharKind* data);
template <typename CharKind = Char>
static const CharKind* FromBool(const CharKind* fmt, bool n);
template <typename CharKind = Char>
diff --git a/src/kernel/NeKit/KString.inl b/src/kernel/NeKit/KString.inl
index 3a73e90f..70380ebe 100644
--- a/src/kernel/NeKit/KString.inl
+++ b/src/kernel/NeKit/KString.inl
@@ -18,23 +18,24 @@ inline void ort_string_append(CharKind* lhs, const CharKind* rhs, Int32 cur) {
}
}
-template <typename CharKind>
-inline CharKind* KBasicString<CharKind>::Data() {
+template <typename CharKind, Int MinSz>
+inline CharKind* KBasicString<CharKind, MinSz>::Data() {
return this->fData;
}
-template <typename CharKind>
-inline const CharKind* KBasicString<CharKind>::CData() const {
+template <typename CharKind, Int MinSz>
+inline const CharKind* KBasicString<CharKind, MinSz>::CData() const {
return const_cast<const CharKind*>(this->fData);
}
-template <typename CharKind>
-inline SizeT KBasicString<CharKind>::Length() const {
+template <typename CharKind, Int MinSz>
+inline SizeT KBasicString<CharKind, MinSz>::Length() const {
return this->fDataSz;
}
-template <typename CharKind>
-inline bool KBasicString<CharKind>::operator==(const KBasicString<CharKind>& rhs) const {
+template <typename CharKind, Int MinSz>
+inline bool KBasicString<CharKind, MinSz>::operator==(
+ const KBasicString<CharKind, MinSz>& rhs) const {
if (rhs.Length() != this->Length()) return false;
for (Size index = 0; index < this->Length(); ++index) {
@@ -44,8 +45,8 @@ inline bool KBasicString<CharKind>::operator==(const KBasicString<CharKind>& rhs
return true;
}
-template <typename CharKind>
-inline bool KBasicString<CharKind>::operator==(const CharKind* rhs) const {
+template <typename CharKind, Int MinSz>
+inline bool KBasicString<CharKind, MinSz>::operator==(const CharKind* rhs) const {
if (oe_string_len<CharKind>(rhs) != this->Length()) return false;
for (Size index = 0; index < oe_string_len<CharKind>(rhs); ++index) {
@@ -55,8 +56,9 @@ inline bool KBasicString<CharKind>::operator==(const CharKind* rhs) const {
return true;
}
-template <typename CharKind>
-inline bool KBasicString<CharKind>::operator!=(const KBasicString<CharKind>& rhs) const {
+template <typename CharKind, Int MinSz>
+inline bool KBasicString<CharKind, MinSz>::operator!=(
+ const KBasicString<CharKind, MinSz>& rhs) const {
if (rhs.Length() != this->Length()) return false;
for (Size index = 0; index < rhs.Length(); ++index) {
@@ -66,8 +68,8 @@ inline bool KBasicString<CharKind>::operator!=(const KBasicString<CharKind>& rhs
return true;
}
-template <typename CharKind>
-inline bool KBasicString<CharKind>::operator!=(const CharKind* rhs) const {
+template <typename CharKind, Int MinSz>
+inline bool KBasicString<CharKind, MinSz>::operator!=(const CharKind* rhs) const {
if (oe_string_len<CharKind>(rhs) != this->Length()) return false;
for (Size index = 0; index < oe_string_len<CharKind>(rhs); ++index) {
@@ -77,9 +79,9 @@ inline bool KBasicString<CharKind>::operator!=(const CharKind* rhs) const {
return true;
}
-template <typename CharKind>
-inline KBasicString<CharKind>& KBasicString<CharKind>::operator+=(
- const KBasicString<CharKind>& rhs) {
+template <typename CharKind, Int MinSz>
+inline KBasicString<CharKind, MinSz>& KBasicString<CharKind, MinSz>::operator+=(
+ const KBasicString<CharKind, MinSz>& rhs) {
if (oe_string_len<CharKind>(rhs.fData) > this->Length()) return *this;
ort_string_append(this->fData, const_cast<CharKind*>(rhs.fData), this->fCur);
@@ -88,22 +90,23 @@ inline KBasicString<CharKind>& KBasicString<CharKind>::operator+=(
return *this;
}
-template <typename CharKind>
-inline KBasicString<CharKind>& KBasicString<CharKind>::operator+=(const CharKind* rhs) {
+template <typename CharKind, Int MinSz>
+inline KBasicString<CharKind, MinSz>& KBasicString<CharKind, MinSz>::operator+=(
+ const CharKind* rhs) {
ort_string_append(this->fData, const_cast<CharKind*>(rhs), this->fCur);
this->fCur += oe_string_len<CharKind>(const_cast<CharKind*>(rhs));
return *this;
}
-template <typename CharKind>
-inline ErrorOr<KBasicString<CharKind>> KStringBuilder::Construct(const CharKind* data) {
- if (!data || *data == 0) return ErrorOr<KBasicString<CharKind>>(nullptr);
+template <typename CharKind, Int MinSz>
+inline ErrorOr<KBasicString<CharKind, MinSz>> KStringBuilder::Construct(const CharKind* data) {
+ if (!data || *data == 0) return ErrorOr<KBasicString<CharKind, MinSz>>(-kErrorInvalidData);
- KBasicString<CharKind>* view = new KBasicString<CharKind>(oe_string_len<CharKind>(data));
+ KBasicString<CharKind>* view = new KBasicString<CharKind, MinSz>(oe_string_len<CharKind>(data));
(*view) += data;
- return ErrorOr<KBasicString<CharKind>>(*view);
+ return ErrorOr<KBasicString<CharKind, MinSz>>(*view);
}
template <typename CharKind>
inline const CharKind* KStringBuilder::FromBool(const CharKind* fmt, bool i) {
diff --git a/src/kernel/NeKit/KernelPanic.h b/src/kernel/NeKit/KernelPanic.h
index a12ff73c..27cbbb6b 100644
--- a/src/kernel/NeKit/KernelPanic.h
+++ b/src/kernel/NeKit/KernelPanic.h
@@ -16,12 +16,12 @@
#undef TRY
#endif
-#define TRY(X) \
- { \
- auto fn = X; \
- if ((fn()) == NO) { \
- MUST_PASS(NO); \
- } \
+#define TRY(X) \
+ { \
+ auto FN__ = X; \
+ if ((FN__()) == NO) { \
+ MUST_PASS(NO); \
+ } \
}
#ifdef __MUST_PASS
diff --git a/src/kernel/NeKit/OwnPtr.h b/src/kernel/NeKit/OwnPtr.h
index 18a31bd1..d67236b9 100644
--- a/src/kernel/NeKit/OwnPtr.h
+++ b/src/kernel/NeKit/OwnPtr.h
@@ -8,9 +8,9 @@
#pragma once
#include <NeKit/Config.h>
+#include <NeKit/ErrorOr.h>
#include <NeKit/KernelPanic.h>
#include <NeKit/Ref.h>
-#include <NeKit/ErrorOr.h>
namespace Kernel {
template <typename T>
diff --git a/src/kernel/SignalKit/Signals.h b/src/kernel/SignalKit/Signals.h
index 700a4f41..4369d5a0 100644
--- a/src/kernel/SignalKit/Signals.h
+++ b/src/kernel/SignalKit/Signals.h
@@ -9,7 +9,7 @@
#include <NeKit/Config.h>
#include <NeKit/KernelPanic.h>
-#define SIGBAD 0 /* bad signal*/
+#define SIGBAD 0 /* bad signal*/
#define SIGKILL 1 /* kill */
#define SIGPAUS 2 /* pause */
#define SIGEXEC 3 /* execute */
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-12 23:23:59 +0000