From b889c81cb929ee3bfbbe10c7d9c613ce3420ae89 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Tue, 15 Oct 2019 11:32:59 +0200
Subject: [PATCH] Short name added to derived unit definition

---
 src/CMakeLists.txt                            |  2 +
 src/include/units/bits/fixed_string.h         | 67 +++++++++++++++++++
 src/include/units/dimensions/acceleration.h   |  2 +-
 src/include/units/dimensions/area.h           | 14 ++--
 src/include/units/dimensions/capacitance.h    |  2 +-
 src/include/units/dimensions/current.h        |  2 +-
 .../units/dimensions/electric_charge.h        |  2 +-
 src/include/units/dimensions/energy.h         |  2 +-
 src/include/units/dimensions/force.h          |  2 +-
 src/include/units/dimensions/frequency.h      | 20 +++---
 src/include/units/dimensions/length.h         | 24 +++----
 .../units/dimensions/luminous_intensity.h     |  2 +-
 src/include/units/dimensions/mass.h           |  4 +-
 src/include/units/dimensions/power.h          |  2 +-
 src/include/units/dimensions/pressure.h       |  2 +-
 src/include/units/dimensions/substance.h      |  2 +-
 src/include/units/dimensions/temperature.h    |  2 +-
 src/include/units/dimensions/time.h           | 12 ++--
 src/include/units/dimensions/velocity.h       |  6 +-
 src/include/units/dimensions/voltage.h        |  2 +-
 src/include/units/dimensions/volume.h         | 14 ++--
 src/include/units/unit.h                      | 55 ++++++++++++---
 test/unit_test/runtime/print_helpers.h        | 13 ++--
 test/unit_test/static/custom_unit_test.cpp    |  9 +--
 24 files changed, 186 insertions(+), 78 deletions(-)
 create mode 100644 src/include/units/bits/fixed_string.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 52f68e6c..4c04161c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,6 +66,8 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
             -fconcepts
             -Wno-literal-suffix
             -Wno-non-template-friend
+# TODO gcc:92101
+            -Wno-pedantic
     )
 endif()
 add_library(mp::units ALIAS units)
diff --git a/src/include/units/bits/fixed_string.h b/src/include/units/bits/fixed_string.h
new file mode 100644
index 00000000..47df025d
--- /dev/null
+++ b/src/include/units/bits/fixed_string.h
@@ -0,0 +1,67 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2018 Mateusz Pusz
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#include <cstdlib>
+
+namespace units {
+
+//   TODO gcc:92101
+//   Gated by the following gcc bug
+//   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92101
+//
+//   template<typename CharT, std::size_t N>
+//   struct basic_fixed_string {
+//     CharT data_[N+1] = {};
+
+//     constexpr basic_fixed_string(const CharT (&txt)[N+1]) noexcept
+//     {
+//       for(std::size_t i = 0; i <= N; ++i)
+//         data_[i] = txt[i];
+//     }
+//     // auto operator==(const basic_fixed_string &) = default;
+//     [[nodiscard]] constexpr const CharT* c_str() const noexcept { return data_; }
+//   };
+
+//   template<typename CharT, std::size_t N>
+//   basic_fixed_string(const CharT (&str)[N]) -> basic_fixed_string<CharT, N-1>;
+
+//   template<std::size_t N>
+//   using fixed_string = basic_fixed_string<char, N>;
+
+  template<typename CharT, CharT... Chars>
+  struct basic_fixed_string {
+    static constexpr CharT txt[] = { Chars..., '\0' };
+
+    static constexpr const CharT* c_str() noexcept
+    {
+      return txt;
+    }
+  };
+
+  inline namespace hacks {
+
+    template<typename T, T... chars>
+    constexpr basic_fixed_string<T, chars...> operator""_fs() { return {}; }
+
+  }
+
+}
diff --git a/src/include/units/dimensions/acceleration.h b/src/include/units/dimensions/acceleration.h
index 00285a8a..de3c4a79 100644
--- a/src/include/units/dimensions/acceleration.h
+++ b/src/include/units/dimensions/acceleration.h
@@ -31,7 +31,7 @@ namespace units {
   template<typename T>
   concept Acceleration = QuantityOf<T, acceleration>;
 
-  struct metre_per_second_sq : derived_unit<metre_per_second_sq, acceleration, metre, second> {};
+  struct metre_per_second_sq : derived_unit<metre_per_second_sq, decltype("m/s^2"_fs), acceleration, metre, second> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/area.h b/src/include/units/dimensions/area.h
index 0c1dbe63..976073f8 100644
--- a/src/include/units/dimensions/area.h
+++ b/src/include/units/dimensions/area.h
@@ -31,11 +31,11 @@ namespace units {
   template<typename T>
   concept Area = QuantityOf<T, area>;
 
-  struct square_millimetre : derived_unit<square_millimetre, area, millimetre> {};
-  struct square_centimetre : derived_unit<square_centimetre, area, centimetre> {};
-  struct square_metre : derived_unit<square_metre, area, metre> {};
-  struct square_kilometre : derived_unit<square_kilometre, area, kilometre> {};
-  struct square_foot : derived_unit<square_foot, area, foot> {};
+  struct square_millimetre : derived_unit<square_millimetre, decltype("mm^2"_fs), area, millimetre> {};
+  struct square_centimetre : derived_unit<square_centimetre, decltype("cm^2"_fs), area, centimetre> {};
+  struct square_metre : derived_unit<square_metre, decltype("m^2"_fs), area, metre> {};
+  struct square_kilometre : derived_unit<square_kilometre, decltype("km^2"_fs), area, kilometre> {};
+  struct square_foot : derived_unit<square_foot, decltype("ft^2"_fs), area, foot> {};
 
   inline namespace literals {
 
@@ -55,6 +55,10 @@ namespace units {
     constexpr auto operator""sq_km(unsigned long long l) { return quantity<square_kilometre, std::int64_t>(l); }
     constexpr auto operator""sq_km(long double l) { return quantity<square_kilometre, long double>(l); }
 
+    // sq_ft
+    constexpr auto operator""sq_ft(unsigned long long l) { return quantity<square_foot, std::int64_t>(l); }
+    constexpr auto operator""sq_ft(long double l) { return quantity<square_foot, long double>(l); }
+
   }  // namespace literals
 
 }  // namespace units
diff --git a/src/include/units/dimensions/capacitance.h b/src/include/units/dimensions/capacitance.h
index b17f3e05..b5b8705e 100644
--- a/src/include/units/dimensions/capacitance.h
+++ b/src/include/units/dimensions/capacitance.h
@@ -33,7 +33,7 @@ namespace units {
   template<typename T>
   concept Capacitance =  QuantityOf<T, capacitance>;
 
-  struct farad : derived_unit<farad, capacitance, kilogram, metre, second, ampere> {};
+  struct farad : derived_unit<farad, decltype("F"_fs), capacitance, kilogram, metre, second, ampere> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/current.h b/src/include/units/dimensions/current.h
index 4c3f41c7..cb8c6c82 100644
--- a/src/include/units/dimensions/current.h
+++ b/src/include/units/dimensions/current.h
@@ -32,7 +32,7 @@ namespace units {
   template<typename T>
   concept Current = QuantityOf<T, current>;
 
-  struct ampere : derived_unit<ampere, current> {};
+  struct ampere : derived_unit<ampere, decltype("A"_fs), current> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/electric_charge.h b/src/include/units/dimensions/electric_charge.h
index 1044bb31..173871c8 100644
--- a/src/include/units/dimensions/electric_charge.h
+++ b/src/include/units/dimensions/electric_charge.h
@@ -33,7 +33,7 @@ namespace units {
   template<typename T>
   concept ElectricCharge =  QuantityOf<T, electric_charge>;
 
-  struct coulomb : derived_unit<coulomb, electric_charge, second, ampere> {};
+  struct coulomb : derived_unit<coulomb, decltype("C"_fs), electric_charge, second, ampere> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/energy.h b/src/include/units/dimensions/energy.h
index 67e4e198..912a5d0d 100644
--- a/src/include/units/dimensions/energy.h
+++ b/src/include/units/dimensions/energy.h
@@ -33,7 +33,7 @@ namespace units {
   template<typename T>
   concept Energy =  QuantityOf<T, energy>;
 
-  struct joule : derived_unit<joule, energy, kilogram, metre, second> {};
+  struct joule : derived_unit<joule, decltype("J"_fs), energy, kilogram, metre, second> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/force.h b/src/include/units/dimensions/force.h
index db67eccb..eaefeac4 100644
--- a/src/include/units/dimensions/force.h
+++ b/src/include/units/dimensions/force.h
@@ -33,7 +33,7 @@ namespace units {
   template<typename T>
   concept Force =  QuantityOf<T, force>;
 
-  struct newton : derived_unit<newton, force, kilogram, metre, second> {};
+  struct newton : derived_unit<newton, decltype("N"_fs), force, kilogram, metre, second> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/frequency.h b/src/include/units/dimensions/frequency.h
index b5151b56..60aeab12 100644
--- a/src/include/units/dimensions/frequency.h
+++ b/src/include/units/dimensions/frequency.h
@@ -32,23 +32,23 @@ namespace units {
   template<typename T>
   concept Frequency =  QuantityOf<T, frequency>;
 
-  struct hertz : derived_unit<hertz, frequency, second> {};
-  struct millihertz : derived_unit<millihertz, milli<hertz>> {};
-  struct kilohertz : derived_unit<kilohertz, kilo<hertz>> {};
-  struct megahertz : derived_unit<megahertz, mega<hertz>> {};
-  struct gigahertz : derived_unit<gigahertz, giga<hertz>> {};
-  struct terahertz : derived_unit<terahertz, tera<hertz>> {};
+  struct hertz : derived_unit<hertz, decltype("Hz"_fs), frequency, second> {};
+  struct millihertz : derived_unit<millihertz, decltype("mHz"_fs), milli<hertz>> {};
+  struct kilohertz : derived_unit<kilohertz, decltype("kHz"_fs), kilo<hertz>> {};
+  struct megahertz : derived_unit<megahertz, decltype("MHz"_fs), mega<hertz>> {};
+  struct gigahertz : derived_unit<gigahertz, decltype("GHz"_fs), giga<hertz>> {};
+  struct terahertz : derived_unit<terahertz, decltype("THz"_fs), tera<hertz>> {};
 
   inline namespace literals {
 
-    // mHz
-    constexpr auto operator""mHz(unsigned long long l) { return quantity<millihertz, std::int64_t>(l); }
-    constexpr auto operator""mHz(long double l) { return quantity<millihertz, long double>(l); }
-
     // Hz
     constexpr auto operator""Hz(unsigned long long l) { return quantity<hertz, std::int64_t>(l); }
     constexpr auto operator""Hz(long double l) { return quantity<hertz, long double>(l); }
 
+    // mHz
+    constexpr auto operator""mHz(unsigned long long l) { return quantity<millihertz, std::int64_t>(l); }
+    constexpr auto operator""mHz(long double l) { return quantity<millihertz, long double>(l); }
+
     // kHz
     constexpr auto operator""kHz(unsigned long long l) { return quantity<kilohertz, std::int64_t>(l); }
     constexpr auto operator""kHz(long double l) { return quantity<kilohertz, long double>(l); }
diff --git a/src/include/units/dimensions/length.h b/src/include/units/dimensions/length.h
index 1c6a0126..d43d1841 100644
--- a/src/include/units/dimensions/length.h
+++ b/src/include/units/dimensions/length.h
@@ -33,13 +33,17 @@ namespace units {
   concept Length = QuantityOf<T, length>;
 
   // SI units
-  struct metre : derived_unit<metre, length> {};
-  struct millimetre : derived_unit<millimetre, milli<metre>> {};
-  struct centimetre : derived_unit<centimetre, centi<metre>> {};
-  struct kilometre : derived_unit<kilometre, kilo<metre>> {};
+  struct metre : derived_unit<metre, decltype("m"_fs), length> {};
+  struct millimetre : derived_unit<millimetre, decltype("mm"_fs), milli<metre>> {};
+  struct centimetre : derived_unit<centimetre, decltype("cm"_fs), centi<metre>> {};
+  struct kilometre : derived_unit<kilometre, decltype("km"_fs), kilo<metre>> {};
 
   inline namespace literals {
 
+    // m
+    constexpr auto operator""m(unsigned long long l) { return quantity<metre, std::int64_t>(l); }
+    constexpr auto operator""m(long double l) { return quantity<metre, long double>(l); }
+
     // mm
     constexpr auto operator""mm(unsigned long long l) { return quantity<millimetre, std::int64_t>(l); }
     constexpr auto operator""mm(long double l) { return quantity<millimetre, long double>(l); }
@@ -48,10 +52,6 @@ namespace units {
     constexpr auto operator""cm(unsigned long long l) { return quantity<centimetre, std::int64_t>(l); }
     constexpr auto operator""cm(long double l) { return quantity<centimetre, long double>(l); }
 
-    // m
-    constexpr auto operator""m(unsigned long long l) { return quantity<metre, std::int64_t>(l); }
-    constexpr auto operator""m(long double l) { return quantity<metre, long double>(l); }
-
     // km
     constexpr auto operator""km(unsigned long long l) { return quantity<kilometre, std::int64_t>(l); }
     constexpr auto operator""km(long double l) { return quantity<kilometre, long double>(l); }
@@ -59,10 +59,10 @@ namespace units {
   } // namespace literals
 
   // US customary units
-  struct yard : derived_unit<yard, length, ratio<9'144, 10'000>> {};
-  struct foot : derived_unit<foot, length, ratio_multiply<ratio<1, 3>, yard::ratio>> {};
-  struct inch : derived_unit<inch, length, ratio_multiply<ratio<1, 12>, foot::ratio>> {};
-  struct mile : derived_unit<mile, length, ratio_multiply<ratio<1'760>, yard::ratio>> {};
+  struct yard : derived_unit<yard, decltype("yd"_fs), length, ratio<9'144, 10'000>> {};
+  struct foot : derived_unit<foot, decltype("ft"_fs), length, ratio_multiply<ratio<1, 3>, yard::ratio>> {};
+  struct inch : derived_unit<inch, decltype("in"_fs), length, ratio_multiply<ratio<1, 12>, foot::ratio>> {};
+  struct mile : derived_unit<mile, decltype("mi"_fs), length, ratio_multiply<ratio<1'760>, yard::ratio>> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/luminous_intensity.h b/src/include/units/dimensions/luminous_intensity.h
index 8d667ca6..c344bdef 100644
--- a/src/include/units/dimensions/luminous_intensity.h
+++ b/src/include/units/dimensions/luminous_intensity.h
@@ -32,7 +32,7 @@ namespace units {
   template<typename T>
   concept LuminousIntensity = QuantityOf<T, luminous_intensity>;
 
-  struct candela : derived_unit<candela, luminous_intensity> {};
+  struct candela : derived_unit<candela, decltype("cd"_fs), luminous_intensity> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/mass.h b/src/include/units/dimensions/mass.h
index 148eaa10..3a4c0047 100644
--- a/src/include/units/dimensions/mass.h
+++ b/src/include/units/dimensions/mass.h
@@ -32,8 +32,8 @@ namespace units {
   template<typename T>
   concept Mass = QuantityOf<T, mass>;
 
-  struct gram : derived_unit<gram, mass, ratio<1, 1000>> {};
-  struct kilogram : derived_unit<kilogram, kilo<gram>> {};
+  struct gram : derived_unit<gram, decltype("g"_fs), mass, ratio<1, 1000>> {};
+  struct kilogram : derived_unit<kilogram, decltype("kg"_fs), kilo<gram>> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/power.h b/src/include/units/dimensions/power.h
index 75b21cf1..ad76a4fa 100644
--- a/src/include/units/dimensions/power.h
+++ b/src/include/units/dimensions/power.h
@@ -32,7 +32,7 @@ namespace units {
   template<typename T>
   concept Power =  QuantityOf<T, power>;
 
-  struct watt : derived_unit<watt, power, kilogram, metre, second> {};
+  struct watt : derived_unit<watt, decltype("W"_fs), power, kilogram, metre, second> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/pressure.h b/src/include/units/dimensions/pressure.h
index cbb40ee8..5b560de3 100644
--- a/src/include/units/dimensions/pressure.h
+++ b/src/include/units/dimensions/pressure.h
@@ -33,7 +33,7 @@ namespace units {
   template<typename T>
   concept Pressure =  QuantityOf<T, pressure>;
 
-  struct pascal : derived_unit<pascal, pressure, kilogram, metre, second> {};
+  struct pascal : derived_unit<pascal, decltype("Pa"_fs), pressure, kilogram, metre, second> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/substance.h b/src/include/units/dimensions/substance.h
index 622b8d2c..a0a0eebb 100644
--- a/src/include/units/dimensions/substance.h
+++ b/src/include/units/dimensions/substance.h
@@ -32,7 +32,7 @@ namespace units {
   template<typename T>
   concept Substance = QuantityOf<T, substance>;
 
-  struct mole : derived_unit<mole, substance> {};
+  struct mole : derived_unit<mole, decltype("mol"_fs), substance> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/temperature.h b/src/include/units/dimensions/temperature.h
index 1c6a1239..a51b17dc 100644
--- a/src/include/units/dimensions/temperature.h
+++ b/src/include/units/dimensions/temperature.h
@@ -32,7 +32,7 @@ namespace units {
   template<typename T>
   concept ThermodynamicTemperature = QuantityOf<T, temperature>;
 
-  struct kelvin : derived_unit<kelvin, temperature> {};
+  struct kelvin : derived_unit<kelvin, decltype("K"_fs), temperature> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/time.h b/src/include/units/dimensions/time.h
index d031ad1c..950e120b 100644
--- a/src/include/units/dimensions/time.h
+++ b/src/include/units/dimensions/time.h
@@ -32,12 +32,12 @@ namespace units {
   template<typename T>
   concept Time = QuantityOf<T, time>;
 
-  struct second : derived_unit<second, time> {};
-  struct nanosecond : derived_unit<nanosecond, nano<second>> {};
-  struct microsecond : derived_unit<microsecond, micro<second>> {};
-  struct millisecond : derived_unit<millisecond, milli<second>> {};
-  struct minute : derived_unit<minute, time, ratio<60>> {};
-  struct hour : derived_unit<hour, time, ratio<3600>> {};
+  struct second : derived_unit<second, decltype("s"_fs), time> {};
+  struct nanosecond : derived_unit<nanosecond, decltype("ns"_fs), nano<second>> {};
+  struct microsecond : derived_unit<microsecond, decltype("us"_fs), micro<second>> {};
+  struct millisecond : derived_unit<millisecond, decltype("ms"_fs), milli<second>> {};
+  struct minute : derived_unit<minute, decltype("min"_fs), time, ratio<60>> {};
+  struct hour : derived_unit<hour, decltype("h"_fs), time, ratio<3600>> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/velocity.h b/src/include/units/dimensions/velocity.h
index 9c81a200..2b8d46f3 100644
--- a/src/include/units/dimensions/velocity.h
+++ b/src/include/units/dimensions/velocity.h
@@ -32,9 +32,9 @@ namespace units {
   template<typename T>
   concept Velocity = QuantityOf<T, velocity>;
 
-  struct metre_per_second : derived_unit<metre_per_second, velocity, metre, second> {};
-  struct kilometre_per_hour : derived_unit<kilometre_per_hour, velocity, kilometre, hour> {};
-  struct mile_per_hour : derived_unit<mile_per_hour, velocity, mile, hour> {};
+  struct metre_per_second : derived_unit<metre_per_second, decltype("m/s"_fs), velocity, metre, second> {};
+  struct kilometre_per_hour : derived_unit<kilometre_per_hour, decltype("km/h"_fs), velocity, kilometre, hour> {};
+  struct mile_per_hour : derived_unit<mile_per_hour, decltype("mi/h"_fs), velocity, mile, hour> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/voltage.h b/src/include/units/dimensions/voltage.h
index a72831fd..b06e217a 100644
--- a/src/include/units/dimensions/voltage.h
+++ b/src/include/units/dimensions/voltage.h
@@ -35,7 +35,7 @@ namespace units {
   template<typename T>
   concept Voltage =  QuantityOf<T, voltage>;
 
-  struct volt : derived_unit<volt, voltage, kilogram, metre, second, ampere> {};
+  struct volt : derived_unit<volt, decltype("V"_fs), voltage, kilogram, metre, second, ampere> {};
 
   inline namespace literals {
 
diff --git a/src/include/units/dimensions/volume.h b/src/include/units/dimensions/volume.h
index 87c51f99..247a8e34 100644
--- a/src/include/units/dimensions/volume.h
+++ b/src/include/units/dimensions/volume.h
@@ -31,11 +31,11 @@ namespace units {
   template<typename T>
   concept Volume = QuantityOf<T, volume>;
 
-  struct cubic_millimetre : derived_unit<cubic_millimetre, volume, millimetre> {};
-  struct cubic_centimetre : derived_unit<cubic_centimetre, volume, centimetre> {};
-  struct cubic_metre : derived_unit<cubic_metre, volume, metre> {};
-  struct cubic_kilometre : derived_unit<cubic_kilometre, volume, kilometre, metre> {};
-  struct cubic_foot : derived_unit<cubic_foot, volume, foot> {};
+  struct cubic_millimetre : derived_unit<cubic_millimetre, decltype("mm^3"_fs), volume, millimetre> {};
+  struct cubic_centimetre : derived_unit<cubic_centimetre, decltype("cm^3"_fs), volume, centimetre> {};
+  struct cubic_metre : derived_unit<cubic_metre, decltype("m^3"_fs), volume, metre> {};
+  struct cubic_kilometre : derived_unit<cubic_kilometre, decltype("km^3"_fs), volume, kilometre, metre> {};
+  struct cubic_foot : derived_unit<cubic_foot, decltype("ft^3"_fs), volume, foot> {};
 
   inline namespace literals {
 
@@ -55,6 +55,10 @@ namespace units {
     constexpr auto operator""cub_km(unsigned long long l) { return quantity<cubic_kilometre, std::int64_t>(l); }
     constexpr auto operator""cub_km(long double l) { return quantity<cubic_kilometre, long double>(l); }
 
+    // cub_ft
+    constexpr auto operator""cub_ft(unsigned long long l) { return quantity<cubic_foot, std::int64_t>(l); }
+    constexpr auto operator""cub_ft(long double l) { return quantity<cubic_foot, long double>(l); }
+
   }  // namespace literals
 
 }  // namespace units
diff --git a/src/include/units/unit.h b/src/include/units/unit.h
index e7f33728..4eda4538 100644
--- a/src/include/units/unit.h
+++ b/src/include/units/unit.h
@@ -24,6 +24,7 @@
 
 #include <units/dimension.h>
 #include <units/ratio.h>
+#include <units/bits/fixed_string.h>
 #include <ratio>
 
 namespace units {
@@ -115,20 +116,54 @@ namespace units {
 
   // derived_unit
 
-  template<typename Child, typename...>
+  //   TODO gcc:92101
+  // Gated by the following gcc bug
+  // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92101
+  // template<typename Child, fixed_string Name, typename...>
+  // struct derived_unit;
+  
+  // template<typename Child, fixed_string Name, Dimension D>
+  // struct derived_unit<Child, Name, D> : downcast_helper<Child, unit<D, ratio<1>>> {
+  //   static constexpr auto name = Name;
+  // };
+
+  // template<typename Child, fixed_string Name, Dimension D, Ratio R>
+  // struct derived_unit<Child, Name, D, R> : downcast_helper<Child, unit<D, R>> {
+  //   static constexpr auto name = Name;
+  // };
+
+  // template<typename Child, fixed_string Name, Unit U>
+  // struct derived_unit<Child, Name, U> : downcast_helper<Child, U> {
+  //   static constexpr auto name = Name;
+  // };
+
+  // template<typename Child, fixed_string Name, Dimension D, Unit U, Unit... Us>
+  // struct derived_unit<Child, Name, D, U, Us...> : downcast_helper<Child, detail::make_derived_unit<D, U, Us...>> {
+  //   static constexpr auto name = Name;
+  // };
+
+  template<typename Child, typename Name, typename...>
   struct derived_unit;
+  
+  template<typename Child, typename Name, Dimension D>
+  struct derived_unit<Child, Name, D> : downcast_helper<Child, unit<D, ratio<1>>> {
+    static constexpr auto name = Name::c_str();
+  };
 
-  template<typename Child, Dimension D>
-  struct derived_unit<Child, D> : downcast_helper<Child, unit<D, ratio<1>>> {};
+  template<typename Child, typename Name, Dimension D, Ratio R>
+  struct derived_unit<Child, Name, D, R> : downcast_helper<Child, unit<D, R>> {
+    static constexpr auto name = Name::c_str();
+  };
 
-  template<typename Child, Dimension D, Ratio R>
-  struct derived_unit<Child, D, R> : downcast_helper<Child, unit<D, R>> {};
+  template<typename Child, typename Name, Unit U>
+  struct derived_unit<Child, Name, U> : downcast_helper<Child, U> {
+    static constexpr auto name = Name::c_str();
+  };
 
-  template<typename Child, Unit U>
-  struct derived_unit<Child, U> : downcast_helper<Child, U> {};
-
-  template<typename Child, Dimension D, Unit U, Unit... Us>
-  struct derived_unit<Child, D, U, Us...> : downcast_helper<Child, detail::make_derived_unit<D, U, Us...>> {};
+  template<typename Child, typename Name, Dimension D, Unit U, Unit... Us>
+  struct derived_unit<Child, Name, D, U, Us...> : downcast_helper<Child, detail::make_derived_unit<D, U, Us...>> {
+    static constexpr auto name = Name::c_str();
+  };
 
   // SI prefixes
 
diff --git a/test/unit_test/runtime/print_helpers.h b/test/unit_test/runtime/print_helpers.h
index c2b6a799..8d664129 100644
--- a/test/unit_test/runtime/print_helpers.h
+++ b/test/unit_test/runtime/print_helpers.h
@@ -21,21 +21,16 @@
 // SOFTWARE.
 
 #include "units/dimensions/area.h"
+#include <ostream>
 
 // TODO Remove when a text formatting is implemented
 
 namespace units {
 
-  template<typename Rep>
-  std::ostream& operator<<(std::ostream& os, const quantity<metre, Rep>& value)
+  template<typename Unit, typename Rep>
+  std::ostream& operator<<(std::ostream& os, const quantity<Unit, Rep>& value)
   {
-    return os << value.count() << "m";
-  }
-
-  template<typename Rep>
-  std::ostream& operator<<(std::ostream& os, const quantity<square_metre, Rep>& value)
-  {
-    return os << value.count() << "m^2";
+    return os << value.count() << Unit::name;
   }
 
 }
diff --git a/test/unit_test/static/custom_unit_test.cpp b/test/unit_test/static/custom_unit_test.cpp
index f2ac51fd..e2cf5bcd 100644
--- a/test/unit_test/static/custom_unit_test.cpp
+++ b/test/unit_test/static/custom_unit_test.cpp
@@ -35,8 +35,9 @@ namespace {
   template<typename T>
   concept DigitalInformation = units::QuantityOf<T, digital_information>;
 
-  struct bit : units::derived_unit<bit, digital_information> {};
-  struct byte : units::derived_unit<byte, digital_information, units::ratio<8>> {};
+  using namespace units::hacks;
+  struct bit : units::derived_unit<bit, decltype("b"_fs), digital_information> {};
+  struct byte : units::derived_unit<byte, decltype("B"_fs), digital_information, units::ratio<8>> {};
 
   inline namespace literals {
 
@@ -61,13 +62,13 @@ namespace {
 
   // power spectral density
   struct power_spectral_density : derived_dimension<power_spectral_density, units::exp<voltage, 2>, units::exp<frequency, -1>> {};
-  struct sq_volt_per_hertz : derived_unit<sq_volt_per_hertz, power_spectral_density> {};
+  struct sq_volt_per_hertz : derived_unit<sq_volt_per_hertz, decltype("V^2/Hz"_fs), power_spectral_density> {};
 
   // amplitude spectral density
   struct amplitude_spectral_density : derived_dimension<amplitude_spectral_density, units::exp<voltage, 1>, units::exp<frequency, -1, 2>> {};
   // todo: add support for derived_unit
   //struct volt_per_sq_hertz : derived_unit<volt_per_sq_hertz, amplitude_spectral_density, volt, hertz> {};
-  struct volt_per_sqrt_hertz : derived_unit<volt_per_sqrt_hertz, amplitude_spectral_density> {};
+  struct volt_per_sqrt_hertz : derived_unit<volt_per_sqrt_hertz, decltype("V/Hz^(1/2)"_fs), amplitude_spectral_density> {};
 }
 
 namespace {