From 4eed3e5ca0aa7522e18e54f3b0cdbdaf899f7ce9 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 5 Feb 2019 03:09:40 -0800 Subject: [PATCH] ircd::m::id: Minor reorg. --- include/ircd/m/id.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/ircd/m/id.h b/include/ircd/m/id.h index 09ff5d1f9..d4d3cbb18 100644 --- a/include/ircd/m/id.h +++ b/include/ircd/m/id.h @@ -83,6 +83,25 @@ struct ircd::m::id id() = default; }; +// Utilities +namespace ircd::m +{ + // Check if any sigil + bool is_sigil(const char &c) noexcept; + bool has_sigil(const string_view &) noexcept; + + // Interpret sigil type (or throw) + id::sigil sigil(const char &c); + id::sigil sigil(const string_view &id); + string_view reflect(const id::sigil &); + + // Full ID checks + bool valid(const id::sigil &, const string_view &) noexcept; + bool valid_local(const id::sigil &, const string_view &) noexcept; // Local part is valid + bool valid_local_only(const id::sigil &, const string_view &) noexcept; // No :host + void validate(const id::sigil &, const string_view &); // valid() | throws +} + /// (4.2) The sigil characters enum ircd::m::id::sigil :char @@ -244,25 +263,6 @@ struct ircd::m::id::node node() = default; }; -// Utilities -namespace ircd::m -{ - // Check if any sigil - bool is_sigil(const char &c) noexcept; - bool has_sigil(const string_view &) noexcept; - - // Interpret sigil type (or throw) - id::sigil sigil(const char &c); - id::sigil sigil(const string_view &id); - string_view reflect(const id::sigil &); - - // Full ID checks - bool valid(const id::sigil &, const string_view &) noexcept; - bool valid_local(const id::sigil &, const string_view &) noexcept; // Local part is valid - bool valid_local_only(const id::sigil &, const string_view &) noexcept; // No :host - void validate(const id::sigil &, const string_view &); // valid() | throws -} - /// ID object backed by an internal buffer of default worst-case size. /// template