[IMP]

- IsUndefined returns const bool& now.
- Replace kUndefined with kNull now.
- Remove ML_ from macros in newstd.hxx.
- Rename NSyscall to NSyscallInterface, which is a ref counted class now.
- Rename MBCIType to PowerID
- Update ToDos.
- Update NewFS root catalog name.
- Fix JSON 'null' initialization.
- Add Json to variant object.
- Replace kPointer with kBlob in variant kinds.
- Add Leak() method to variant.

Signed-off-by: Amlal <amlal@zka.com>

4 files changed, 14 insertions, 10 deletions

diff --git a/Kernel/Sources/FS/NewFS.cxx b/Kernel/Sources/FS/NewFS.cxx
index 85926ff9..f796dd97 100644
--- a/Kernel/Sources/FS/NewFS.cxx
+++ b/Kernel/Sources/FS/NewFS.cxx
@@ -39,8 +39,8 @@ Kernel::SizeT drv_std_get_drv_size();
 /***********************************************************************************/
 /// This file implements the New File System.
 ///	New File System implements a B-Tree based algortihm.
-///		C:\\
-///	\\Path1\\		/\\ath2\\
+///		\\
+///	\\Path1\\		\\ath2\\
 /// \\readme.rtf		\\ListContents.pef \\readme.lnk <-- symlink.
 ///								\\Path1\\readme.rtf
 /***********************************************************************************/
diff --git a/Kernel/Sources/Json.cxx b/Kernel/Sources/Json.cxx
index 6ecd8e47..ffec19ce 100644
--- a/Kernel/Sources/Json.cxx
+++ b/Kernel/Sources/Json.cxx
@@ -9,4 +9,4 @@
 using namespace Kernel;
 
 /// @brief Undefined object, is null in length.
-cInitObject(Kernel::JsonType::kUndefined, Kernel::JsonType);
+cInitObject(Kernel::JsonType::kNull, Kernel::JsonType);
diff --git a/Kernel/Sources/Main.cxx b/Kernel/Sources/Main.cxx
index 8c80d70c..c30b26e6 100644
--- a/Kernel/Sources/Main.cxx
+++ b/Kernel/Sources/Main.cxx
@@ -58,8 +58,8 @@ namespace Kernel::Detail
 					constexpr auto cFolderInfo		  = "META-INF";
 					const auto	   cDirCount		  = 9;
 					const char*	   cDirStr[cDirCount] = {
-						   "C:\\Boot\\", "C:\\System\\", "C:\\Support\\", "C:\\Applications\\",
-						   "C:\\Users\\", "C:\\Library\\", "C:\\Mount\\", "C:\\DCIM\\", "C:\\Storage\\"};
+						   "\\Boot\\", "\\System\\", "\\Support\\", "\\Applications\\",
+						   "\\Users\\", "\\Library\\", "\\Mount\\", "\\DCIM\\", "\\Storage\\"};
 
 					for (Kernel::SizeT dirIndx = 0UL; dirIndx < cDirCount; ++dirIndx)
 					{
@@ -119,7 +119,7 @@ namespace Kernel::Detail
 				}
 
 				NewCatalog* catalogDisk =
-					this->fNewFS->GetParser()->GetCatalog("C:\\Mount\\SIM:");
+					this->fNewFS->GetParser()->GetCatalog("\\Mount\\SIM:");
 
 				const Kernel::Char* cSrcName = "DISK-INF";
 
@@ -130,7 +130,7 @@ namespace Kernel::Detail
 				else
 				{
 					catalogDisk =
-						(NewCatalog*)this->Leak()->CreateAlias("C:\\Mount\\SIM:");
+						(NewCatalog*)this->Leak()->CreateAlias("\\Mount\\SIM:");
 
 					Kernel::StringView diskFolder(kNewFSSectorSz);
 
diff --git a/Kernel/Sources/Variant.cxx b/Kernel/Sources/Variant.cxx
index 9788f18c..7dc71df5 100644
--- a/Kernel/Sources/Variant.cxx
+++ b/Kernel/Sources/Variant.cxx
@@ -12,13 +12,17 @@ namespace Kernel
 	{
 		switch (fKind)
 		{
+		case VariantKind::kJson:
+			return ("Class:{Json}");
 		case VariantKind::kString:
 			return ("Class:{String}");
-		case VariantKind::kPointer:
-			return ("Class:{Pointer}");
+		case VariantKind::kBlob:
+			return ("Class:{Blob}");
 		default:
-			return ("Class:{Undefined}");
+			return ("Class:{Null}");
 		}
 	}
 
+	/// @brief Leak variant's instance.
+	VoidPtr Variant::Leak() { return fPtr; }
 } // namespace Kernel