From 368b8c45162d0a5f8eb1693fa2b3e5d9dade5113 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 13 Mar 2018 16:22:47 -0700
Subject: [PATCH] ircd::m::id: Implement MXID interface suite with grammars.

---
 include/ircd/m/id.h | 10 ++---
 ircd/m/id.cc        | 94 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/include/ircd/m/id.h b/include/ircd/m/id.h
index a69ad3d51..d0d421b4d 100644
--- a/include/ircd/m/id.h
+++ b/include/ircd/m/id.h
@@ -62,11 +62,11 @@ struct ircd::m::id
 
   public:
 	// Extract elements
-	string_view local() const;
-	string_view host() const;
-	string_view name() const;
-	string_view hostname() const;
-	uint16_t hostport() const;
+	string_view local() const;        // The full localpart including sigil
+	string_view host() const;         // The full server part including port
+	string_view localname() const;    // The localpart not including sigil
+	string_view hostname() const;     // The server part not including port
+	uint16_t port() const;            // Just the port number or 8448 if none
 
 	IRCD_USING_OVERLOAD(generate, m::generate);
 
diff --git a/ircd/m/id.cc b/ircd/m/id.cc
index e4a66e087..49a9b8edc 100644
--- a/ircd/m/id.cc
+++ b/ircd/m/id.cc
@@ -122,7 +122,7 @@ struct ircd::m::id::input
 
 	//TODO: ---- share grammar with rfc3986.cc
 
-	const rule<> port
+	const rule<uint16_t> port
 	{
 		ushort_
 		,"port number"
@@ -526,52 +526,106 @@ ircd::m::id::id(const enum sigil &sigil,
 }
 
 uint16_t
-ircd::m::id::hostport()
-const try
+ircd::m::id::port()
+const
 {
-	//TODO: grammar
-	const auto port
+	static const parser::rule<uint16_t> rule
 	{
-		split(host(), ':').second
+		omit[parser.prefix >> ':' >> parser.dns_name >> ':'] >> parser.port
 	};
 
-	return port? lex_cast<uint16_t>(port) : 8448;
-}
-catch(const std::exception &e)
-{
-	return 8448;
+	uint16_t ret{8448};
+	auto *start{data()};
+	const auto res
+	{
+		qi::parse(start, data() + size(), rule, ret)
+	};
+
+	assert(res || ret == 8448);
+	return ret;
 }
 
 ircd::string_view
 ircd::m::id::hostname()
 const
 {
-	//TODO: grammar
-	return rsplit(host(), ':').first;
+	static const parser::rule<string_view> dns_name
+	{
+		parser.dns_name
+	};
+
+	static const parser::rule<string_view> rule
+	{
+		omit[parser.prefix >> ':'] >> raw[dns_name]
+	};
+
+	string_view ret;
+	auto *start{data()};
+	const auto res
+	{
+		qi::parse(start, data() + size(), rule, ret)
+	};
+
+	assert(res == true);
+	assert(!ret.empty());
+	return ret;
 }
 
 ircd::string_view
-ircd::m::id::name()
+ircd::m::id::localname()
 const
 {
-	//TODO: grammar
-	return lstrip(local(), at(0));
+	auto ret{local()};
+	assert(!ret.empty());
+	ret.pop_front();
+	return ret;
 }
 
 ircd::string_view
 ircd::m::id::host()
 const
 {
-	//TODO: grammar
-	return split(*this, ':').second;
+	static const parser::rule<string_view> server_name
+	{
+		parser.server_name
+	};
+
+	static const parser::rule<string_view> rule
+	{
+		omit[parser.prefix >> ':'] >> raw[server_name]
+	};
+
+	string_view ret;
+	auto *start{data()};
+	const auto res
+	{
+		qi::parse(start, data() + size(), rule, ret)
+	};
+
+	assert(res == true);
+	assert(!ret.empty());
+	return ret;
 }
 
 ircd::string_view
 ircd::m::id::local()
 const
 {
-	//TODO: grammar
-	return split(*this, ':').first;
+	static const parser::rule<string_view> prefix
+	{
+		parser.prefix
+	};
+
+	static const parser::rule<string_view> rule
+	{
+		eps > raw[prefix]
+	};
+
+	string_view ret;
+	auto *start{data()};
+	qi::parse(start, data() + size(), rule, ret);
+	assert(!ret.empty());
+	return ret;
 }
 
 bool