Fix StringLiteral operator+() for characters

Author: oblivioncth

lib/utility/include/qx/utility/qx-stringliteral.h

@@ -160,7 +160,7 @@ constexpr auto operator+(const typename S::data_t (&a)[N1], const S& b) { return
  *  Returns a string which is the result of concatenating @a a and @a b.
  */
 template<string_literal S>
-constexpr auto operator+(const S& a, typename S::data_t b) { return operator+(a, {b}); }
+constexpr auto operator+(const S& a, typename S::data_t b) { return operator+(a, {b, '\0'}); }
 
 // Doc'ed here cause doxygen is finicky
 /*!
@@ -169,7 +169,7 @@ constexpr auto operator+(const S& a, typename S::data_t b) { return operator+(a,
  *  Returns a string which is the result of concatenating @a a and @a b.
  */
 template<string_literal S>
-constexpr auto operator+(typename S::data_t a, const S& b) { return operator+({a}, b); }
+constexpr auto operator+(typename S::data_t a, const S& b) { return operator+({a, '\0'}, b); }
 
 /* TOOO: We use derivations here instead of template aliases as parameter deduction for aliases
  * (what allows the parameter to deduce the character type and size just based on the

lib/utility/src/qx-stringliteral.dox

@@ -51,6 +51,10 @@ namespace Qx
  * @fn StringLiteral::StringLiteral(const C (&str)[N])
  *
  *  Wraps the raw string @a str of length @a N.
+ *
+ *  @warning If preparing a character array manually, be sure to included a null-terminator as its presence
+ *  is assumed! If none is provided, the "size" members will report incorrect values and concatenation will
+ *  result in UB.
  */
 
 //-Instance Functions----------------------------------------------------------------------------------------------------
@@ -149,9 +153,9 @@ namespace Qx
 //-Constructor-------------------------------------------------------------------------------------------------
 //Public:
 /*!
- * @fn CStringLiteral::CStringLiteral(const char (&str)[N])
+ *  @fn CStringLiteral::CStringLiteral(const char (&str)[N])
  *
- *  Wraps the raw string @a str of length @a N.
+ *  @copydoc StringLiteral::StringLiteral(const C (&str)[N])
  */
 
 //===============================================================================================================
@@ -168,9 +172,9 @@ namespace Qx
 //-Constructor-------------------------------------------------------------------------------------------------
 //Public:
 /*!
- * @fn WStringLiteral::WStringLiteral(const wchar_t (&str)[N])
+ *  @fn WStringLiteral::WStringLiteral(const wchar_t (&str)[N])
  *
- *  Wraps the raw string @a str of length @a N.
+ *  @copydoc StringLiteral::StringLiteral(const C (&str)[N])
  */
 
 //===============================================================================================================
@@ -187,9 +191,9 @@ namespace Qx
 //-Constructor-------------------------------------------------------------------------------------------------
 //Public:
 /*!
- * @fn U8StringLiteral::U8StringLiteral(const char8_t (&str)[N])
+ *  @fn U8StringLiteral::U8StringLiteral(const char8_t (&str)[N])
  *
- *  Wraps the raw string @a str of length @a N.
+ *  @copydoc StringLiteral::StringLiteral(const C (&str)[N])
  */
 
 //===============================================================================================================
@@ -206,9 +210,9 @@ namespace Qx
 //-Constructor-------------------------------------------------------------------------------------------------
 //Public:
 /*!
- * @fn U16StringLiteral::U16StringLiteral(const char16_t (&str)[N])
+ *  @fn U16StringLiteral::U16StringLiteral(const char16_t (&str)[N])
  *
- *  Wraps the raw string @a str of length @a N.
+ *  @copydoc StringLiteral::StringLiteral(const C (&str)[N])
  */
 
 //===============================================================================================================
@@ -225,8 +229,8 @@ namespace Qx
 //-Constructor-------------------------------------------------------------------------------------------------
 //Public:
 /*!
- * @fn U32StringLiteral::U32StringLiteral(const char32_t (&str)[N])
+ *  @fn U32StringLiteral::U32StringLiteral(const char32_t (&str)[N])
  *
- *  Wraps the raw string @a str of length @a N.
+ *  @copydoc StringLiteral::StringLiteral(const C (&str)[N])
  */
 }