1 files changed, 10 insertions, 58 deletions

diff --git a/nihil.config/store.ccm b/nihil.config/store.ccm
index e0eebc0..77b44b5 100644
--- a/nihil.config/store.ccm
+++ b/nihil.config/store.ccm
@@ -9,12 +9,12 @@ module;
  */
 
 #include <coroutine>
-#include <filesystem>
-#include <format>
+#include <string>
 #include <map>
 
 export module nihil.config:store;
 
+import nihil;
 import :error;
 import :option;
 
@@ -22,16 +22,8 @@ namespace nihil::config {
 
 // Exception thrown on an attempt to fetch an undefined option.
 export struct unknown_option final : error {
-	unknown_option(std::string_view option_name)
-		: error(std::format("unknown configuration variable '{}'",
-				    option_name))
-		, _option_name(option_name)
-	{}
-
-	auto option_name(this unknown_option const &self) -> std::string_view
-	{
-		return self._option_name;
-	}
+	unknown_option(std::string_view option_name);
+	auto option_name(this unknown_option const &self) -> std::string_view;
 
 private:
 	std::string _option_name;
@@ -41,64 +33,27 @@ struct store final {
 	/*
 	 * Get the global config store.
 	 */
-	static auto get() -> store& {
-		if (instance == nullptr)
-			instance = new store;
-
-		return *instance;
-	}
-
+	static auto get() -> store &;
 
 	/*
 	 * Register a new value with the config store.
 	 */
-	auto register_option(this store &self, option *object) -> void
-	{
-		auto [it, okay] = self.options.insert(
-					std::pair{object->name(), object});
-
-		if (!okay)
-			throw error(std::format(
-				"INTERNAL ERROR: attempt to register "
-				"duplicate config value '{0}'",
-				object->name()));
-	}
+	auto register_option(this store &self, option *object) -> void;
 
 	/*
 	 * Remove a value from the config store.
 	 */
-	auto unregister_option(this store &self, option *object) -> void
-	{
-		auto it = self.options.find(object->name());
-		if (it == self.options.end())
-			throw error(std::format(
-				"INTERNAL ERROR: attempt to unregister "
-				"non-existent config value '{}'",
-				object->name()));
-
-		self.options.erase(it);
-	}
+	auto unregister_option(this store &self, option *object) -> void;
 
 	/*
 	 * Fetch an existing value in the config store.
 	 */
-	auto fetch(this store const &self, std::string_view name)
-		-> option &
-	{
-		if (auto it = self.options.find(name); it != self.options.end())
-			return *it->second;
-
-		throw unknown_option(name);
-	}
+	auto fetch(this store const &self, std::string_view name) -> option &;
 
 	/*
 	 * Fetch all values in the configuration store.
 	 */
-	auto all(this auto &&self) -> nihil::generator<option const &>
-	{
-		for (auto &&it : self.options)
-			co_yield *it.second;
-	}
+	auto all(this store const &self) -> nihil::generator<option const &>;
 
 	// Not movable or copyable.
 	store(store const &) = delete;
@@ -120,9 +75,6 @@ private:
 /*
  * The public API.
  */
-export auto get_option(std::string_view option_name) -> option &
-{
-	return store::get().fetch(option_name);
-}
+export auto get_option(std::string_view option_name) -> option &;
 
 } // namespace nihil::config