From 7e31dfe37eae98a219578af35c30e64a1c575ea8 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Tue, 15 Oct 2019 11:47:36 +0200
Subject: [PATCH] Name renamed to symbol in a derived_unit

---
 doc/DESIGN.md                          | 22 +++++------
 src/include/units/unit.h               | 52 +++++++++++++-------------
 test/unit_test/runtime/print_helpers.h |  2 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/doc/DESIGN.md b/doc/DESIGN.md
index 3dd57110..ae57e620 100644
--- a/doc/DESIGN.md
+++ b/doc/DESIGN.md
@@ -242,7 +242,7 @@ struct unit : downcast_base<unit<D, R>> {
 All units are created with a `derived_unit` helper:
 
 ```cpp
-template<typename Child, fixed_string Name, typename...>
+template<typename Child, fixed_string Symbol, typename...>
 struct derived_unit;
 ```
 
@@ -259,8 +259,8 @@ to provide downcasting facility (described below).
 - helper to create a base unit of a specified dimension
 
 ```cpp
-template<typename Child, fixed_string Name, Dimension D>
-struct derived_unit<Child, Name, D>;
+template<typename Child, fixed_string Symbol, Dimension D>
+struct derived_unit<Child, Symbol, D>;
 ```
 
 ```cpp
@@ -270,8 +270,8 @@ struct metre : derived_unit<metre, "m", length> {};
 - helper to create other units for a specified dimension
 
 ```cpp
-template<typename Child, fixed_string Name, Dimension D, Ratio R>
-struct derived_unit<Child, Name, D, R>;
+template<typename Child, fixed_string Symbol, Dimension D, Ratio R>
+struct derived_unit<Child, Symbol, D, R>;
 ```
 
 ```cpp
@@ -281,8 +281,8 @@ struct yard : derived_unit<yard, "yd", length, ratio<9'144, 10'000>> {};
 - helper to create a unit with a SI prefix
 
 ```cpp
-template<typename Child, fixed_string Name, Unit U>
-struct derived_unit<Child, Name, U>;
+template<typename Child, fixed_string Symbol, Unit U>
+struct derived_unit<Child, Symbol, U>;
 ```
 
 ```cpp
@@ -293,8 +293,8 @@ struct kilometre : derived_unit<kilometre, "km", kilo<metre>> {};
   of units of base dimensions
 
 ```cpp
-template<typename Child, fixed_string Name, Dimension D, Unit U, Unit... Us>
-struct derived_unit<Child, Name, D, U, Us...>;
+template<typename Child, fixed_string Symbol, Dimension D, Unit U, Unit... Us>
+struct derived_unit<Child, Symbol, D, U, Us...>;
 ```
 
 ```cpp
@@ -554,8 +554,8 @@ struct derived_dimension : downcast_helper<Child, detail::make_dimension_t<Es...
 ```
 
 ```cpp
-template<typename Child, fixed_string Name, Dimension D>
-struct derived_unit<Child, Name, D, R> : downcast_helper<Child, unit<D, ratio<1>>> {};
+template<typename Child, fixed_string Symbol, Dimension D>
+struct derived_unit<Child, Symbol, D, R> : downcast_helper<Child, unit<D, ratio<1>>> {};
 ```
 
 With such CRTP types the only thing the user has to do to register a new type to the downcasting
diff --git a/src/include/units/unit.h b/src/include/units/unit.h
index 4eda4538..356be1ac 100644
--- a/src/include/units/unit.h
+++ b/src/include/units/unit.h
@@ -119,50 +119,50 @@ namespace units {
   //   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...>
+// template<typename Child, fixed_string Symbol, 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 Symbol, Dimension D>
+  // struct derived_unit<Child, Symbol, D> : downcast_helper<Child, unit<D, ratio<1>>> {
+  //   static constexpr auto symbol = Symbol;
   // };
 
-  // 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 Symbol, Dimension D, Ratio R>
+  // struct derived_unit<Child, Symbol, D, R> : downcast_helper<Child, unit<D, R>> {
+  //   static constexpr auto symbol = Symbol;
   // };
 
-  // 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 Symbol, Unit U>
+  // struct derived_unit<Child, Symbol, U> : downcast_helper<Child, U> {
+  //   static constexpr auto symbol = Symbol;
   // };
 
-  // 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, fixed_string Symbol, Dimension D, Unit U, Unit... Us>
+  // struct derived_unit<Child, Symbol, D, U, Us...> : downcast_helper<Child, detail::make_derived_unit<D, U, Us...>> {
+  //   static constexpr auto symbol = Symbol;
   // };
 
-  template<typename Child, typename Name, typename...>
+  template<typename Child, typename Symbol, 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, typename Symbol, Dimension D>
+  struct derived_unit<Child, Symbol, D> : downcast_helper<Child, unit<D, ratio<1>>> {
+    static constexpr auto symbol = Symbol::c_str();
   };
 
-  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, typename Symbol, Dimension D, Ratio R>
+  struct derived_unit<Child, Symbol, D, R> : downcast_helper<Child, unit<D, R>> {
+    static constexpr auto symbol = Symbol::c_str();
   };
 
-  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, typename Symbol, Unit U>
+  struct derived_unit<Child, Symbol, U> : downcast_helper<Child, U> {
+    static constexpr auto symbol = Symbol::c_str();
   };
 
-  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();
+  template<typename Child, typename Symbol, Dimension D, Unit U, Unit... Us>
+  struct derived_unit<Child, Symbol, D, U, Us...> : downcast_helper<Child, detail::make_derived_unit<D, U, Us...>> {
+    static constexpr auto symbol = Symbol::c_str();
   };
 
   // SI prefixes
diff --git a/test/unit_test/runtime/print_helpers.h b/test/unit_test/runtime/print_helpers.h
index 8d664129..96088485 100644
--- a/test/unit_test/runtime/print_helpers.h
+++ b/test/unit_test/runtime/print_helpers.h
@@ -30,7 +30,7 @@ namespace units {
   template<typename Unit, typename Rep>
   std::ostream& operator<<(std::ostream& os, const quantity<Unit, Rep>& value)
   {
-    return os << value.count() << Unit::name;
+    return os << value.count() << Unit::symbol;
   }
 
 }