RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 01:47:35 +00:00
Code Issues Activity Actions

Kernel: Absorb LibBareMetal back into the kernel

Browse source 
This was supposed to be the foundation for some kind of pre-kernel
environment, but nobody is working on it right now, so let's move
everything back into the kernel and remove all the confusion.
This commit is contained in:
Andreas Kling 2020-05-16 12:00:04 +02:00
parent c12cfdea87
commit 21d5f4ada1
75 changed files with 140 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

14
AK/JsonValue.h
View file

@ -43,7 +43,7 @@ public:
UnsignedInt32,
Int64,
UnsignedInt64,
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
#if !defined(KERNEL)
Double,
#endif
Bool,
@ -68,7 +68,7 @@ public:
JsonValue(i64);
JsonValue(u64);
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
#if !defined(KERNEL)
JsonValue(double);
#endif
JsonValue(bool);
@ -172,7 +172,7 @@ public:
return *m_value.as_array;
}
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
#if !defined(KERNEL)
double as_double() const
{
ASSERT(is_double());
@ -193,7 +193,7 @@ public:
bool is_u32() const { return m_type == Type::UnsignedInt32; }
bool is_i64() const { return m_type == Type::Int64; }
bool is_u64() const { return m_type == Type::UnsignedInt64; }
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
#if !defined(KERNEL)
bool is_double() const
{
return m_type == Type::Double;
@ -211,7 +211,7 @@ public:
case Type::UnsignedInt32:
case Type::Int64:
case Type::UnsignedInt64:
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
#if !defined(KERNEL)
case Type::Double:
#endif
return true;
@ -223,7 +223,7 @@ public:
template<typename T>
T to_number(T default_value = 0) const
{
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
#if !defined(KERNEL)
if (is_double())
return (T)as_double();
#endif
@ -250,7 +250,7 @@ private:
StringImpl* as_string { nullptr };
JsonArray* as_array;
JsonObject* as_object;
#if !defined(KERNEL) && !defined(BOOTSTRAPPER)
#if !defined(KERNEL)
double as_double;
#endif
i32 as_i32;