Merge pull request #1162 from Trial97/feature/Replace-toml-library

16 files changed, 227 insertions, 2993 deletions

diff --git a/.gitmodules b/.gitmodules
index 08b94c96..534ffd37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,9 @@
 [submodule "depends/libnbtplusplus"]
     path = libraries/libnbtplusplus
     url = https://github.com/PolyMC/libnbtplusplus.git
-    pushurl = git@github.com:PolyMC/libnbtplusplus.git
-
 [submodule "libraries/quazip"]
 	path = libraries/quazip
 	url = https://github.com/stachenov/quazip.git
+[submodule "libraries/tomlplusplus"]
+	path = libraries/tomlplusplus
+	url = https://github.com/marzer/tomlplusplus.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7100ab1b..46192414 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,6 +192,11 @@ if (Qt5_POSITION_INDEPENDENT_CODE)
     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
+# Find toml++
+if(NOT Launcher_FORCE_BUNDLED_LIBS)
+    find_package(tomlplusplus 3.2.0 QUIET)
+endif()
+
 ####################################### Program Info #######################################
 
 set(Launcher_APP_BINARY_NAME "polymc" CACHE STRING "Name of the Launcher binary")
@@ -312,7 +317,12 @@ endif()
 add_subdirectory(libraries/rainbow) # Qt extension for colors
 add_subdirectory(libraries/LocalPeer) # fork of a library from Qt solutions
 add_subdirectory(libraries/classparser) # class parser library
-add_subdirectory(libraries/tomlc99) # toml parser
+if(NOT tomlplusplus_FOUND)
+    message(STATUS "Using bundled tomlplusplus")
+    add_subdirectory(libraries/tomlplusplus) # toml parser
+else()
+    message(STATUS "Using system tomlplusplus")
+endif()
 add_subdirectory(libraries/katabasis) # An OAuth2 library that tried to do too much
 add_subdirectory(libraries/gamemode)
 add_subdirectory(libraries/murmur2) # Hash for usage with the CurseForge API
diff --git a/COPYING.md b/COPYING.md
index c94c51c3..11c1fc3a 100644
--- a/COPYING.md
+++ b/COPYING.md
@@ -315,30 +315,24 @@
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
 
-## tomlc99
+## tomlplusplus
 
     MIT License
 
-    Copyright (c) 2017 CK Tan
-    https://github.com/cktan/tomlc99
+    Copyright (c) Mark Gillard <mark.gillard@outlook.com.au>
 
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+    documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+    Software.
 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+    WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## O2 (Katabasis fork)
 
diff --git a/flake.lock b/flake.lock
index bfc9ac6d..a72286bb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -52,7 +52,24 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "libnbtplusplus": "libnbtplusplus",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "tomlplusplus": "tomlplusplus"
+      }
+    },
+    "tomlplusplus": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1664034574,
+        "narHash": "sha256-EFMAl6tsTvkgK0DWC/pZfOIq06b2e5SnxJa1ngGRIQA=",
+        "owner": "marzer",
+        "repo": "tomlplusplus",
+        "rev": "8aa5c8b2a4ff2c440d4630addf64fa4f62146170",
+        "type": "github"
+      },
+      "original": {
+        "owner": "marzer",
+        "repo": "tomlplusplus",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 51bc1fda..93192725 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,9 +5,10 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
     libnbtplusplus = { url = "github:PolyMC/libnbtplusplus"; flake = false; };
+    tomlplusplus = { url = "github:marzer/tomlplusplus"; flake = false; };
   };
 
-  outputs = { self, nixpkgs, libnbtplusplus, ... }:
+  outputs = { self, nixpkgs, libnbtplusplus, tomlplusplus, ... }:
     let
       # User-friendly version number.
       version = builtins.substring 0 8 self.lastModifiedDate;
@@ -22,8 +23,8 @@
       pkgs = forAllSystems (system: nixpkgs.legacyPackages.${system});
 
       packagesFn = pkgs: rec {
-        polymc = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus; };
-        polymc-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus; };
+        polymc = pkgs.libsForQt5.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; };
+        polymc-qt6 = pkgs.qt6Packages.callPackage ./nix { inherit version self libnbtplusplus tomlplusplus; };
       };
     in
     {
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 2ff700ad..0bdfcd44 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -973,7 +973,7 @@ target_link_libraries(Launcher_logic
     Launcher_murmur2
     nbt++
     ${ZLIB_LIBRARIES}
-    tomlc99
+    tomlplusplus::tomlplusplus
     BuildConfig
     Katabasis
     Qt${QT_VERSION_MAJOR}::Widgets
diff --git a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
index 8a6e54d8..a694e7b2 100644
--- a/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
+++ b/launcher/minecraft/mod/tasks/LocalModParseTask.cpp
@@ -1,17 +1,17 @@
 #include "LocalModParseTask.h"
 
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
+#include <toml++/toml.h>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
 #include <QJsonValue>
 #include <QString>
-#include <quazip/quazip.h>
-#include <quazip/quazipfile.h>
-#include <toml.h>
 
+#include "FileSystem.h"
 #include "Json.h"
 #include "settings/INIFile.h"
-#include "FileSystem.h"
 
 namespace {
 
@@ -22,8 +22,7 @@ namespace {
 // https://github.com/MinecraftForge/FML/wiki/FML-mod-information-file/5bf6a2d05145ec79387acc0d45c958642fb049fc
 ModDetails ReadMCModInfo(QByteArray contents)
 {
-    auto getInfoFromArray = [&](QJsonArray arr) -> ModDetails
-    {
+    auto getInfoFromArray = [&](QJsonArray arr) -> ModDetails {
         if (!arr.at(0).isObject()) {
             return {};
         }
@@ -32,16 +31,14 @@ ModDetails ReadMCModInfo(QByteArray contents)
         details.mod_id = firstObj.value("modid").toString();
         auto name = firstObj.value("name").toString();
         // NOTE: ignore stupid example mods copies where the author didn't even bother to change the name
-        if(name != "Example Mod") {
+        if (name != "Example Mod") {
             details.name = name;
         }
         details.version = firstObj.value("version").toString();
         auto homeurl = firstObj.value("url").toString().trimmed();
-        if(!homeurl.isEmpty())
-        {
+        if (!homeurl.isEmpty()) {
             // fix up url.
-            if (!homeurl.startsWith("http://") && !homeurl.startsWith("https://") && !homeurl.startsWith("ftp://"))
-            {
+            if (!homeurl.startsWith("http://") && !homeurl.startsWith("https://") && !homeurl.startsWith("ftp://")) {
                 homeurl.prepend("http://");
             }
         }
@@ -53,8 +50,7 @@ ModDetails ReadMCModInfo(QByteArray contents)
             authors = firstObj.value("authors").toArray();
         }
 
-        for (auto author: authors)
-        {
+        for (auto author : authors) {
             details.authors.append(author.toString());
         }
         return details;
@@ -62,14 +58,11 @@ ModDetails ReadMCModInfo(QByteArray contents)
     QJsonParseError jsonError;
     QJsonDocument jsonDoc = QJsonDocument::fromJson(contents, &jsonError);
     // this is the very old format that had just the array
-    if (jsonDoc.isArray())
-    {
+    if (jsonDoc.isArray()) {
         return getInfoFromArray(jsonDoc.array());
-    }
-    else if (jsonDoc.isObject())
-    {
+    } else if (jsonDoc.isObject()) {
         auto val = jsonDoc.object().value("modinfoversion");
-        if(val.isUndefined()) {
+        if (val.isUndefined()) {
             val = jsonDoc.object().value("modListVersion");
         }
 
@@ -79,18 +72,16 @@ ModDetails ReadMCModInfo(QByteArray contents)
         if (version < 0)
             version = Json::ensureString(val, "").toInt();
 
-        if (version != 2)
-        {
+        if (version != 2) {
             qCritical() << "BAD stuff happened to mod json:";
             qCritical() << contents;
             return {};
         }
         auto arrVal = jsonDoc.object().value("modlist");
-        if(arrVal.isUndefined()) {
+        if (arrVal.isUndefined()) {
             arrVal = jsonDoc.object().value("modList");
         }
-        if (arrVal.isArray())
-        {
+        if (arrVal.isArray()) {
             return getInfoFromArray(arrVal.toArray());
         }
     }
@@ -102,109 +93,76 @@ ModDetails ReadMCModTOML(QByteArray contents)
 {
     ModDetails details;
 
-    char errbuf[200];
-    // top-level table
-    toml_table_t* tomlData = toml_parse(contents.data(), errbuf, sizeof(errbuf));
-
-    if(!tomlData)
-    {
+    toml::table tomlData;
+#if TOML_EXCEPTIONS
+    try {
+        tomlData = toml::parse(contents.toStdString());
+    } catch (const toml::parse_error& err) {
+        return {};
+    }
+#else
+    tomlData = toml::parse(contents.toStdString());
+    if (!tomlData) {
         return {};
     }
+#endif
 
     // array defined by [[mods]]
-    toml_array_t* tomlModsArr = toml_array_in(tomlData, "mods");
-    if(!tomlModsArr)
-    {
+    auto tomlModsArr = tomlData["mods"].as_array();
+    if (!tomlModsArr) {
         qWarning() << "Corrupted mods.toml? Couldn't find [[mods]] array!";
         return {};
     }
 
     // we only really care about the first element, since multiple mods in one file is not supported by us at the moment
-    toml_table_t* tomlModsTable0 = toml_table_at(tomlModsArr, 0);
-    if(!tomlModsTable0)
-    {
+    auto tomlModsTable0 = tomlModsArr->get(0);
+    if (!tomlModsTable0) {
         qWarning() << "Corrupted mods.toml? [[mods]] didn't have an element at index 0!";
         return {};
     }
+    auto modsTable = tomlModsTable0->as_table();
+    if (!tomlModsTable0) {
+        qWarning() << "Corrupted mods.toml? [[mods]] was not a table!";
+        return {};
+    }
 
     // mandatory properties - always in [[mods]]
-    toml_datum_t modIdDatum = toml_string_in(tomlModsTable0, "modId");
-    if(modIdDatum.ok)
-    {
-        details.mod_id = modIdDatum.u.s;
-        // library says this is required for strings
-        free(modIdDatum.u.s);
+    if (auto modIdDatum = (*modsTable)["modId"].as_string()) {
+        details.mod_id = QString::fromStdString(modIdDatum->get());
     }
-    toml_datum_t versionDatum = toml_string_in(tomlModsTable0, "version");
-    if(versionDatum.ok)
-    {
-        details.version = versionDatum.u.s;
-        free(versionDatum.u.s);
+    if (auto versionDatum = (*modsTable)["version"].as_string()) {
+        details.version = QString::fromStdString(versionDatum->get());
     }
-    toml_datum_t displayNameDatum = toml_string_in(tomlModsTable0, "displayName");
-    if(displayNameDatum.ok)
-    {
-        details.name = displayNameDatum.u.s;
-        free(displayNameDatum.u.s);
+    if (auto displayNameDatum = (*modsTable)["displayName"].as_string()) {
+        details.name = QString::fromStdString(displayNameDatum->get());
     }
-    toml_datum_t descriptionDatum = toml_string_in(tomlModsTable0, "description");
-    if(descriptionDatum.ok)
-    {
-        details.description = descriptionDatum.u.s;
-        free(descriptionDatum.u.s);
+    if (auto descriptionDatum = (*modsTable)["description"].as_string()) {
+        details.description = QString::fromStdString(descriptionDatum->get());
     }
 
     // optional properties - can be in the root table or [[mods]]
-    toml_datum_t authorsDatum = toml_string_in(tomlData, "authors");
     QString authors = "";
-    if(authorsDatum.ok)
-    {
-        authors = authorsDatum.u.s;
-        free(authorsDatum.u.s);
-    }
-    else
-    {
-        authorsDatum = toml_string_in(tomlModsTable0, "authors");
-        if(authorsDatum.ok)
-        {
-            authors = authorsDatum.u.s;
-            free(authorsDatum.u.s);
-        }
+    if (auto authorsDatum = tomlData["authors"].as_string()) {
+        authors = QString::fromStdString(authorsDatum->get());
+    } else if (auto authorsDatum = (*modsTable)["authors"].as_string()) {
+        authors = QString::fromStdString(authorsDatum->get());
     }
-    if(!authors.isEmpty())
-    {
+    if (!authors.isEmpty()) {
         details.authors.append(authors);
     }
 
-    toml_datum_t homeurlDatum = toml_string_in(tomlData, "displayURL");
     QString homeurl = "";
-    if(homeurlDatum.ok)
-    {
-        homeurl = homeurlDatum.u.s;
-        free(homeurlDatum.u.s);
-    }
-    else
-    {
-        homeurlDatum = toml_string_in(tomlModsTable0, "displayURL");
-        if(homeurlDatum.ok)
-        {
-            homeurl = homeurlDatum.u.s;
-            free(homeurlDatum.u.s);
-        }
+    if (auto homeurlDatum = tomlData["displayURL"].as_string()) {
+        homeurl = QString::fromStdString(homeurlDatum->get());
+    } else if (auto homeurlDatum = (*modsTable)["displayURL"].as_string()) {
+        homeurl = QString::fromStdString(homeurlDatum->get());
     }
-    if(!homeurl.isEmpty())
-    {
-        // fix up url.
-        if (!homeurl.startsWith("http://") && !homeurl.startsWith("https://") && !homeurl.startsWith("ftp://"))
-        {
-            homeurl.prepend("http://");
-        }
+    // fix up url.
+    if (!homeurl.isEmpty() && !homeurl.startsWith("http://") && !homeurl.startsWith("https://") && !homeurl.startsWith("ftp://")) {
+        homeurl.prepend("http://");
     }
     details.homeurl = homeurl;
 
-    // this seems to be recursive, so it should free everything
-    toml_free(tomlData);
-
     return details;
 }
 
@@ -224,25 +182,20 @@ ModDetails ReadFabricModInfo(QByteArray contents)
     details.name = object.contains("name") ? object.value("name").toString() : details.mod_id;
     details.description = object.value("description").toString();
 
-    if (schemaVersion >= 1)
-    {
+    if (schemaVersion >= 1) {
         QJsonArray authors = object.value("authors").toArray();
-        for (auto author: authors)
-        {
-            if(author.isObject()) {
+        for (auto author : authors) {
+            if (author.isObject()) {
                 details.authors.append(author.toObject().value("name").toString());
-            }
-            else {
+            } else {
                 details.authors.append(author.toString());
             }
         }
 
-        if (object.contains("contact"))
-        {
+        if (object.contains("contact")) {
             QJsonObject contact = object.value("contact").toObject();
 
-            if (contact.contains("homepage"))
-            {
+            if (contact.contains("homepage")) {
                 details.homeurl = contact.value("homepage").toString();
             }
         }
@@ -261,8 +214,7 @@ ModDetails ReadQuiltModInfo(QByteArray contents)
     ModDetails details;
 
     // https://github.com/QuiltMC/rfcs/blob/be6ba280d785395fefa90a43db48e5bfc1d15eb4/specification/0002-quilt.mod.json.md
-    if (schemaVersion == 1)
-    {
+    if (schemaVersion == 1) {
         auto modInfo = Json::requireObject(object.value("quilt_loader"), "Quilt mod info");
 
         details.mod_id = Json::requireString(modInfo.value("id"), "Mod ID");
@@ -280,8 +232,7 @@ ModDetails ReadQuiltModInfo(QByteArray contents)
 
         auto modContact = Json::ensureObject(modMetadata.value("contact"));
 
-        if (modContact.contains("homepage"))
-        {
+        if (modContact.contains("homepage")) {
             details.homeurl = Json::requireString(modContact.value("homepage"));
         }
     }
@@ -314,21 +265,17 @@ ModDetails ReadLiteModInfo(QByteArray contents)
     QJsonParseError jsonError;
     QJsonDocument jsonDoc = QJsonDocument::fromJson(contents, &jsonError);
     auto object = jsonDoc.object();
-    if (object.contains("name"))
-    {
+    if (object.contains("name")) {
         details.mod_id = details.name = object.value("name").toString();
     }
-    if (object.contains("version"))
-    {
+    if (object.contains("version")) {
         details.version = object.value("version").toString("");
-    }
-    else
-    {
+    } else {
         details.version = object.value("revision").toString("");
     }
     details.mcversion = object.value("mcversion").toString();
     auto author = object.value("author").toString();
-    if(!author.isEmpty()) {
+    if (!author.isEmpty()) {
         details.authors.append(author);
     }
     details.description = object.value("description").toString();
@@ -336,14 +283,10 @@ ModDetails ReadLiteModInfo(QByteArray contents)
     return details;
 }
 
-}
+}  // namespace
 
-LocalModParseTask::LocalModParseTask(int token, ResourceType type, const QFileInfo& modFile):
-    Task(nullptr, false),
-    m_token(token),
-    m_type(type),
-    m_modFile(modFile),
-    m_result(new Result())
+LocalModParseTask::LocalModParseTask(int token, ResourceType type, const QFileInfo& modFile)
+    : Task(nullptr, false), m_token(token), m_type(type), m_modFile(modFile), m_result(new Result())
 {}
 
 void LocalModParseTask::processAsZip()
@@ -354,10 +297,8 @@ void LocalModParseTask::processAsZip()
 
     QuaZipFile file(&zip);
 
-    if (zip.setCurrentFile("META-INF/mods.toml"))
-    {
-        if (!file.open(QIODevice::ReadOnly))
-        {
+    if (zip.setCurrentFile("META-INF/mods.toml")) {
+        if (!file.open(QIODevice::ReadOnly)) {
             zip.close();
             return;
         }
@@ -366,12 +307,9 @@ void LocalModParseTask::processAsZip()
         file.close();
 
         // to replace ${file.jarVersion} with the actual version, as needed
-        if (m_result->details.version == "${file.jarVersion}")
-        {
-            if (zip.setCurrentFile("META-INF/MANIFEST.MF"))
-            {
-                if (!file.open(QIODevice::ReadOnly))
-                {
+        if (m_result->details.version == "${file.jarVersion}") {
+            if (zip.setCurrentFile("META-INF/MANIFEST.MF")) {
+                if (!file.open(QIODevice::ReadOnly)) {
                     zip.close();
                     return;
                 }
@@ -379,10 +317,8 @@ void LocalModParseTask::processAsZip()
                 // quick and dirty line-by-line parser
                 auto manifestLines = file.readAll().split('\n');
                 QString manifestVersion = "";
-                for (auto &line : manifestLines)
-                {
-                    if (QString(line).startsWith("Implementation-Version: "))
-                    {
+                for (auto& line : manifestLines) {
+                    if (QString(line).startsWith("Implementation-Version: ")) {
                         manifestVersion = QString(line).remove("Implementation-Version: ");
                         break;
                     }
@@ -390,8 +326,7 @@ void LocalModParseTask::processAsZip()
 
                 // some mods use ${projectversion} in their build.gradle, causing this mess to show up in MANIFEST.MF
                 // also keep with forge's behavior of setting the version to "NONE" if none is found
-                if (manifestVersion.contains("task ':jar' property 'archiveVersion'") || manifestVersion == "")
-                {
+                if (manifestVersion.contains("task ':jar' property 'archiveVersion'") || manifestVersion == "") {
                     manifestVersion = "NONE";
                 }
 
@@ -403,11 +338,8 @@ void LocalModParseTask::processAsZip()
 
         zip.close();
         return;
-    }
-    else if (zip.setCurrentFile("mcmod.info"))
-    {
-        if (!file.open(QIODevice::ReadOnly))
-        {
+    } else if (zip.setCurrentFile("mcmod.info")) {
+        if (!file.open(QIODevice::ReadOnly)) {
             zip.close();
             return;
         }
@@ -416,11 +348,8 @@ void LocalModParseTask::processAsZip()
         file.close();
         zip.close();
         return;
-    }
-    else if (zip.setCurrentFile("quilt.mod.json"))
-    {
-        if (!file.open(QIODevice::ReadOnly))
-        {
+    } else if (zip.setCurrentFile("quilt.mod.json")) {
+        if (!file.open(QIODevice::ReadOnly)) {
             zip.close();
             return;
         }
@@ -429,11 +358,8 @@ void LocalModParseTask::processAsZip()
         file.close();
         zip.close();
         return;
-    }
-    else if (zip.setCurrentFile("fabric.mod.json"))
-    {
-        if (!file.open(QIODevice::ReadOnly))
-        {
+    } else if (zip.setCurrentFile("fabric.mod.json")) {
+        if (!file.open(QIODevice::ReadOnly)) {
             zip.close();
             return;
         }
@@ -442,11 +368,8 @@ void LocalModParseTask::processAsZip()
         file.close();
         zip.close();
         return;
-    }
-    else if (zip.setCurrentFile("forgeversion.properties"))
-    {
-        if (!file.open(QIODevice::ReadOnly))
-        {
+    } else if (zip.setCurrentFile("forgeversion.properties")) {
+        if (!file.open(QIODevice::ReadOnly)) {
             zip.close();
             return;
         }
@@ -463,8 +386,7 @@ void LocalModParseTask::processAsZip()
 void LocalModParseTask::processAsFolder()
 {
     QFileInfo mcmod_info(FS::PathCombine(m_modFile.filePath(), "mcmod.info"));
-    if (mcmod_info.isFile())
-    {
+    if (mcmod_info.isFile()) {
         QFile mcmod(mcmod_info.filePath());
         if (!mcmod.open(QIODevice::ReadOnly))
             return;
@@ -483,10 +405,8 @@ void LocalModParseTask::processAsLitemod()
 
     QuaZipFile file(&zip);
 
-    if (zip.setCurrentFile("litemod.json"))
-    {
-        if (!file.open(QIODevice::ReadOnly))
-        {
+    if (zip.setCurrentFile("litemod.json")) {
+        if (!file.open(QIODevice::ReadOnly)) {
             zip.close();
             return;
         }
@@ -505,8 +425,7 @@ bool LocalModParseTask::abort()
 
 void LocalModParseTask::executeTask()
 {
-    switch(m_type)
-    {
+    switch (m_type) {
         case ResourceType::ZIPFILE:
             processAsZip();
             break;
diff --git a/launcher/modplatform/packwiz/Packwiz.cpp b/launcher/modplatform/packwiz/Packwiz.cpp
index c3561093..b1fe963e 100644
--- a/launcher/modplatform/packwiz/Packwiz.cpp
+++ b/launcher/modplatform/packwiz/Packwiz.cpp
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
-*  PolyMC - Minecraft Launcher
-*  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
-*
-*  This program is free software: you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation, version 3.
-*
-*  This program is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 #include "Packwiz.h"
 
@@ -22,9 +22,7 @@
 #include <QDir>
 #include <QObject>
 
-#include "toml.h"
-#include "FileSystem.h"
-
+#include <toml++/toml.h>
 #include "minecraft/mod/Mod.h"
 #include "modplatform/ModIndex.h"
 
@@ -44,7 +42,7 @@ auto getRealIndexName(QDir& index_dir, QString normalized_fname, bool should_fin
             }
         }
 
-        if(should_find_match && !QString::compare(normalized_fname, real_fname, Qt::CaseSensitive)){
+        if (should_find_match && !QString::compare(normalized_fname, real_fname, Qt::CaseSensitive)) {
             qCritical() << "Could not find a match for a valid metadata file!";
             qCritical() << "File: " << normalized_fname;
             return {};
@@ -57,7 +55,7 @@ auto getRealIndexName(QDir& index_dir, QString normalized_fname, bool should_fin
 // Helpers
 static inline auto indexFileName(QString const& mod_slug) -> QString
 {
-    if(mod_slug.endsWith(".pw.toml"))
+    if (mod_slug.endsWith(".pw.toml"))
         return mod_slug;
     return QString("%1.pw.toml").arg(mod_slug);
 }
@@ -65,32 +63,28 @@ static inline auto indexFileName(QString const& mod_slug) -> QString
 static ModPlatform::ProviderCapabilities ProviderCaps;
 
 // Helper functions for extracting data from the TOML file
-auto stringEntry(toml_table_t* parent, const char* entry_name) -> QString
+auto stringEntry(toml::table table, const std::string entry_name) -> QString
 {
-    toml_datum_t var = toml_string_in(parent, entry_name);
-    if (!var.ok) {
-        qCritical() << QString("Failed to read str property '%1' in mod metadata.").arg(entry_name);
+    auto node = table[entry_name];
+    if (!node) {
+        qCritical() << QString::fromStdString("Failed to read str property '" + entry_name + "' in mod metadata.");
         return {};
     }
 
-    QString tmp = var.u.s;
-    free(var.u.s);
-
-    return tmp;
+    return QString::fromStdString(node.value_or(""));
 }
 
-auto intEntry(toml_table_t* parent, const char* entry_name) -> int
+auto intEntry(toml::table table, const std::string entry_name) -> int
 {
-    toml_datum_t var = toml_int_in(parent, entry_name);
-    if (!var.ok) {
-        qCritical() << QString("Failed to read int property '%1' in mod metadata.").arg(entry_name);
+    auto node = table[entry_name];
+    if (!node) {
+        qCritical() << QString::fromStdString("Failed to read int property '" + entry_name + "' in mod metadata.");
         return {};
     }
 
-    return var.u.i;
+    return node.value_or(0);
 }
 
-
 auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, ModPlatform::IndexedVersion& mod_version) -> Mod
 {
     Mod mod;
@@ -99,10 +93,9 @@ auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, Mo
     mod.name = mod_pack.name;
     mod.filename = mod_version.fileName;
 
-    if(mod_pack.provider == ModPlatform::Provider::FLAME){
+    if (mod_pack.provider == ModPlatform::Provider::FLAME) {
         mod.mode = "metadata:curseforge";
-    }
-    else {
+    } else {
         mod.mode = "url";
         mod.url = mod_version.downloadUrl;
     }
@@ -120,8 +113,8 @@ auto V1::createModFormat(QDir& index_dir, ModPlatform::IndexedPack& mod_pack, Mo
 auto V1::createModFormat(QDir& index_dir, ::Mod& internal_mod, QString slug) -> Mod
 {
     // Try getting metadata if it exists
-    Mod mod { getIndexForMod(index_dir, slug) };
-    if(mod.isValid())
+    Mod mod{ getIndexForMod(index_dir, slug) };
+    if (mod.isValid())
         return mod;
 
     qWarning() << QString("Tried to create mod metadata with a Mod without metadata!");
@@ -131,7 +124,7 @@ auto V1::createModFormat(QDir& index_dir, ::Mod& internal_mod, QString slug) ->
 
 void V1::updateModIndex(QDir& index_dir, Mod& mod)
 {
-    if(!mod.isValid()){
+    if (!mod.isValid()) {
         qCritical() << QString("Tried to update metadata of an invalid mod!");
         return;
     }
@@ -150,7 +143,9 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
     // TODO: We should do more stuff here, as the user is likely trying to
     // override a file. In this case, check versions and ask the user what
     // they want to do!
-    if (index_file.exists()) { index_file.remove(); }
+    if (index_file.exists()) {
+        index_file.remove();
+    }
 
     if (!index_file.open(QIODevice::ReadWrite)) {
         qCritical() << QString("Could not open file %1!").arg(indexFileName(mod.name));
@@ -174,15 +169,15 @@ void V1::updateModIndex(QDir& index_dir, Mod& mod)
 
         in_stream << QString("\n[update]\n");
         in_stream << QString("[update.%1]\n").arg(ProviderCaps.name(mod.provider));
-        switch(mod.provider){
-        case(ModPlatform::Provider::FLAME):
-            in_stream << QString("file-id = %1\n").arg(mod.file_id.toString());
-            in_stream << QString("project-id = %1\n").arg(mod.project_id.toString());
-            break;
-        case(ModPlatform::Provider::MODRINTH):
-            addToStream("mod-id", mod.mod_id().toString());
-            addToStream("version", mod.version().toString());
-            break;
+        switch (mod.provider) {
+            case (ModPlatform::Provider::FLAME):
+                in_stream << QString("file-id = %1\n").arg(mod.file_id.toString());
+                in_stream << QString("project-id = %1\n").arg(mod.project_id.toString());
+                break;
+            case (ModPlatform::Provider::MODRINTH):
+                addToStream("mod-id", mod.mod_id().toString());
+                addToStream("version", mod.version().toString());
+                break;
         }
     }
 
@@ -230,27 +225,25 @@ auto V1::getIndexForMod(QDir& index_dir, QString slug) -> Mod
     if (real_fname.isEmpty())
         return {};
 
-    QFile index_file(index_dir.absoluteFilePath(real_fname));
-
-    if (!index_file.open(QIODevice::ReadOnly)) {
-        qWarning() << QString("Failed to open mod metadata for %1").arg(slug);
+    toml::table table;
+#if TOML_EXCEPTIONS
+    try {
+        table = toml::parse_file(index_dir.absoluteFilePath(real_fname).toStdString());
+    } catch (const toml::parse_error& err) {
+        qWarning() << QString("Could not open file %1!").arg(normalized_fname);
+        qWarning() << "Reason: " << QString(err.what());
         return {};
     }
-
-    toml_table_t* table = nullptr;
-
-    // NOLINTNEXTLINE(modernize-avoid-c-arrays)
-    char errbuf[200];
-    auto file_bytearray = index_file.readAll();
-    table = toml_parse(file_bytearray.data(), errbuf, sizeof(errbuf));
-
-    index_file.close();
-
+#else
+    table = toml::parse_file(index_dir.absoluteFilePath(real_fname).toStdString());
     if (!table) {
         qWarning() << QString("Could not open file %1!").arg(normalized_fname);
-        qWarning() << "Reason: " << QString(errbuf);
+        qWarning() << "Reason: " << QString(table.error().what());
         return {};
     }
+#endif
+
+    // index_file.close();
 
     mod.slug = slug;
 
@@ -261,45 +254,42 @@ auto V1::getIndexForMod(QDir& index_dir, QString slug) -> Mod
     }
 
     {  // [download] info
-        toml_table_t* download_table = toml_table_in(table, "download");
+        auto download_table = table["download"].as_table();
         if (!download_table) {
             qCritical() << QString("No [download] section found on mod metadata!");
             return {};
         }
 
-        mod.mode = stringEntry(download_table, "mode");
-        mod.url = stringEntry(download_table, "url");
-        mod.hash_format = stringEntry(download_table, "hash-format");
-        mod.hash = stringEntry(download_table, "hash");
+        mod.mode = stringEntry(*download_table, "mode");
+        mod.url = stringEntry(*download_table, "url");
+        mod.hash_format = stringEntry(*download_table, "hash-format");
+        mod.hash = stringEntry(*download_table, "hash");
     }
 
-    { // [update] info
+    {  // [update] info
         using Provider = ModPlatform::Provider;
 
-        toml_table_t* update_table = toml_table_in(table, "update");
-        if (!update_table) {
+        auto update_table = table["update"];
+        if (!update_table || !update_table.is_table()) {
             qCritical() << QString("No [update] section found on mod metadata!");
             return {};
         }
 
-        toml_table_t* mod_provider_table = nullptr;
-        if ((mod_provider_table = toml_table_in(update_table, ProviderCaps.name(Provider::FLAME)))) {
+        toml::table* mod_provider_table = nullptr;
+        if ((mod_provider_table = update_table[ProviderCaps.name(Provider::FLAME)].as_table())) {
             mod.provider = Provider::FLAME;
-            mod.file_id = intEntry(mod_provider_table, "file-id");
-            mod.project_id = intEntry(mod_provider_table, "project-id");
-        } else if ((mod_provider_table = toml_table_in(update_table, ProviderCaps.name(Provider::MODRINTH)))) {
+            mod.file_id = intEntry(*mod_provider_table, "file-id");
+            mod.project_id = intEntry(*mod_provider_table, "project-id");
+        } else if ((mod_provider_table = update_table[ProviderCaps.name(Provider::MODRINTH)].as_table())) {
             mod.provider = Provider::MODRINTH;
-            mod.mod_id() = stringEntry(mod_provider_table, "mod-id");
-            mod.version() = stringEntry(mod_provider_table, "version");
+            mod.mod_id() = stringEntry(*mod_provider_table, "mod-id");
+            mod.version() = stringEntry(*mod_provider_table, "version");
         } else {
             qCritical() << QString("No mod provider on mod metadata!");
             return {};
         }
-        
     }
 
-    toml_free(table);
-
     return mod;
 }
 
diff --git a/libraries/README.md b/libraries/README.md
index 8e4bd61b..6297cd9b 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -44,17 +44,17 @@ Java launcher part for Minecraft.
 
 It:
 
-* Starts a process
-* Waits for a launch script on stdin
-* Consumes the launch script you feed it
-* Proceeds with launch when it gets the `launcher` command
+- Starts a process
+- Waits for a launch script on stdin
+- Consumes the launch script you feed it
+- Proceeds with launch when it gets the `launcher` command
 
 This means the process is essentially idle until the final command is sent. You can, for example, attach a profiler before you send it.
 
 A `legacy` and `onesix` launchers are available.
 
-* `legacy` is intended for use with Minecraft versions < 1.6 and is deprecated.
-* `onesix` can handle launching any Minecraft version, at the cost of some extra features `legacy` enables (custom window icon and title).
+- `legacy` is intended for use with Minecraft versions < 1.6 and is deprecated.
+- `onesix` can handle launching any Minecraft version, at the cost of some extra features `legacy` enables (custom window icon and title).
 
 Example (some parts have been censored):
 
@@ -177,11 +177,11 @@ A PolyMC-specific library for probing system information.
 
 Apache 2.0
 
-## tomlc99
+## tomlplusplus
 
 A TOML language parser. Used by Forge 1.14+ to store mod metadata.
 
-See [github repo](https://github.com/cktan/tomlc99).
+See [github repo](https://github.com/marzer/tomlplusplus).
 
 Licenced under the MIT licence.
 
diff --git a/libraries/tomlc99/CMakeLists.txt b/libraries/tomlc99/CMakeLists.txt
deleted file mode 100644
index 60786923..00000000
--- a/libraries/tomlc99/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-project(tomlc99)
-
-set(tomlc99_SOURCES
-include/toml.h
-src/toml.c
-)
-
-add_library(tomlc99 STATIC ${tomlc99_SOURCES})
-
-target_include_directories(tomlc99 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/libraries/tomlc99/LICENSE b/libraries/tomlc99/LICENSE
deleted file mode 100644
index a3292b16..00000000
--- a/libraries/tomlc99/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-MIT License
-
-Copyright (c) 2017 CK Tan
-https://github.com/cktan/tomlc99
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/libraries/tomlc99/README.md b/libraries/tomlc99/README.md
deleted file mode 100644
index e5fe9480..00000000
--- a/libraries/tomlc99/README.md
+++ /dev/null
@@ -1,197 +0,0 @@
-# tomlc99
-
-TOML in c99; v1.0 compliant.
-
-If you are looking for a C++ library, you might try this wrapper: [https://github.com/cktan/tomlcpp](https://github.com/cktan/tomlcpp).
-
-* Compatible with [TOML v1.0.0](https://toml.io/en/v1.0.0).
-* Tested with multiple test suites, including
-[BurntSushi/toml-test](https://github.com/BurntSushi/toml-test) and
-[iarna/toml-spec-tests](https://github.com/iarna/toml-spec-tests).
-* Provides very simple and intuitive interface.
-
-## Usage
-
-Please see the `toml.h` file for details. What follows is a simple example that
-parses this config file:
-
-```toml
-[server]
-    host = "www.example.com"
-    port = [ 8080, 8181, 8282 ]
-```
-
-The steps for getting values from our file is usually :
-
-1. Parse the TOML file.
-2. Traverse and locate a table in TOML.
-3. Extract values from the table.
-4. Free up allocated memory.
-
-Below is an example of parsing the values from the example table.
-
-```c
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "toml.h"
-
-static void error(const char* msg, const char* msg1)
-{
-    fprintf(stderr, "ERROR: %s%s\n", msg, msg1?msg1:"");
-    exit(1);
-}
-
-
-int main()
-{
-    FILE* fp;
-    char errbuf[200];
-
-    // 1. Read and parse toml file
-    fp = fopen("sample.toml", "r");
-    if (!fp) {
-        error("cannot open sample.toml - ", strerror(errno));
-    }
-
-    toml_table_t* conf = toml_parse_file(fp, errbuf, sizeof(errbuf));
-    fclose(fp);
-
-    if (!conf) {
-        error("cannot parse - ", errbuf);
-    }
-
-    // 2. Traverse to a table.
-    toml_table_t* server = toml_table_in(conf, "server");
-    if (!server) {
-        error("missing [server]", "");
-    }
-
-    // 3. Extract values
-    toml_datum_t host = toml_string_in(server, "host");
-    if (!host.ok) {
-        error("cannot read server.host", "");
-    }
-
-    toml_array_t* portarray = toml_array_in(server, "port");
-    if (!portarray) {
-        error("cannot read server.port", "");
-    }
-
-    printf("host: %s\n", host.u.s);
-    printf("port: ");
-    for (int i = 0; ; i++) {
-        toml_datum_t port = toml_int_at(portarray, i);
-        if (!port.ok) break;
-        printf("%d ", (int)port.u.i);
-    }
-    printf("\n");
-
-    // 4. Free memory
-    free(host.u.s);
-    toml_free(conf);
-    return 0;
-}
-```
-
-### Accessing Table Content
-
-TOML tables are dictionaries where lookups are done using string keys. In
-general, all access functions on tables are named `toml_*_in(...)`.
-
-In the normal case, you know the key and its content type, and retrievals can be done
-using one of these functions:
-
-```c
-toml_string_in(tab, key);
-toml_bool_in(tab, key);
-toml_int_in(tab, key);
-toml_double_in(tab, key);
-toml_timestamp_in(tab, key);
-toml_table_in(tab, key);
-toml_array_in(tab, key);
-```
-
-You can also interrogate the keys in a table using an integer index:
-
-```c
-toml_table_t* tab = toml_parse_file(...);
-for (int i = 0; ; i++) {
-    const char* key = toml_key_in(tab, i);
-    if (!key) break;
-    printf("key %d: %s\n", i, key);
-}
-```
-
-### Accessing Array Content
-
-TOML arrays can be deref-ed using integer indices. In general, all access methods on arrays are named `toml_*_at()`.
-
-To obtain the size of an array:
-
-```c
-int size = toml_array_nelem(arr);
-```
-
-To obtain the content of an array, use a valid index and call one of these functions:
-
-```c
-toml_string_at(arr, idx);
-toml_bool_at(arr, idx);
-toml_int_at(arr, idx);
-toml_double_at(arr, idx);
-toml_timestamp_at(arr, idx);
-toml_table_at(arr, idx);
-toml_array_at(arr, idx);
-```
-
-### toml_datum_t
-
-Some `toml_*_at` and `toml_*_in` functions return a toml_datum_t
-structure. The `ok` flag in the structure indicates if the function
-call was successful. If so, you may proceed to read the value
-corresponding to the type of the content.
-
-For example:
-
-```c
-toml_datum_t host = toml_string_in(tab, "host");
-if (host.ok) {
-    printf("host: %s\n", host.u.s);
-    free(host.u.s);   /* FREE applies to string and timestamp types only */
-}
-```
-
-**IMPORTANT: if the accessed value is a string or a timestamp, you must call `free(datum.u.s)` or `free(datum.u.ts)` respectively after usage.**
-
-## Building and installing
-
-A normal *make* suffices. You can also simply include the
-`toml.c` and `toml.h` files in your project.
-
-Invoking `make install` will install the header and library files into
-/usr/local/{include,lib}.
-
-Alternatively, specify `make install prefix=/a/file/path` to install into
-/a/file/path/{include,lib}.
-
-## Testing
-
-To test against the standard test set provided by BurntSushi/toml-test:
-
-```sh
-% make
-% cd test1
-% bash build.sh   # do this once
-% bash run.sh     # this will run the test suite
-```
-
-To test against the standard test set provided by iarna/toml:
-
-```sh
-% make
-% cd test2
-% bash build.sh   # do this once
-% bash run.sh     # this will run the test suite
-```
diff --git a/libraries/tomlc99/include/toml.h b/libraries/tomlc99/include/toml.h
deleted file mode 100644
index b91ef890..00000000
--- a/libraries/tomlc99/include/toml.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-  MIT License
-
-  Copyright (c) 2017 - 2019 CK Tan
-  https://github.com/cktan/tomlc99
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-#ifndef TOML_H
-#define TOML_H
-
-
-#include <stdio.h>
-#include <stdint.h>
-
-
-#ifdef __cplusplus
-#define TOML_EXTERN extern "C"
-#else
-#define TOML_EXTERN extern
-#endif
-
-typedef struct toml_timestamp_t toml_timestamp_t;
-typedef struct toml_table_t toml_table_t;
-typedef struct toml_array_t toml_array_t;
-typedef struct toml_datum_t toml_datum_t;
-
-/* Parse a file. Return a table on success, or 0 otherwise.
- * Caller must toml_free(the-return-value) after use.
- */
-TOML_EXTERN toml_table_t* toml_parse_file(FILE* fp,
-										  char* errbuf,
-										  int errbufsz);
-
-/* Parse a string containing the full config.
- * Return a table on success, or 0 otherwise.
- * Caller must toml_free(the-return-value) after use.
- */
-TOML_EXTERN toml_table_t* toml_parse(char* conf, /* NUL terminated, please. */
-									 char* errbuf,
-									 int errbufsz);
-
-/* Free the table returned by toml_parse() or toml_parse_file(). Once
- * this function is called, any handles accessed through this tab
- * directly or indirectly are no longer valid.
- */
-TOML_EXTERN void toml_free(toml_table_t* tab);
-
-
-/* Timestamp types. The year, month, day, hour, minute, second, z
- * fields may be NULL if they are not relevant. e.g. In a DATE
- * type, the hour, minute, second and z fields will be NULLs.
- */
-struct toml_timestamp_t {
-	struct { /* internal. do not use. */
-		int year, month, day;
-		int hour, minute, second, millisec;
-		char z[10];
-	} __buffer;
-	int *year, *month, *day;
-	int *hour, *minute, *second, *millisec;
-	char* z;
-};
-
-
-/*-----------------------------------------------------------------
- *  Enhanced access methods
- */
-struct toml_datum_t {
-	int ok;
-	union {
-		toml_timestamp_t* ts; /* ts must be freed after use */
-		char*   s; /* string value. s must be freed after use */
-		int     b; /* bool value */
-		int64_t i; /* int value */
-		double  d; /* double value */
-	} u;
-};
-
-/* on arrays: */
-/* ... retrieve size of array. */
-TOML_EXTERN int toml_array_nelem(const toml_array_t* arr);
-/* ... retrieve values using index. */
-TOML_EXTERN toml_datum_t toml_string_at(const toml_array_t* arr, int idx);
-TOML_EXTERN toml_datum_t toml_bool_at(const toml_array_t* arr, int idx);
-TOML_EXTERN toml_datum_t toml_int_at(const toml_array_t* arr, int idx);
-TOML_EXTERN toml_datum_t toml_double_at(const toml_array_t* arr, int idx);
-TOML_EXTERN toml_datum_t toml_timestamp_at(const toml_array_t* arr, int idx);
-/* ... retrieve array or table using index. */
-TOML_EXTERN toml_array_t* toml_array_at(const toml_array_t* arr, int idx);
-TOML_EXTERN toml_table_t* toml_table_at(const toml_array_t* arr, int idx);
-
-/* on tables: */
-/* ... retrieve the key in table at keyidx. Return 0 if out of range. */
-TOML_EXTERN const char* toml_key_in(const toml_table_t* tab, int keyidx);
-/* ... retrieve values using key. */
-TOML_EXTERN toml_datum_t toml_string_in(const toml_table_t* arr, const char* key);
-TOML_EXTERN toml_datum_t toml_bool_in(const toml_table_t* arr, const char* key);
-TOML_EXTERN toml_datum_t toml_int_in(const toml_table_t* arr, const char* key);
-TOML_EXTERN toml_datum_t toml_double_in(const toml_table_t* arr, const char* key);
-TOML_EXTERN toml_datum_t toml_timestamp_in(const toml_table_t* arr, const char* key);
-/* .. retrieve array or table using key. */
-TOML_EXTERN toml_array_t* toml_array_in(const toml_table_t* tab,
-										const char* key);
-TOML_EXTERN toml_table_t* toml_table_in(const toml_table_t* tab,
-										const char* key);
-
-/*-----------------------------------------------------------------
- * lesser used
- */
-/* Return the array kind: 't'able, 'a'rray, 'v'alue, 'm'ixed */
-TOML_EXTERN char toml_array_kind(const toml_array_t* arr);
-
-/* For array kind 'v'alue, return the type of values
-   i:int, d:double, b:bool, s:string, t:time, D:date, T:timestamp, 'm'ixed
-   0 if unknown
-*/
-TOML_EXTERN char toml_array_type(const toml_array_t* arr);
-
-/* Return the key of an array */
-TOML_EXTERN const char* toml_array_key(const toml_array_t* arr);
-
-/* Return the number of key-values in a table */
-TOML_EXTERN int toml_table_nkval(const toml_table_t* tab);
-
-/* Return the number of arrays in a table */
-TOML_EXTERN int toml_table_narr(const toml_table_t* tab);
-
-/* Return the number of sub-tables in a table */
-TOML_EXTERN int toml_table_ntab(const toml_table_t* tab);
-
-/* Return the key of a table*/
-TOML_EXTERN const char* toml_table_key(const toml_table_t* tab);
-
-/*--------------------------------------------------------------
- * misc
- */
-TOML_EXTERN int toml_utf8_to_ucs(const char* orig, int len, int64_t* ret);
-TOML_EXTERN int toml_ucs_to_utf8(int64_t code, char buf[6]);
-TOML_EXTERN void toml_set_memutil(void* (*xxmalloc)(size_t),
-								  void	(*xxfree)(void*));
-
-
-/*--------------------------------------------------------------
- *  deprecated
- */
-/* A raw value, must be processed by toml_rto* before using. */
-typedef const char* toml_raw_t;
-TOML_EXTERN toml_raw_t toml_raw_in(const toml_table_t* tab, const char* key);
-TOML_EXTERN toml_raw_t toml_raw_at(const toml_array_t* arr, int idx);
-TOML_EXTERN int toml_rtos(toml_raw_t s, char** ret);
-TOML_EXTERN int toml_rtob(toml_raw_t s, int* ret);
-TOML_EXTERN int toml_rtoi(toml_raw_t s, int64_t* ret);
-TOML_EXTERN int toml_rtod(toml_raw_t s, double* ret);
-TOML_EXTERN int toml_rtod_ex(toml_raw_t s, double* ret, char* buf, int buflen);
-TOML_EXTERN int toml_rtots(toml_raw_t s, toml_timestamp_t* ret);
-
-
-#endif /* TOML_H */
diff --git a/libraries/tomlc99/src/toml.c b/libraries/tomlc99/src/toml.c
deleted file mode 100644
index e46e62e6..00000000
--- a/libraries/tomlc99/src/toml.c
+++ /dev/null
@@ -1,2300 +0,0 @@
-/*
-
-  MIT License
-
-  Copyright (c) 2017 - 2021 CK Tan
-  https://github.com/cktan/tomlc99
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-
-*/
-#define _POSIX_C_SOURCE 200809L
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdint.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdbool.h>
-#include "toml.h"
-
-
-static void* (*ppmalloc)(size_t) = malloc;
-static void (*ppfree)(void*) = free;
-
-void toml_set_memutil(void* (*xxmalloc)(size_t),
-					  void	(*xxfree)(void*))
-{
-	if (xxmalloc) ppmalloc = xxmalloc;
-	if (xxfree) ppfree = xxfree;
-}
-
-
-#define MALLOC(a)	  ppmalloc(a)
-#define FREE(a)		  ppfree(a)
-
-static void* CALLOC(size_t nmemb, size_t sz)
-{
-	int nb = sz * nmemb;
-	void* p = MALLOC(nb);
-	if (p) {
-		memset(p, 0, nb);
-	}
-	return p;
-}
-
-
-static char* STRDUP(const char* s)
-{
-	int len = strlen(s);
-	char* p = MALLOC(len+1);
-	if (p) {
-		memcpy(p, s, len);
-		p[len] = 0;
-	}
-	return p;
-}
-
-static char* STRNDUP(const char* s, size_t n)
-{
-	size_t len = strnlen(s, n);
-	char* p = MALLOC(len+1);
-	if (p) {
-		memcpy(p, s, len);
-		p[len] = 0;
-	}
-	return p;
-}
-
-
-
-/**
- * Convert a char in utf8 into UCS, and store it in *ret.
- * Return #bytes consumed or -1 on failure.
- */
-int toml_utf8_to_ucs(const char* orig, int len, int64_t* ret)
-{
-	const unsigned char* buf = (const unsigned char*) orig;
-	unsigned i = *buf++;
-	int64_t v;
-
-	/* 0x00000000 - 0x0000007F:
-	   0xxxxxxx
-	*/
-	if (0 == (i >> 7)) {
-		if (len < 1) return -1;
-		v = i;
-		return *ret = v, 1;
-	}
-	/* 0x00000080 - 0x000007FF:
-	   110xxxxx 10xxxxxx
-	*/
-	if (0x6 == (i >> 5)) {
-		if (len < 2) return -1;
-		v = i & 0x1f;
-		for (int j = 0; j < 1; j++) {
-			i = *buf++;
-			if (0x2 != (i >> 6)) return -1;
-			v = (v << 6) | (i & 0x3f);
-		}
-		return *ret = v, (const char*) buf - orig;
-	}
-
-	/* 0x00000800 - 0x0000FFFF:
-	   1110xxxx 10xxxxxx 10xxxxxx
-	*/
-	if (0xE == (i >> 4)) {
-		if (len < 3) return -1;
-		v = i & 0x0F;
-		for (int j = 0; j < 2; j++) {
-			i = *buf++;
-			if (0x2 != (i >> 6)) return -1;
-			v = (v << 6) | (i & 0x3f);
-		}
-		return *ret = v, (const char*) buf - orig;
-	}
-
-	/* 0x00010000 - 0x001FFFFF:
-	   11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-	*/
-	if (0x1E == (i >> 3)) {
-		if (len < 4) return -1;
-		v = i & 0x07;
-		for (int j = 0; j < 3; j++) {
-			i = *buf++;
-			if (0x2 != (i >> 6)) return -1;
-			v = (v << 6) | (i & 0x3f);
-		}
-		return *ret = v, (const char*) buf - orig;
-	}
-
-	/* 0x00200000 - 0x03FFFFFF:
-	   111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-	*/
-	if (0x3E == (i >> 2)) {
-		if (len < 5) return -1;
-		v = i & 0x03;
-		for (int j = 0; j < 4; j++) {
-			i = *buf++;
-			if (0x2 != (i >> 6)) return -1;
-			v = (v << 6) | (i & 0x3f);
-		}
-		return *ret = v, (const char*) buf - orig;
-	}
-
-	/* 0x04000000 - 0x7FFFFFFF:
-	   1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-	*/
-	if (0x7e == (i >> 1)) {
-		if (len < 6) return -1;
-		v = i & 0x01;
-		for (int j = 0; j < 5; j++) {
-			i = *buf++;
-			if (0x2 != (i >> 6)) return -1;
-			v = (v << 6) | (i & 0x3f);
-		}
-		return *ret = v, (const char*) buf - orig;
-	}
-	return -1;
-}
-
-
-/**
- *	Convert a UCS char to utf8 code, and return it in buf.
- *	Return #bytes used in buf to encode the char, or
- *	-1 on error.
- */
-int toml_ucs_to_utf8(int64_t code, char buf[6])
-{
-	/* http://stackoverflow.com/questions/6240055/manually-converting-unicode-codepoints-into-utf-8-and-utf-16 */
-	/* The UCS code values 0xd800–0xdfff (UTF-16 surrogates) as well
-	 * as 0xfffe and 0xffff (UCS noncharacters) should not appear in
-	 * conforming UTF-8 streams.
-	 */
-	if (0xd800 <= code && code <= 0xdfff) return -1;
-	if (0xfffe <= code && code <= 0xffff) return -1;
-
-	/* 0x00000000 - 0x0000007F:
-	   0xxxxxxx
-	*/
-	if (code < 0) return -1;
-	if (code <= 0x7F) {
-		buf[0] = (unsigned char) code;
-		return 1;
-	}
-
-	/* 0x00000080 - 0x000007FF:
-	   110xxxxx 10xxxxxx
-	*/
-	if (code <= 0x000007FF) {
-		buf[0] = 0xc0 | (code >> 6);
-		buf[1] = 0x80 | (code & 0x3f);
-		return 2;
-	}
-
-	/* 0x00000800 - 0x0000FFFF:
-	   1110xxxx 10xxxxxx 10xxxxxx
-	*/
-	if (code <= 0x0000FFFF) {
-		buf[0] = 0xe0 | (code >> 12);
-		buf[1] = 0x80 | ((code >> 6) & 0x3f);
-		buf[2] = 0x80 | (code & 0x3f);
-		return 3;
-	}
-
-	/* 0x00010000 - 0x001FFFFF:
-	   11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-	*/
-	if (code <= 0x001FFFFF) {
-		buf[0] = 0xf0 | (code >> 18);
-		buf[1] = 0x80 | ((code >> 12) & 0x3f);
-		buf[2] = 0x80 | ((code >> 6) & 0x3f);
-		buf[3] = 0x80 | (code & 0x3f);
-		return 4;
-	}
-
-	/* 0x00200000 - 0x03FFFFFF:
-	   111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-	*/
-	if (code <= 0x03FFFFFF) {
-		buf[0] = 0xf8 | (code >> 24);
-		buf[1] = 0x80 | ((code >> 18) & 0x3f);
-		buf[2] = 0x80 | ((code >> 12) & 0x3f);
-		buf[3] = 0x80 | ((code >> 6) & 0x3f);
-		buf[4] = 0x80 | (code & 0x3f);
-		return 5;
-	}
-
-	/* 0x04000000 - 0x7FFFFFFF:
-	   1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-	*/
-	if (code <= 0x7FFFFFFF) {
-		buf[0] = 0xfc | (code >> 30);
-		buf[1] = 0x80 | ((code >> 24) & 0x3f);
-		buf[2] = 0x80 | ((code >> 18) & 0x3f);
-		buf[3] = 0x80 | ((code >> 12) & 0x3f);
-		buf[4] = 0x80 | ((code >> 6) & 0x3f);
-		buf[5] = 0x80 | (code & 0x3f);
-		return 6;
-	}
-
-	return -1;
-}
-
-/*
- *	TOML has 3 data structures: value, array, table.
- *	Each of them can have identification key.
- */
-typedef struct toml_keyval_t toml_keyval_t;
-struct toml_keyval_t {
-	const char* key;		/* key to this value */
-	const char* val;		/* the raw value */
-};
-
-typedef struct toml_arritem_t toml_arritem_t;
-struct toml_arritem_t {
-	int valtype;		/* for value kind: 'i'nt, 'd'ouble, 'b'ool, 's'tring, 't'ime, 'D'ate, 'T'imestamp */
-	char* val;
-	toml_array_t* arr;
-	toml_table_t* tab;
-};
-
-
-struct toml_array_t {
-	const char* key;		/* key to this array */
-	int kind; /* element kind: 'v'alue, 'a'rray, or 't'able, 'm'ixed */
-	int type; /* for value kind: 'i'nt, 'd'ouble, 'b'ool, 's'tring, 't'ime, 'D'ate, 'T'imestamp, 'm'ixed */
-
-	int nitem;			/* number of elements */
-	toml_arritem_t* item;
-};
-
-
-struct toml_table_t {
-	const char* key;	/* key to this table */
-	bool implicit;		/* table was created implicitly */
-	bool readonly;		/* no more modification allowed */
-
-	/* key-values in the table */
-	int			nkval;
-	toml_keyval_t** kval;
-
-	/* arrays in the table */
-	int		   narr;
-	toml_array_t** arr;
-
-	/* tables in the table */
-	int		   ntab;
-	toml_table_t** tab;
-};
-
-
-static inline void xfree(const void* x) { if (x) FREE((void*)(intptr_t)x); }
-
-
-enum tokentype_t {
-	INVALID,
-	DOT,
-	COMMA,
-	EQUAL,
-	LBRACE,
-	RBRACE,
-	NEWLINE,
-	LBRACKET,
-	RBRACKET,
-	STRING,
-};
-typedef enum tokentype_t tokentype_t;
-
-typedef struct token_t token_t;
-struct token_t {
-	tokentype_t tok;
-	int		lineno;
-	char*	ptr;		/* points into context->start */
-	int		len;
-	int		eof;
-};
-
-
-typedef struct context_t context_t;
-struct context_t {
-	char* start;
-	char* stop;
-	char* errbuf;
-	int	  errbufsz;
-
-	token_t tok;
-	toml_table_t* root;
-	toml_table_t* curtab;
-
-	struct {
-		int	top;
-		char*	key[10];
-		token_t tok[10];
-	} tpath;
-
-};
-
-#define STRINGIFY(x) #x
-#define TOSTRING(x)	 STRINGIFY(x)
-#define FLINE __FILE__ ":" TOSTRING(__LINE__)
-
-static int next_token(context_t* ctx, int dotisspecial);
-
-/*
-  Error reporting. Call when an error is detected. Always return -1.
-*/
-static int e_outofmemory(context_t* ctx, const char* fline)
-{
-	snprintf(ctx->errbuf, ctx->errbufsz, "ERROR: out of memory (%s)", fline);
-	return -1;
-}
-
-
-static int e_internal(context_t* ctx, const char* fline)
-{
-	snprintf(ctx->errbuf, ctx->errbufsz, "internal error (%s)", fline);
-	return -1;
-}
-
-static int e_syntax(context_t* ctx, int lineno, const char* msg)
-{
-	snprintf(ctx->errbuf, ctx->errbufsz, "line %d: %s", lineno, msg);
-	return -1;
-}
-
-static int e_badkey(context_t* ctx, int lineno)
-{
-	snprintf(ctx->errbuf, ctx->errbufsz, "line %d: bad key", lineno);
-	return -1;
-}
-
-static int e_keyexists(context_t* ctx, int lineno)
-{
-	snprintf(ctx->errbuf, ctx->errbufsz, "line %d: key exists", lineno);
-	return -1;
-}
-
-static int e_forbid(context_t* ctx, int lineno, const char* msg)
-{
-	snprintf(ctx->errbuf, ctx->errbufsz, "line %d: %s", lineno, msg);
-	return -1;
-}
-
-static void* expand(void* p, int sz, int newsz)
-{
-	void* s = MALLOC(newsz);
-	if (!s) return 0;
-
-	memcpy(s, p, sz);
-	FREE(p);
-	return s;
-}
-
-static void** expand_ptrarr(void** p, int n)
-{
-	void** s = MALLOC((n+1) * sizeof(void*));
-	if (!s) return 0;
-
-	s[n] = 0;
-	memcpy(s, p, n * sizeof(void*));
-	FREE(p);
-	return s;
-}
-
-static toml_arritem_t* expand_arritem(toml_arritem_t* p, int n)
-{
-	toml_arritem_t* pp = expand(p, n*sizeof(*p), (n+1)*sizeof(*p));
-	if (!pp) return 0;
-
-	memset(&pp[n], 0, sizeof(pp[n]));
-	return pp;
-}
-
-
-static char* norm_lit_str(const char* src, int srclen,
-						  int multiline,
-						  char* errbuf, int errbufsz)
-{
-	char* dst = 0;		/* will write to dst[] and return it */
-	int	  max = 0;		/* max size of dst[] */
-	int	  off = 0;		/* cur offset in dst[] */
-	const char* sp = src;
-	const char* sq = src + srclen;
-	int ch;
-
-	/* scan forward on src */
-	for (;;) {
-		if (off >=	max - 10) { /* have some slack for misc stuff */
-			int newmax = max + 50;
-			char* x = expand(dst, max, newmax);
-			if (!x) {
-				xfree(dst);
-				snprintf(errbuf, errbufsz, "out of memory");
-				return 0;
-			}
-			dst = x;
-			max = newmax;
-		}
-
-		/* finished? */
-		if (sp >= sq) break;
-
-		ch = *sp++;
-		/* control characters other than tab is not allowed */
-		if ((0 <= ch && ch <= 0x08)
-			|| (0x0a <= ch && ch <= 0x1f)
-			|| (ch == 0x7f)) {
-			if (! (multiline && (ch == '\r' || ch == '\n'))) {
-				xfree(dst);
-				snprintf(errbuf, errbufsz, "invalid char U+%04x", ch);
-				return 0;
-			}
-		}
-
-		// a plain copy suffice
-		dst[off++] = ch;
-	}
-
-	dst[off++] = 0;
-	return dst;
-}
-
-
-
-
-/*
- * Convert src to raw unescaped utf-8 string.
- * Returns NULL if error with errmsg in errbuf.
- */
-static char* norm_basic_str(const char* src, int srclen,
-							int multiline,
-							char* errbuf, int errbufsz)
-{
-	char* dst = 0;		/* will write to dst[] and return it */
-	int	  max = 0;		/* max size of dst[] */
-	int	  off = 0;		/* cur offset in dst[] */
-	const char* sp = src;
-	const char* sq = src + srclen;
-	int ch;
-
-	/* scan forward on src */
-	for (;;) {
-		if (off >=	max - 10) { /* have some slack for misc stuff */
-			int newmax = max + 50;
-			char* x = expand(dst, max, newmax);
-			if (!x) {
-				xfree(dst);
-				snprintf(errbuf, errbufsz, "out of memory");
-				return 0;
-			}
-			dst = x;
-			max = newmax;
-		}
-
-		/* finished? */
-		if (sp >= sq) break;
-
-		ch = *sp++;
-		if (ch != '\\') {
-			/* these chars must be escaped: U+0000 to U+0008, U+000A to U+001F, U+007F */
-			if ((0 <= ch && ch <= 0x08)
-				|| (0x0a <= ch && ch <= 0x1f)
-				|| (ch == 0x7f)) {
-				if (! (multiline && (ch == '\r' || ch == '\n'))) {
-					xfree(dst);
-					snprintf(errbuf, errbufsz, "invalid char U+%04x", ch);
-					return 0;
-				}
-			}
-
-			// a plain copy suffice
-			dst[off++] = ch;
-			continue;
-		}
-
-		/* ch was backslash. we expect the escape char. */
-		if (sp >= sq) {
-			snprintf(errbuf, errbufsz, "last backslash is invalid");
-			xfree(dst);
-			return 0;
-		}
-
-		/* for multi-line, we want to kill line-ending-backslash ... */
-		if (multiline) {
-
-			// if there is only whitespace after the backslash ...
-			if (sp[strspn(sp, " \t\r")] == '\n') {
-				/* skip all the following whitespaces */
-				sp += strspn(sp, " \t\r\n");
-				continue;
-			}
-		}
-
-		/* get the escaped char */
-		ch = *sp++;
-		switch (ch) {
-		case 'u': case 'U':
-			{
-				int64_t ucs = 0;
-				int nhex = (ch == 'u' ? 4 : 8);
-				for (int i = 0; i < nhex; i++) {
-					if (sp >= sq) {
-						snprintf(errbuf, errbufsz, "\\%c expects %d hex chars", ch, nhex);
-						xfree(dst);
-						return 0;
-					}
-					ch = *sp++;
-					int v = ('0' <= ch && ch <= '9')
-						? ch - '0'
-						: (('A' <= ch && ch <= 'F') ? ch - 'A' + 10 : -1);
-					if (-1 == v) {
-						snprintf(errbuf, errbufsz, "invalid hex chars for \\u or \\U");
-						xfree(dst);
-						return 0;
-					}
-					ucs = ucs * 16 + v;
-				}
-				int n = toml_ucs_to_utf8(ucs, &dst[off]);
-				if (-1 == n) {
-					snprintf(errbuf, errbufsz, "illegal ucs code in \\u or \\U");
-					xfree(dst);
-					return 0;
-				}
-				off += n;
-			}
-			continue;
-
-		case 'b': ch = '\b'; break;
-		case 't': ch = '\t'; break;
-		case 'n': ch = '\n'; break;
-		case 'f': ch = '\f'; break;
-		case 'r': ch = '\r'; break;
-		case '"':  ch = '"'; break;
-		case '\\': ch = '\\'; break;
-		default:
-			snprintf(errbuf, errbufsz, "illegal escape char \\%c", ch);
-			xfree(dst);
-			return 0;
-		}
-
-		dst[off++] = ch;
-	}
-
-	// Cap with NUL and return it.
-	dst[off++] = 0;
-	return dst;
-}
-
-
-/* Normalize a key. Convert all special chars to raw unescaped utf-8 chars. */
-static char* normalize_key(context_t* ctx, token_t strtok)
-{
-	const char* sp = strtok.ptr;
-	const char* sq = strtok.ptr + strtok.len;
-	int lineno = strtok.lineno;
-	char* ret;
-	int ch = *sp;
-	char ebuf[80];
-
-	/* handle quoted string */
-	if (ch == '\'' || ch == '\"') {
-		/* if ''' or """, take 3 chars off front and back. Else, take 1 char off. */
-		int multiline = 0;
-		if (sp[1] == ch && sp[2] == ch)	 {
-			sp += 3, sq -= 3;
-			multiline = 1;
-		}
-		else
-			sp++, sq--;
-
-		if (ch == '\'') {
-			/* for single quote, take it verbatim. */
-			if (! (ret = STRNDUP(sp, sq - sp))) {
-				e_outofmemory(ctx, FLINE);
-				return 0;
-			}
-		} else {
-			/* for double quote, we need to normalize */
-			ret = norm_basic_str(sp, sq - sp, multiline, ebuf, sizeof(ebuf));
-			if (!ret) {
-				e_syntax(ctx, lineno, ebuf);
-				return 0;
-			}
-		}
-
-		/* newlines are not allowed in keys */
-		if (strchr(ret, '\n')) {
-			xfree(ret);
-			e_badkey(ctx, lineno);
-			return 0;
-		}
-		return ret;
-	}
-
-	/* for bare-key allow only this regex: [A-Za-z0-9_-]+ */
-	const char* xp;
-	for (xp = sp; xp != sq; xp++) {
-		int k = *xp;
-		if (isalnum(k)) continue;
-		if (k == '_' || k == '-') continue;
-		e_badkey(ctx, lineno);
-		return 0;
-	}
-
-	/* dup and return it */
-	if (! (ret = STRNDUP(sp, sq - sp))) {
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	return ret;
-}
-
-
-/*
- * Look up key in tab. Return 0 if not found, or
- * 'v'alue, 'a'rray or 't'able depending on the element.
- */
-static int check_key(toml_table_t* tab, const char* key,
-					 toml_keyval_t** ret_val,
-					 toml_array_t** ret_arr,
-					 toml_table_t** ret_tab)
-{
-	int i;
-	void* dummy;
-
-	if (!ret_tab) ret_tab = (toml_table_t**) &dummy;
-	if (!ret_arr) ret_arr = (toml_array_t**) &dummy;
-	if (!ret_val) ret_val = (toml_keyval_t**) &dummy;
-
-	*ret_tab = 0; *ret_arr = 0; *ret_val = 0;
-
-	for (i = 0; i < tab->nkval; i++) {
-		if (0 == strcmp(key, tab->kval[i]->key)) {
-			*ret_val = tab->kval[i];
-			return 'v';
-		}
-	}
-	for (i = 0; i < tab->narr; i++) {
-		if (0 == strcmp(key, tab->arr[i]->key)) {
-			*ret_arr = tab->arr[i];
-			return 'a';
-		}
-	}
-	for (i = 0; i < tab->ntab; i++) {
-		if (0 == strcmp(key, tab->tab[i]->key)) {
-			*ret_tab = tab->tab[i];
-			return 't';
-		}
-	}
-	return 0;
-}
-
-
-static int key_kind(toml_table_t* tab, const char* key)
-{
-	return check_key(tab, key, 0, 0, 0);
-}
-
-/* Create a keyval in the table.
- */
-static toml_keyval_t* create_keyval_in_table(context_t* ctx, toml_table_t* tab, token_t keytok)
-{
-	/* first, normalize the key to be used for lookup.
-	 * remember to free it if we error out.
-	 */
-	char* newkey = normalize_key(ctx, keytok);
-	if (!newkey) return 0;
-
-	/* if key exists: error out. */
-	toml_keyval_t* dest = 0;
-	if (key_kind(tab, newkey)) {
-		xfree(newkey);
-		e_keyexists(ctx, keytok.lineno);
-		return 0;
-	}
-
-	/* make a new entry */
-	int n = tab->nkval;
-	toml_keyval_t** base;
-	if (0 == (base = (toml_keyval_t**) expand_ptrarr((void**)tab->kval, n))) {
-		xfree(newkey);
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	tab->kval = base;
-
-	if (0 == (base[n] = (toml_keyval_t*) CALLOC(1, sizeof(*base[n])))) {
-		xfree(newkey);
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	dest = tab->kval[tab->nkval++];
-
-	/* save the key in the new value struct */
-	dest->key = newkey;
-	return dest;
-}
-
-
-/* Create a table in the table.
- */
-static toml_table_t* create_keytable_in_table(context_t* ctx, toml_table_t* tab, token_t keytok)
-{
-	/* first, normalize the key to be used for lookup.
-	 * remember to free it if we error out.
-	 */
-	char* newkey = normalize_key(ctx, keytok);
-	if (!newkey) return 0;
-
-	/* if key exists: error out */
-	toml_table_t* dest = 0;
-	if (check_key(tab, newkey, 0, 0, &dest)) {
-		xfree(newkey);		 /* don't need this anymore */
-
-		/* special case: if table exists, but was created implicitly ... */
-		if (dest && dest->implicit) {
-			/* we make it explicit now, and simply return it. */
-			dest->implicit = false;
-			return dest;
-		}
-		e_keyexists(ctx, keytok.lineno);
-		return 0;
-	}
-
-	/* create a new table entry */
-	int n = tab->ntab;
-	toml_table_t** base;
-	if (0 == (base = (toml_table_t**) expand_ptrarr((void**)tab->tab, n))) {
-		xfree(newkey);
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	tab->tab = base;
-
-	if (0 == (base[n] = (toml_table_t*) CALLOC(1, sizeof(*base[n])))) {
-		xfree(newkey);
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	dest = tab->tab[tab->ntab++];
-
-	/* save the key in the new table struct */
-	dest->key = newkey;
-	return dest;
-}
-
-
-/* Create an array in the table.
- */
-static toml_array_t* create_keyarray_in_table(context_t* ctx,
-											  toml_table_t* tab,
-											  token_t keytok,
-											  char kind)
-{
-	/* first, normalize the key to be used for lookup.
-	 * remember to free it if we error out.
-	 */
-	char* newkey = normalize_key(ctx, keytok);
-	if (!newkey) return 0;
-
-	/* if key exists: error out */
-	if (key_kind(tab, newkey)) {
-		xfree(newkey);		 /* don't need this anymore */
-		e_keyexists(ctx, keytok.lineno);
-		return 0;
-	}
-
-	/* make a new array entry */
-	int n = tab->narr;
-	toml_array_t** base;
-	if (0 == (base = (toml_array_t**) expand_ptrarr((void**)tab->arr, n))) {
-		xfree(newkey);
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	tab->arr = base;
-
-	if (0 == (base[n] = (toml_array_t*) CALLOC(1, sizeof(*base[n])))) {
-		xfree(newkey);
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	toml_array_t* dest = tab->arr[tab->narr++];
-
-	/* save the key in the new array struct */
-	dest->key = newkey;
-	dest->kind = kind;
-	return dest;
-}
-
-
-static toml_arritem_t* create_value_in_array(context_t* ctx,
-											 toml_array_t* parent)
-{
-	const int n = parent->nitem;
-	toml_arritem_t* base = expand_arritem(parent->item, n);
-	if (!base) {
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	parent->item = base;
-	parent->nitem++;
-	return &parent->item[n];
-}
-
-/* Create an array in an array
- */
-static toml_array_t* create_array_in_array(context_t* ctx,
-										   toml_array_t* parent)
-{
-	const int n = parent->nitem;
-	toml_arritem_t* base = expand_arritem(parent->item, n);
-	if (!base) {
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	toml_array_t* ret = (toml_array_t*) CALLOC(1, sizeof(toml_array_t));
-	if (!ret) {
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	base[n].arr = ret;
-	parent->item = base;
-	parent->nitem++;
-	return ret;
-}
-
-/* Create a table in an array
- */
-static toml_table_t* create_table_in_array(context_t* ctx,
-										   toml_array_t* parent)
-{
-	int n = parent->nitem;
-	toml_arritem_t* base = expand_arritem(parent->item, n);
-	if (!base) {
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	toml_table_t* ret = (toml_table_t*) CALLOC(1, sizeof(toml_table_t));
-	if (!ret) {
-		e_outofmemory(ctx, FLINE);
-		return 0;
-	}
-	base[n].tab = ret;
-	parent->item = base;
-	parent->nitem++;
-	return ret;
-}
-
-
-static int skip_newlines(context_t* ctx, int isdotspecial)
-{
-	while (ctx->tok.tok == NEWLINE) {
-		if (next_token(ctx, isdotspecial)) return -1;
-		if (ctx->tok.eof) break;
-	}
-	return 0;
-}
-
-
-static int parse_keyval(context_t* ctx, toml_table_t* tab);
-
-static inline int eat_token(context_t* ctx, tokentype_t typ, int isdotspecial, const char* fline)
-{
-	if (ctx->tok.tok != typ)
-		return e_internal(ctx, fline);
-
-	if (next_token(ctx, isdotspecial))
-		return -1;
-
-	return 0;
-}
-
-
-
-/* We are at '{ ... }'.
- * Parse the table.
- */
-static int parse_inline_table(context_t* ctx, toml_table_t* tab)
-{
-	if (eat_token(ctx, LBRACE, 1, FLINE))
-		return -1;
-
-	for (;;) {
-		if (ctx->tok.tok == NEWLINE)
-			return e_syntax(ctx, ctx->tok.lineno, "newline not allowed in inline table");
-
-		/* until } */
-		if (ctx->tok.tok == RBRACE)
-			break;
-
-		if (ctx->tok.tok != STRING)
-			return e_syntax(ctx, ctx->tok.lineno, "expect a string");
-
-		if (parse_keyval(ctx, tab))
-			return -1;
-
-		if (ctx->tok.tok == NEWLINE)
-			return e_syntax(ctx, ctx->tok.lineno, "newline not allowed in inline table");
-
-		/* on comma, continue to scan for next keyval */
-		if (ctx->tok.tok == COMMA) {
-			if (eat_token(ctx, COMMA, 1, FLINE))
-				return -1;
-			continue;
-		}
-		break;
-	}
-
-	if (eat_token(ctx, RBRACE, 1, FLINE))
-		return -1;
-
-	tab->readonly = 1;
-
-	return 0;
-}
-
-static int valtype(const char* val)
-{
-	toml_timestamp_t ts;
-	if (*val == '\'' || *val == '"') return 's';
-	if (0 == toml_rtob(val, 0)) return 'b';
-	if (0 == toml_rtoi(val, 0)) return 'i';
-	if (0 == toml_rtod(val, 0)) return 'd';
-	if (0 == toml_rtots(val, &ts)) {
-		if (ts.year && ts.hour) return 'T'; /* timestamp */
-		if (ts.year) return 'D'; /* date */
-		return 't'; /* time */
-	}
-	return 'u'; /* unknown */
-}
-
-
-/* We are at '[...]' */
-static int parse_array(context_t* ctx, toml_array_t* arr)
-{
-	if (eat_token(ctx, LBRACKET, 0, FLINE)) return -1;
-
-	for (;;) {
-		if (skip_newlines(ctx, 0)) return -1;
-
-		/* until ] */
-		if (ctx->tok.tok == RBRACKET) break;
-
-		switch (ctx->tok.tok) {
-		case STRING:
-			{
-				/* set array kind if this will be the first entry */
-				if (arr->kind == 0)
-					arr->kind = 'v';
-				else if (arr->kind != 'v')
-					arr->kind = 'm';
-
-				char* val = ctx->tok.ptr;
-				int	  vlen = ctx->tok.len;
-
-				/* make a new value in array */
-				toml_arritem_t* newval = create_value_in_array(ctx, arr);
-				if (!newval)
-					return e_outofmemory(ctx, FLINE);
-
-				if (! (newval->val = STRNDUP(val, vlen)))
-					return e_outofmemory(ctx, FLINE);
-
-				newval->valtype = valtype(newval->val);
-
-				/* set array type if this is the first entry */
-				if (arr->nitem == 1)
-					arr->type = newval->valtype;
-				else if (arr->type != newval->valtype)
-					arr->type = 'm'; /* mixed */
-
-				if (eat_token(ctx, STRING, 0, FLINE)) return -1;
-				break;
-			}
-
-		case LBRACKET:
-			{ /* [ [array], [array] ... ] */
-				/* set the array kind if this will be the first entry */
-				if (arr->kind == 0)
-					arr->kind = 'a';
-				else if (arr->kind != 'a')
-					arr->kind = 'm';
-
-				toml_array_t* subarr = create_array_in_array(ctx, arr);
-				if (!subarr) return -1;
-				if (parse_array(ctx, subarr)) return -1;
-				break;
-			}
-
-		case LBRACE:
-			{ /* [ {table}, {table} ... ] */
-				/* set the array kind if this will be the first entry */
-				if (arr->kind == 0)
-					arr->kind = 't';
-				else if (arr->kind != 't')
-					arr->kind = 'm';
-
-				toml_table_t* subtab = create_table_in_array(ctx, arr);
-				if (!subtab) return -1;
-				if (parse_inline_table(ctx, subtab)) return -1;
-				break;
-			}
-
-		default:
-			return e_syntax(ctx, ctx->tok.lineno, "syntax error");
-		}
-
-		if (skip_newlines(ctx, 0)) return -1;
-
-		/* on comma, continue to scan for next element */
-		if (ctx->tok.tok == COMMA) {
-			if (eat_token(ctx, COMMA, 0, FLINE)) return -1;
-			continue;
-		}
-		break;
-	}
-
-	if (eat_token(ctx, RBRACKET, 1, FLINE)) return -1;
-	return 0;
-}
-
-
-/* handle lines like these:
-   key = "value"
-   key = [ array ]
-   key = { table }
-*/
-static int parse_keyval(context_t* ctx, toml_table_t* tab)
-{
-	if (tab->readonly) {
-		return e_forbid(ctx, ctx->tok.lineno, "cannot insert new entry into existing table");
-	}
-
-	token_t key = ctx->tok;
-	if (eat_token(ctx, STRING, 1, FLINE)) return -1;
-
-	if (ctx->tok.tok == DOT) {
-		/* handle inline dotted key.
-		   e.g.
-		   physical.color = "orange"
-		   physical.shape = "round"
-		*/
-		toml_table_t* subtab = 0;
-		{
-			char* subtabstr = normalize_key(ctx, key);
-			if (!subtabstr) return -1;
-
-			subtab = toml_table_in(tab, subtabstr);
-			xfree(subtabstr);
-		}
-		if (!subtab) {
-			subtab = create_keytable_in_table(ctx, tab, key);
-			if (!subtab) return -1;
-		}
-		if (next_token(ctx, 1)) return -1;
-		if (parse_keyval(ctx, subtab)) return -1;
-		return 0;
-	}
-
-	if (ctx->tok.tok != EQUAL) {
-		return e_syntax(ctx, ctx->tok.lineno, "missing =");
-	}
-
-	if (next_token(ctx, 0)) return -1;
-
-	switch (ctx->tok.tok) {
-	case STRING:
-		{ /* key = "value" */
-			toml_keyval_t* keyval = create_keyval_in_table(ctx, tab, key);
-			if (!keyval) return -1;
-			token_t val = ctx->tok;
-
-			assert(keyval->val == 0);
-			if (! (keyval->val = STRNDUP(val.ptr, val.len)))
-				return e_outofmemory(ctx, FLINE);
-
-			if (next_token(ctx, 1)) return -1;
-
-			return 0;
-		}
-
-	case LBRACKET:
-		{ /* key = [ array ] */
-			toml_array_t* arr = create_keyarray_in_table(ctx, tab, key, 0);
-			if (!arr) return -1;
-			if (parse_array(ctx, arr)) return -1;
-			return 0;
-		}
-
-	case LBRACE:
-		{ /* key = { table } */
-			toml_table_t* nxttab = create_keytable_in_table(ctx, tab, key);
-			if (!nxttab) return -1;
-			if (parse_inline_table(ctx, nxttab)) return -1;
-			return 0;
-		}
-
-	default:
-		return e_syntax(ctx, ctx->tok.lineno, "syntax error");
-	}
-	return 0;
-}
-
-
-typedef struct tabpath_t tabpath_t;
-struct tabpath_t {
-	int		cnt;
-	token_t key[10];
-};
-
-/* at [x.y.z] or [[x.y.z]]
- * Scan forward and fill tabpath until it enters ] or ]]
- * There will be at least one entry on return.
- */
-static int fill_tabpath(context_t* ctx)
-{
-	int lineno = ctx->tok.lineno;
-	int i;
-
-	/* clear tpath */
-	for (i = 0; i < ctx->tpath.top; i++) {
-		char** p = &ctx->tpath.key[i];
-		xfree(*p);
-		*p = 0;
-	}
-	ctx->tpath.top = 0;
-
-	for (;;) {
-		if (ctx->tpath.top >= 10)
-			return e_syntax(ctx, lineno, "table path is too deep; max allowed is 10.");
-
-		if (ctx->tok.tok != STRING)
-			return e_syntax(ctx, lineno, "invalid or missing key");
-
-		char* key = normalize_key(ctx, ctx->tok);
-		if (!key) return -1;
-		ctx->tpath.tok[ctx->tpath.top] = ctx->tok;
-		ctx->tpath.key[ctx->tpath.top] = key;
-		ctx->tpath.top++;
-
-		if (next_token(ctx, 1)) return -1;
-
-		if (ctx->tok.tok == RBRACKET) break;
-
-		if (ctx->tok.tok != DOT)
-			return e_syntax(ctx, lineno, "invalid key");
-
-		if (next_token(ctx, 1)) return -1;
-	}
-
-	if (ctx->tpath.top <= 0)
-		return e_syntax(ctx, lineno, "empty table selector");
-
-	return 0;
-}
-
-
-/* Walk tabpath from the root, and create new tables on the way.
- * Sets ctx->curtab to the final table.
- */
-static int walk_tabpath(context_t* ctx)
-{
-	/* start from root */
-	toml_table_t* curtab = ctx->root;
-
-	for (int i = 0; i < ctx->tpath.top; i++) {
-		const char* key = ctx->tpath.key[i];
-
-		toml_keyval_t* nextval = 0;
-		toml_array_t* nextarr = 0;
-		toml_table_t* nexttab = 0;
-		switch (check_key(curtab, key, &nextval, &nextarr, &nexttab)) {
-		case 't':
-			/* found a table. nexttab is where we will go next. */
-			break;
-
-		case 'a':
-			/* found an array. nexttab is the last table in the array. */
-			if (nextarr->kind != 't')
-				return e_internal(ctx, FLINE);
-
-			if (nextarr->nitem == 0)
-				return e_internal(ctx, FLINE);
-
-			nexttab = nextarr->item[nextarr->nitem-1].tab;
-			break;
-
-		case 'v':
-			return e_keyexists(ctx, ctx->tpath.tok[i].lineno);
-
-		default:
-			{ /* Not found. Let's create an implicit table. */
-				int n = curtab->ntab;
-				toml_table_t** base = (toml_table_t**) expand_ptrarr((void**)curtab->tab, n);
-				if (0 == base)
-					return e_outofmemory(ctx, FLINE);
-
-				curtab->tab = base;
-
-				if (0 == (base[n] = (toml_table_t*) CALLOC(1, sizeof(*base[n]))))
-					return e_outofmemory(ctx, FLINE);
-
-				if (0 == (base[n]->key = STRDUP(key)))
-					return e_outofmemory(ctx, FLINE);
-
-				nexttab = curtab->tab[curtab->ntab++];
-
-				/* tabs created by walk_tabpath are considered implicit */
-				nexttab->implicit = true;
-			}
-			break;
-		}
-
-		/* switch to next tab */
-		curtab = nexttab;
-	}
-
-	/* save it */
-	ctx->curtab = curtab;
-
-	return 0;
-}
-
-
-/* handle lines like [x.y.z] or [[x.y.z]] */
-static int parse_select(context_t* ctx)
-{
-	assert(ctx->tok.tok == LBRACKET);
-
-	/* true if [[ */
-	int llb = (ctx->tok.ptr + 1 < ctx->stop && ctx->tok.ptr[1] == '[');
-	/* need to detect '[[' on our own because next_token() will skip whitespace,
-	   and '[ [' would be taken as '[[', which is wrong. */
-
-	/* eat [ or [[ */
-	if (eat_token(ctx, LBRACKET, 1, FLINE)) return -1;
-	if (llb) {
-		assert(ctx->tok.tok == LBRACKET);
-		if (eat_token(ctx, LBRACKET, 1, FLINE)) return -1;
-	}
-
-	if (fill_tabpath(ctx)) return -1;
-
-	/* For [x.y.z] or [[x.y.z]], remove z from tpath.
-	 */
-	token_t z = ctx->tpath.tok[ctx->tpath.top-1];
-	xfree(ctx->tpath.key[ctx->tpath.top-1]);
-	ctx->tpath.top--;
-
-	/* set up ctx->curtab */
-	if (walk_tabpath(ctx)) return -1;
-
-	if (! llb) {
-		/* [x.y.z] -> create z = {} in x.y */
-		toml_table_t* curtab = create_keytable_in_table(ctx, ctx->curtab, z);
-		if (!curtab) return -1;
-		ctx->curtab = curtab;
-	} else {
-		/* [[x.y.z]] -> create z = [] in x.y */
-		toml_array_t* arr = 0;
-		{
-			char* zstr = normalize_key(ctx, z);
-			if (!zstr) return -1;
-			arr = toml_array_in(ctx->curtab, zstr);
-			xfree(zstr);
-		}
-		if (!arr) {
-			arr = create_keyarray_in_table(ctx, ctx->curtab, z, 't');
-			if (!arr) return -1;
-		}
-		if (arr->kind != 't')
-			return e_syntax(ctx, z.lineno, "array mismatch");
-
-		/* add to z[] */
-		toml_table_t* dest;
-		{
-			toml_table_t* t = create_table_in_array(ctx, arr);
-			if (!t) return -1;
-
-			if (0 == (t->key = STRDUP("__anon__")))
-				return e_outofmemory(ctx, FLINE);
-
-			dest = t;
-		}
-
-		ctx->curtab = dest;
-	}
-
-	if (ctx->tok.tok != RBRACKET) {
-		return e_syntax(ctx, ctx->tok.lineno, "expects ]");
-	}
-	if (llb) {
-		if (! (ctx->tok.ptr + 1 < ctx->stop && ctx->tok.ptr[1] == ']')) {
-			return e_syntax(ctx, ctx->tok.lineno, "expects ]]");
-		}
-		if (eat_token(ctx, RBRACKET, 1, FLINE)) return -1;
-	}
-
-	if (eat_token(ctx, RBRACKET, 1, FLINE))
-		return -1;
-
-	if (ctx->tok.tok != NEWLINE)
-		return e_syntax(ctx, ctx->tok.lineno, "extra chars after ] or ]]");
-
-	return 0;
-}
-
-
-
-
-toml_table_t* toml_parse(char* conf,
-						 char* errbuf,
-						 int errbufsz)
-{
-	context_t ctx;
-
-	// clear errbuf
-	if (errbufsz <= 0) errbufsz = 0;
-	if (errbufsz > 0)  errbuf[0] = 0;
-
-	// init context
-	memset(&ctx, 0, sizeof(ctx));
-	ctx.start = conf;
-	ctx.stop = ctx.start + strlen(conf);
-	ctx.errbuf = errbuf;
-	ctx.errbufsz = errbufsz;
-
-	// start with an artificial newline of length 0
-	ctx.tok.tok = NEWLINE;
-	ctx.tok.lineno = 1;
-	ctx.tok.ptr = conf;
-	ctx.tok.len = 0;
-
-	// make a root table
-	if (0 == (ctx.root = CALLOC(1, sizeof(*ctx.root)))) {
-		e_outofmemory(&ctx, FLINE);
-		// Do not goto fail, root table not set up yet
-		return 0;
-	}
-
-	// set root as default table
-	ctx.curtab = ctx.root;
-
-	/* Scan forward until EOF */
-	for (token_t tok = ctx.tok; ! tok.eof ; tok = ctx.tok) {
-		switch (tok.tok) {
-
-		case NEWLINE:
-			if (next_token(&ctx, 1)) goto fail;
-			break;
-
-		case STRING:
-			if (parse_keyval(&ctx, ctx.curtab)) goto fail;
-
-			if (ctx.tok.tok != NEWLINE) {
-				e_syntax(&ctx, ctx.tok.lineno, "extra chars after value");
-				goto fail;
-			}
-
-			if (eat_token(&ctx, NEWLINE, 1, FLINE)) goto fail;
-			break;
-
-		case LBRACKET:	/* [ x.y.z ] or [[ x.y.z ]] */
-			if (parse_select(&ctx)) goto fail;
-			break;
-
-		default:
-			e_syntax(&ctx, tok.lineno, "syntax error");
-			goto fail;
-		}
-	}
-
-	/* success */
-	for (int i = 0; i < ctx.tpath.top; i++) xfree(ctx.tpath.key[i]);
-	return ctx.root;
-
-fail:
-	// Something bad has happened. Free resources and return error.
-	for (int i = 0; i < ctx.tpath.top; i++) xfree(ctx.tpath.key[i]);
-	toml_free(ctx.root);
-	return 0;
-}
-
-
-toml_table_t* toml_parse_file(FILE* fp,
-							  char* errbuf,
-							  int errbufsz)
-{
-	int bufsz = 0;
-	char* buf = 0;
-	int off = 0;
-
-	/* read from fp into buf */
-	while (! feof(fp)) {
-
-		if (off == bufsz) {
-			int xsz = bufsz + 1000;
-			char* x = expand(buf, bufsz, xsz);
-			if (!x) {
-				snprintf(errbuf, errbufsz, "out of memory");
-				xfree(buf);
-				return 0;
-			}
-			buf = x;
-			bufsz = xsz;
-		}
-
-		errno = 0;
-		int n = fread(buf + off, 1, bufsz - off, fp);
-		if (ferror(fp)) {
-			snprintf(errbuf, errbufsz, "%s",
-					 errno ? strerror(errno) : "Error reading file");
-			xfree(buf);
-			return 0;
-		}
-		off += n;
-	}
-
-	/* tag on a NUL to cap the string */
-	if (off == bufsz) {
-		int xsz = bufsz + 1;
-		char* x = expand(buf, bufsz, xsz);
-		if (!x) {
-			snprintf(errbuf, errbufsz, "out of memory");
-			xfree(buf);
-			return 0;
-		}
-		buf = x;
-		bufsz = xsz;
-	}
-	buf[off] = 0;
-
-	/* parse it, cleanup and finish */
-	toml_table_t* ret = toml_parse(buf, errbuf, errbufsz);
-	xfree(buf);
-	return ret;
-}
-
-
-static void xfree_kval(toml_keyval_t* p)
-{
-	if (!p) return;
-	xfree(p->key);
-	xfree(p->val);
-	xfree(p);
-}
-
-static void xfree_tab(toml_table_t* p);
-
-static void xfree_arr(toml_array_t* p)
-{
-	if (!p) return;
-
-	xfree(p->key);
-	const int n = p->nitem;
-	for (int i = 0; i < n; i++) {
-		toml_arritem_t* a = &p->item[i];
-		if (a->val)
-			xfree(a->val);
-		else if (a->arr)
-			xfree_arr(a->arr);
-		else if (a->tab)
-			xfree_tab(a->tab);
-	}
-	xfree(p->item);
-	xfree(p);
-}
-
-
-static void xfree_tab(toml_table_t* p)
-{
-	int i;
-
-	if (!p) return;
-
-	xfree(p->key);
-
-	for (i = 0; i < p->nkval; i++) xfree_kval(p->kval[i]);
-	xfree(p->kval);
-
-	for (i = 0; i < p->narr; i++) xfree_arr(p->arr[i]);
-	xfree(p->arr);
-
-	for (i = 0; i < p->ntab; i++) xfree_tab(p->tab[i]);
-	xfree(p->tab);
-
-	xfree(p);
-}
-
-
-void toml_free(toml_table_t* tab)
-{
-	xfree_tab(tab);
-}
-
-
-static void set_token(context_t* ctx, tokentype_t tok, int lineno, char* ptr, int len)
-{
-	token_t t;
-	t.tok = tok;
-	t.lineno = lineno;
-	t.ptr = ptr;
-	t.len = len;
-	t.eof = 0;
-	ctx->tok = t;
-}
-
-static void set_eof(context_t* ctx, int lineno)
-{
-	set_token(ctx, NEWLINE, lineno, ctx->stop, 0);
-	ctx->tok.eof = 1;
-}
-
-
-/* Scan p for n digits compositing entirely of [0-9] */
-static int scan_digits(const char* p, int n)
-{
-	int ret = 0;
-	for ( ; n > 0 && isdigit(*p); n--, p++) {
-		ret = 10 * ret + (*p - '0');
-	}
-	return n ? -1 : ret;
-}
-
-static int scan_date(const char* p, int* YY, int* MM, int* DD)
-{
-	int year, month, day;
-	year = scan_digits(p, 4);
-	month = (year >= 0 && p[4] == '-') ? scan_digits(p+5, 2) : -1;
-	day = (month >= 0 && p[7] == '-') ? scan_digits(p+8, 2) : -1;
-	if (YY) *YY = year;
-	if (MM) *MM = month;
-	if (DD) *DD = day;
-	return (year >= 0 && month >= 0 && day >= 0) ? 0 : -1;
-}
-
-static int scan_time(const char* p, int* hh, int* mm, int* ss)
-{
-	int hour, minute, second;
-	hour = scan_digits(p, 2);
-	minute = (hour >= 0 && p[2] == ':') ? scan_digits(p+3, 2) : -1;
-	second = (minute >= 0 && p[5] == ':') ? scan_digits(p+6, 2) : -1;
-	if (hh) *hh = hour;
-	if (mm) *mm = minute;
-	if (ss) *ss = second;
-	return (hour >= 0 && minute >= 0 && second >= 0) ? 0 : -1;
-}
-
-
-static int scan_string(context_t* ctx, char* p, int lineno, int dotisspecial)
-{
-	char* orig = p;
-	if (0 == strncmp(p, "'''", 3)) {
-		char* q = p + 3;
-
-		while (1) {
-			q = strstr(q, "'''");
-			if (0 == q) {
-				return e_syntax(ctx, lineno, "unterminated triple-s-quote");
-			}
-			while (q[3] == '\'') q++;
-			break;
-		}
-
-		set_token(ctx, STRING, lineno, orig, q + 3 - orig);
-		return 0;
-	}
-
-	if (0 == strncmp(p, "\"\"\"", 3)) {
-		char* q = p + 3;
-
-		while (1) {
-			q = strstr(q, "\"\"\"");
-			if (0 == q) {
-				return e_syntax(ctx, lineno, "unterminated triple-d-quote");
-			}
-			if (q[-1] == '\\') {
-				q++;
-				continue;
-			}
-			while (q[3] == '\"') q++;
-			break;
-		}
-
-		// the string is [p+3, q-1]
-
-		int hexreq = 0;		/* #hex required */
-		int escape = 0;
-		for (p += 3; p < q; p++) {
-			if (escape) {
-				escape = 0;
-				if (strchr("btnfr\"\\", *p)) continue;
-				if (*p == 'u') { hexreq = 4; continue; }
-				if (*p == 'U') { hexreq = 8; continue; }
-				if (p[strspn(p, " \t\r")] == '\n') continue; /* allow for line ending backslash */
-				return e_syntax(ctx, lineno, "bad escape char");
-			}
-			if (hexreq) {
-				hexreq--;
-				if (strchr("0123456789ABCDEF", *p)) continue;
-				return e_syntax(ctx, lineno, "expect hex char");
-			}
-			if (*p == '\\') { escape = 1; continue; }
-		}
-		if (escape)
-			return e_syntax(ctx, lineno, "expect an escape char");
-		if (hexreq)
-			return e_syntax(ctx, lineno, "expected more hex char");
-
-		set_token(ctx, STRING, lineno, orig, q + 3 - orig);
-		return 0;
-	}
-
-	if ('\'' == *p) {
-		for (p++; *p && *p != '\n' && *p != '\''; p++);
-		if (*p != '\'') {
-			return e_syntax(ctx, lineno, "unterminated s-quote");
-		}
-
-		set_token(ctx, STRING, lineno, orig, p + 1 - orig);
-		return 0;
-	}
-
-	if ('\"' == *p) {
-		int hexreq = 0;		/* #hex required */
-		int escape = 0;
-		for (p++; *p; p++) {
-			if (escape) {
-				escape = 0;
-				if (strchr("btnfr\"\\", *p)) continue;
-				if (*p == 'u') { hexreq = 4; continue; }
-				if (*p == 'U') { hexreq = 8; continue; }
-				return e_syntax(ctx, lineno, "bad escape char");
-			}
-			if (hexreq) {
-				hexreq--;
-				if (strchr("0123456789ABCDEF", *p)) continue;
-				return e_syntax(ctx, lineno, "expect hex char");
-			}
-			if (*p == '\\') { escape = 1; continue; }
-			if (*p == '\'') {
-				if (p[1] == '\'' && p[2] == '\'') {
-					return e_syntax(ctx, lineno, "triple-s-quote inside string lit");
-				}
-				continue;
-			}
-			if (*p == '\n') break;
-			if (*p == '"')  break;
-		}
-		if (*p != '"') {
-			return e_syntax(ctx, lineno, "unterminated quote");
-		}
-
-		set_token(ctx, STRING, lineno, orig, p + 1 - orig);
-		return 0;
-	}
-
-	/* check for timestamp without quotes */
-	if (0 == scan_date(p, 0, 0, 0) || 0 == scan_time(p, 0, 0, 0)) {
-		// forward thru the timestamp
-		for ( ; strchr("0123456789.:+-T Z", toupper(*p)); p++);
-		// squeeze out any spaces at end of string
-		for ( ; p[-1] == ' '; p--);
-		// tokenize
-		set_token(ctx, STRING, lineno, orig, p - orig);
-		return 0;
-	}
-
-	/* literals */
-	for ( ; *p && *p != '\n'; p++) {
-		int ch = *p;
-		if (ch == '.' && dotisspecial) break;
-		if ('A' <= ch && ch <= 'Z') continue;
-		if ('a' <= ch && ch <= 'z') continue;
-		if (strchr("0123456789+-_.", ch)) continue;
-		break;
-	}
-
-	set_token(ctx, STRING, lineno, orig, p - orig);
-	return 0;
-}
-
-
-static int next_token(context_t* ctx, int dotisspecial)
-{
-	int	  lineno = ctx->tok.lineno;
-	char* p = ctx->tok.ptr;
-	int i;
-
-	/* eat this tok */
-	for (i = 0; i < ctx->tok.len; i++) {
-		if (*p++ == '\n')
-			lineno++;
-	}
-
-	/* make next tok */
-	while (p < ctx->stop) {
-		/* skip comment. stop just before the \n. */
-		if (*p == '#') {
-			for (p++; p < ctx->stop && *p != '\n'; p++);
-			continue;
-		}
-
-		if (dotisspecial && *p == '.') {
-			set_token(ctx, DOT, lineno, p, 1);
-			return 0;
-		}
-
-		switch (*p) {
-		case ',': set_token(ctx, COMMA, lineno, p, 1); return 0;
-		case '=': set_token(ctx, EQUAL, lineno, p, 1); return 0;
-		case '{': set_token(ctx, LBRACE, lineno, p, 1); return 0;
-		case '}': set_token(ctx, RBRACE, lineno, p, 1); return 0;
-		case '[': set_token(ctx, LBRACKET, lineno, p, 1); return 0;
-		case ']': set_token(ctx, RBRACKET, lineno, p, 1); return 0;
-		case '\n': set_token(ctx, NEWLINE, lineno, p, 1); return 0;
-		case '\r': case ' ': case '\t':
-			/* ignore white spaces */
-			p++;
-			continue;
-		}
-
-		return scan_string(ctx, p, lineno, dotisspecial);
-	}
-
-	set_eof(ctx, lineno);
-	return 0;
-}
-
-
-const char* toml_key_in(const toml_table_t* tab, int keyidx)
-{
-	if (keyidx < tab->nkval) return tab->kval[keyidx]->key;
-
-	keyidx -= tab->nkval;
-	if (keyidx < tab->narr)	 return tab->arr[keyidx]->key;
-
-	keyidx -= tab->narr;
-	if (keyidx < tab->ntab)	 return tab->tab[keyidx]->key;
-
-	return 0;
-}
-
-toml_raw_t toml_raw_in(const toml_table_t* tab, const char* key)
-{
-	int i;
-	for (i = 0; i < tab->nkval; i++) {
-		if (0 == strcmp(key, tab->kval[i]->key))
-			return tab->kval[i]->val;
-	}
-	return 0;
-}
-
-toml_array_t* toml_array_in(const toml_table_t* tab, const char* key)
-{
-	int i;
-	for (i = 0; i < tab->narr; i++) {
-		if (0 == strcmp(key, tab->arr[i]->key))
-			return tab->arr[i];
-	}
-	return 0;
-}
-
-
-toml_table_t* toml_table_in(const toml_table_t* tab, const char* key)
-{
-	int i;
-	for (i = 0; i < tab->ntab; i++) {
-		if (0 == strcmp(key, tab->tab[i]->key))
-			return tab->tab[i];
-	}
-	return 0;
-}
-
-toml_raw_t toml_raw_at(const toml_array_t* arr, int idx)
-{
-	return (0 <= idx && idx < arr->nitem) ? arr->item[idx].val : 0;
-}
-
-char toml_array_kind(const toml_array_t* arr)
-{
-	return arr->kind;
-}
-
-char toml_array_type(const toml_array_t* arr)
-{
-	if (arr->kind != 'v')
-		return 0;
-
-	if (arr->nitem == 0)
-		return 0;
-
-	return arr->type;
-}
-
-
-int toml_array_nelem(const toml_array_t* arr)
-{
-	return arr->nitem;
-}
-
-const char* toml_array_key(const toml_array_t* arr)
-{
-	return arr ? arr->key : (const char*) NULL;
-}
-
-int toml_table_nkval(const toml_table_t* tab)
-{
-	return tab->nkval;
-}
-
-int toml_table_narr(const toml_table_t* tab)
-{
-	return tab->narr;
-}
-
-int toml_table_ntab(const toml_table_t* tab)
-{
-	return tab->ntab;
-}
-
-const char* toml_table_key(const toml_table_t* tab)
-{
-	return tab ? tab->key : (const char*) NULL;
-}
-
-toml_array_t* toml_array_at(const toml_array_t* arr, int idx)
-{
-	return (0 <= idx && idx < arr->nitem) ? arr->item[idx].arr : 0;
-}
-
-toml_table_t* toml_table_at(const toml_array_t* arr, int idx)
-{
-	return (0 <= idx && idx < arr->nitem) ? arr->item[idx].tab : 0;
-}
-
-
-int toml_rtots(toml_raw_t src_, toml_timestamp_t* ret)
-{
-	if (! src_) return -1;
-
-	const char* p = src_;
-	int must_parse_time = 0;
-
-	memset(ret, 0, sizeof(*ret));
-
-	int* year = &ret->__buffer.year;
-	int* month = &ret->__buffer.month;
-	int* day = &ret->__buffer.day;
-	int* hour = &ret->__buffer.hour;
-	int* minute = &ret->__buffer.minute;
-	int* second = &ret->__buffer.second;
-	int* millisec = &ret->__buffer.millisec;
-
-	/* parse date YYYY-MM-DD */
-	if (0 == scan_date(p, year, month, day)) {
-		ret->year = year;
-		ret->month = month;
-		ret->day = day;
-
-		p += 10;
-		if (*p) {
-			// parse the T or space separator
-			if (*p != 'T' && *p != ' ') return -1;
-			must_parse_time = 1;
-			p++;
-		}
-	}
-
-	/* parse time HH:MM:SS */
-	if (0 == scan_time(p, hour, minute, second)) {
-		ret->hour	= hour;
-		ret->minute = minute;
-		ret->second = second;
-
-		/* optionally, parse millisec */
-		p += 8;
-		if (*p == '.') {
-			char* qq;
-			p++;
-			errno = 0;
-			*millisec = strtol(p, &qq, 0);
-			if (errno) {
-				return -1;
-			}
-			while (*millisec > 999) {
-				*millisec /= 10;
-			}
-
-			ret->millisec = millisec;
-			p = qq;
-		}
-
-		if (*p) {
-			/* parse and copy Z */
-			char* z = ret->__buffer.z;
-			ret->z = z;
-			if (*p == 'Z' || *p == 'z') {
-				*z++ = 'Z'; p++;
-				*z = 0;
-
-			} else if (*p == '+' || *p == '-') {
-				*z++ = *p++;
-
-				if (! (isdigit(p[0]) && isdigit(p[1]))) return -1;
-				*z++ = *p++;
-				*z++ = *p++;
-
-				if (*p == ':') {
-					*z++ = *p++;
-
-					if (! (isdigit(p[0]) && isdigit(p[1]))) return -1;
-					*z++ = *p++;
-					*z++ = *p++;
-				}
-
-				*z = 0;
-			}
-		}
-	}
-	if (*p != 0)
-		return -1;
-
-	if (must_parse_time && !ret->hour)
-		return -1;
-
-	return 0;
-}
-
-
-/* Raw to boolean */
-int toml_rtob(toml_raw_t src, int* ret_)
-{
-	if (!src) return -1;
-	int dummy;
-	int* ret = ret_ ? ret_ : &dummy;
-
-	if (0 == strcmp(src, "true")) {
-		*ret = 1;
-		return 0;
-	}
-	if (0 == strcmp(src, "false")) {
-		*ret = 0;
-		return 0;
-	}
-	return -1;
-}
-
-
-/* Raw to integer */
-int toml_rtoi(toml_raw_t src, int64_t* ret_)
-{
-	if (!src) return -1;
-
-	char buf[100];
-	char* p = buf;
-	char* q = p + sizeof(buf);
-	const char* s = src;
-	int base = 0;
-	int64_t dummy;
-	int64_t* ret = ret_ ? ret_ : &dummy;
-
-
-	/* allow +/- */
-	if (s[0] == '+' || s[0] == '-')
-		*p++ = *s++;
-
-	/* disallow +_100 */
-	if (s[0] == '_')
-		return -1;
-
-	/* if 0 ... */
-	if ('0' == s[0]) {
-		switch (s[1]) {
-		case 'x': base = 16; s += 2; break;
-		case 'o': base = 8; s += 2; break;
-		case 'b': base = 2; s += 2; break;
-		case '\0': return *ret = 0, 0;
-		default:
-			/* ensure no other digits after it */
-			if (s[1]) return -1;
-		}
-	}
-
-	/* just strip underscores and pass to strtoll */
-	while (*s && p < q) {
-		int ch = *s++;
-		switch (ch) {
-		case '_':
-			// disallow '__'
-			if (s[0] == '_') return -1;
-			continue;			/* skip _ */
-		default:
-			break;
-		}
-		*p++ = ch;
-	}
-	if (*s || p == q) return -1;
-
-	/* last char cannot be '_' */
-	if (s[-1] == '_') return -1;
-
-	/* cap with NUL */
-	*p = 0;
-
-	/* Run strtoll on buf to get the integer */
-	char* endp;
-	errno = 0;
-	*ret = strtoll(buf, &endp, base);
-	return (errno || *endp) ? -1 : 0;
-}
-
-
-int toml_rtod_ex(toml_raw_t src, double* ret_, char* buf, int buflen)
-{
-	if (!src) return -1;
-
-	char* p = buf;
-	char* q = p + buflen;
-	const char* s = src;
-	double dummy;
-	double* ret = ret_ ? ret_ : &dummy;
-
-
-	/* allow +/- */
-	if (s[0] == '+' || s[0] == '-')
-		*p++ = *s++;
-
-	/* disallow +_1.00 */
-	if (s[0] == '_')
-		return -1;
-
-	/* decimal point, if used, must be surrounded by at least one digit on each side */
-	{
-		char* dot = strchr(s, '.');
-		if (dot) {
-			if (dot == s || !isdigit(dot[-1]) || !isdigit(dot[1]))
-				return -1;
-		}
-	}
-
-	/* zero must be followed by . or 'e', or NUL */
-	if (s[0] == '0' && s[1] && !strchr("eE.", s[1]))
-		return -1;
-
-	/* just strip underscores and pass to strtod */
-	while (*s && p < q) {
-		int ch = *s++;
-		if (ch == '_') {
-			// disallow '__'
-			if (s[0] == '_') return -1;
-			// disallow last char '_'
-			if (s[0] == 0) return -1;
-			continue;			/* skip _ */
-		}
-		*p++ = ch;
-	}
-	if (*s || p == q) return -1; /* reached end of string or buffer is full? */
-
-	/* cap with NUL */
-	*p = 0;
-
-	/* Run strtod on buf to get the value */
-	char* endp;
-	errno = 0;
-	*ret = strtod(buf, &endp);
-	return (errno || *endp) ? -1 : 0;
-}
-
-int toml_rtod(toml_raw_t src, double* ret_)
-{
-	char buf[100];
-	return toml_rtod_ex(src, ret_, buf, sizeof(buf));
-}
-
-
-
-
-int toml_rtos(toml_raw_t src, char** ret)
-{
-	int multiline = 0;
-	const char* sp;
-	const char* sq;
-
-	*ret = 0;
-	if (!src) return -1;
-
-	int qchar = src[0];
-	int srclen = strlen(src);
-	if (! (qchar == '\'' || qchar == '"')) {
-		return -1;
-	}
-
-	// triple quotes?
-	if (qchar == src[1] && qchar == src[2]) {
-		multiline = 1;
-		sp = src + 3;
-		sq = src + srclen - 3;
-		/* last 3 chars in src must be qchar */
-		if (! (sp <= sq && sq[0] == qchar && sq[1] == qchar && sq[2] == qchar))
-			return -1;
-
-		/* skip new line immediate after qchar */
-		if (sp[0] == '\n')
-			sp++;
-		else if (sp[0] == '\r' && sp[1] == '\n')
-			sp += 2;
-
-	} else {
-		sp = src + 1;
-		sq = src + srclen - 1;
-		/* last char in src must be qchar */
-		if (! (sp <= sq && *sq == qchar))
-			return -1;
-	}
-
-	if (qchar == '\'') {
-		*ret = norm_lit_str(sp, sq - sp,
-							multiline,
-							0, 0);
-	} else {
-		*ret = norm_basic_str(sp, sq - sp,
-							  multiline,
-							  0, 0);
-	}
-
-	return *ret ? 0 : -1;
-}
-
-
-toml_datum_t toml_string_at(const toml_array_t* arr, int idx)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtos(toml_raw_at(arr, idx), &ret.u.s));
-	return ret;
-}
-
-toml_datum_t toml_bool_at(const toml_array_t* arr, int idx)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtob(toml_raw_at(arr, idx), &ret.u.b));
-	return ret;
-}
-
-toml_datum_t toml_int_at(const toml_array_t* arr, int idx)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtoi(toml_raw_at(arr, idx), &ret.u.i));
-	return ret;
-}
-
-toml_datum_t toml_double_at(const toml_array_t* arr, int idx)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtod(toml_raw_at(arr, idx), &ret.u.d));
-	return ret;
-}
-
-toml_datum_t toml_timestamp_at(const toml_array_t* arr, int idx)
-{
-	toml_timestamp_t ts;
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtots(toml_raw_at(arr, idx), &ts));
-	if (ret.ok) {
-		ret.ok = !!(ret.u.ts = malloc(sizeof(*ret.u.ts)));
-		if (ret.ok) {
-			*ret.u.ts = ts;
-			if (ret.u.ts->year) ret.u.ts->year = &ret.u.ts->__buffer.year;
-			if (ret.u.ts->month) ret.u.ts->month = &ret.u.ts->__buffer.month;
-			if (ret.u.ts->day) ret.u.ts->day = &ret.u.ts->__buffer.day;
-			if (ret.u.ts->hour) ret.u.ts->hour = &ret.u.ts->__buffer.hour;
-			if (ret.u.ts->minute) ret.u.ts->minute = &ret.u.ts->__buffer.minute;
-			if (ret.u.ts->second) ret.u.ts->second = &ret.u.ts->__buffer.second;
-			if (ret.u.ts->millisec) ret.u.ts->millisec = &ret.u.ts->__buffer.millisec;
-			if (ret.u.ts->z) ret.u.ts->z = ret.u.ts->__buffer.z;
-		}
-	}
-	return ret;
-}
-
-toml_datum_t toml_string_in(const toml_table_t* arr, const char* key)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	toml_raw_t raw = toml_raw_in(arr, key);
-	if (raw) {
-		ret.ok = (0 == toml_rtos(raw, &ret.u.s));
-	}
-	return ret;
-}
-
-toml_datum_t toml_bool_in(const toml_table_t* arr, const char* key)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtob(toml_raw_in(arr, key), &ret.u.b));
-	return ret;
-}
-
-toml_datum_t toml_int_in(const toml_table_t* arr, const char* key)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtoi(toml_raw_in(arr, key), &ret.u.i));
-	return ret;
-}
-
-toml_datum_t toml_double_in(const toml_table_t* arr, const char* key)
-{
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtod(toml_raw_in(arr, key), &ret.u.d));
-	return ret;
-}
-
-toml_datum_t toml_timestamp_in(const toml_table_t* arr, const char* key)
-{
-	toml_timestamp_t ts;
-	toml_datum_t ret;
-	memset(&ret, 0, sizeof(ret));
-	ret.ok = (0 == toml_rtots(toml_raw_in(arr, key), &ts));
-	if (ret.ok) {
-		ret.ok = !!(ret.u.ts = malloc(sizeof(*ret.u.ts)));
-		if (ret.ok) {
-			*ret.u.ts = ts;
-			if (ret.u.ts->year) ret.u.ts->year = &ret.u.ts->__buffer.year;
-			if (ret.u.ts->month) ret.u.ts->month = &ret.u.ts->__buffer.month;
-			if (ret.u.ts->day) ret.u.ts->day = &ret.u.ts->__buffer.day;
-			if (ret.u.ts->hour) ret.u.ts->hour = &ret.u.ts->__buffer.hour;
-			if (ret.u.ts->minute) ret.u.ts->minute = &ret.u.ts->__buffer.minute;
-			if (ret.u.ts->second) ret.u.ts->second = &ret.u.ts->__buffer.second;
-			if (ret.u.ts->millisec) ret.u.ts->millisec = &ret.u.ts->__buffer.millisec;
-			if (ret.u.ts->z) ret.u.ts->z = ret.u.ts->__buffer.z;
-		}
-	}
-	return ret;
-}
diff --git a/libraries/tomlplusplus b/libraries/tomlplusplus
new file mode 160000
+Subproject 4b166b69f28e70a416a1a04a98f365d2aeb90de
diff --git a/nix/default.nix b/nix/default.nix
index 42ddda18..88b540ab 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -21,6 +21,7 @@
 , self
 , version
 , libnbtplusplus
+, tomlplusplus
 , enableLTO ? false
 }:
 
@@ -59,6 +60,11 @@ stdenv.mkDerivation rec {
     mkdir source/libraries/libnbtplusplus
     cp -a ${libnbtplusplus}/* source/libraries/libnbtplusplus
     chmod a+r+w source/libraries/libnbtplusplus/*
+    # Copy tomlplusplus
+    rm -rf source/libraries/tomlplusplus
+    mkdir source/libraries/tomlplusplus
+    cp -a ${tomlplusplus}/* source/libraries/tomlplusplus
+    chmod a+r+w source/libraries/tomlplusplus/*
   '';
 
   cmakeFlags = [