From e5180acf5f2dfac788e8c12886095ed1ac66fae5 Mon Sep 17 00:00:00 2001
From: Lexi Winter <lexi@le-fay.org>
Date: Sun, 29 Jun 2025 00:52:39 +0100
Subject: cli: improve path handling

---
 nihil.cli/command_tree.cc  | 25 ++++++++-----------------
 nihil.cli/command_tree.ccm |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/nihil.cli/command_tree.cc b/nihil.cli/command_tree.cc
index 4142a40..7cea8da 100644
--- a/nihil.cli/command_tree.cc
+++ b/nihil.cli/command_tree.cc
@@ -59,7 +59,7 @@ auto command_tree_node::get_child(this command_tree_node &self,
 }
 
 auto command_tree_node::get_or_create_child(this command_tree_node &self,
-				       std::string_view child)
+					    std::string_view child)
 	-> command_tree_node *
 {
 	// Return the existing child, if there is one.
@@ -72,8 +72,11 @@ auto command_tree_node::get_or_create_child(this command_tree_node &self,
 				command_tree_node(&self, child));
 
 	// Give the child a dummy command.
-	it->second.m_command = std::make_shared<command_node>(
-				self.path() + ' ' + child);
+	auto path = self.m_parent != nullptr
+		? std::format("{} {}", self.m_parent->path(), child)
+		: std::string(child);
+
+	it->second.m_command = std::make_shared<command_node>(path);
 
 	return &it->second;
 }
@@ -108,21 +111,9 @@ auto command_tree_node::print_commands(this command_tree_node const &self)
 }
 
 auto command_tree_node::path(this command_tree_node const &self)
-	-> std::string
+	-> std::string_view
 {
-	auto path = std::string();
-
-	auto const *node = &self;
-	while (node->m_parent != nullptr) {
-		path = node->m_this_word + ' ' + path;
-		node = node->m_parent;
-	}
-
-	// Trim the trailing space.
-	if (!path.empty())
-		path.pop_back();
-
-	return path;
+	return self.m_command->path();
 }
 
 auto command_tree::insert(this command_tree &self,
diff --git a/nihil.cli/command_tree.ccm b/nihil.cli/command_tree.ccm
index f52b768..7297af7 100644
--- a/nihil.cli/command_tree.ccm
+++ b/nihil.cli/command_tree.ccm
@@ -62,7 +62,7 @@ struct command_tree_node final {
 	 * Get the path of this command_node.
 	 */
 	[[nodiscard]] auto path(this command_tree_node const &self)
-		-> std::string;
+		-> std::string_view;
 
 	/*
 	 * Print this node's children in a form useful to humans.
-- 
cgit v1.2.3