From 9fbf17be06ca9562a8f75bb9a88b48ce6f8e682d Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Wed, 25 Mar 2020 22:06:07 +0100
Subject: [PATCH] Scalar concept extended

Scalar concept extended with types that are not constructible from and integral type
---
 docs/reference/concepts.rst  |  9 ++++++++-
 src/include/units/concepts.h | 29 ++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/docs/reference/concepts.rst b/docs/reference/concepts.rst
index 2e18c4b9..adbe3999 100644
--- a/docs/reference/concepts.rst
+++ b/docs/reference/concepts.rst
@@ -70,4 +70,11 @@ Concepts
 
 .. concept:: template<typename T> Scalar
 
-    A concept matching non-Quantity types. Satisfied by types that satisfy :expr:`(!Quantity<T>) && (!WrappedQuantity<T>) && std::regular<T>`.
+    A concept matching non-Quantity types. Satisfied by types that match
+    :expr:`(!Quantity<T>) && (!WrappedQuantity<T>) && std::regular<T>` and satisfy one of the
+    following:
+
+    - if type :expr:`T` is constructible from ``std::int64_t`` (which is the type that stores
+      the elements of `ratio`), :expr:`T * T` and :expr:`T / T` must be valid,
+    - otherwise, :expr:`T * std::int64_t`, :expr:`std::int64_t * T`, and :expr:`T / std::int64_t`
+      must be valid.
diff --git a/src/include/units/concepts.h b/src/include/units/concepts.h
index 9365f6cf..9f1a917e 100644
--- a/src/include/units/concepts.h
+++ b/src/include/units/concepts.h
@@ -248,6 +248,29 @@ template<typename T>
 concept WrappedQuantity = detail::is_wrapped_quantity<T>;
 
 // Scalar
+
+namespace detail {
+
+template<typename T>
+concept constructible_from_integral =
+  // construction from an integral type
+  std::constructible_from<T, std::int64_t> && 
+  // unit scaling
+  std::regular_invocable<std::multiplies<>, T, T> &&
+  std::regular_invocable<std::divides<>, T, T>;
+
+template<typename T>
+concept not_constructible_from_integral =
+  // not construction from an integral type
+  (!std::constructible_from<T, std::int64_t>) && 
+
+  // scaling by the value from ratio
+  std::regular_invocable<std::multiplies<>, T, std::int64_t> &&
+  std::regular_invocable<std::multiplies<>, std::int64_t, T>; // &&
+  // std::regular_invocable<std::divides<>, T, std::int64_t>;  // TODO Uncomment when a bug in LA is fixed
+
+}  // namesapce detail
+
 /**
  * @brief A concept matching non-Quantity types.
  * 
@@ -258,10 +281,6 @@ concept Scalar =
   (!Quantity<T>) &&
   (!WrappedQuantity<T>) &&
   std::regular<T> &&
-  // construction from an integral type
-  std::constructible_from<T, std::int64_t> &&
-  // unit scaling
-  std::regular_invocable<std::multiplies<>, T, T> &&
-  std::regular_invocable<std::divides<>, T, T>;
+  (detail::constructible_from_integral<T> || detail::not_constructible_from_integral<T>);
 
 }  // namespace units