Merge branch 'feature/#757-Add-time-date-classes' of https://github.c…

…om/ETLCPP/etl into feature/#757-Add-time-date-classes
ETLCPP · Sep 16, 2023 · 5c6d32d · 5c6d32d
2 parents f9d27d9 + 479fd09
commit 5c6d32d
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 41 deletions.
diff --git a/include/etl/private/chrono/day.h b/include/etl/private/chrono/day.h
@@ -320,7 +320,7 @@ namespace etl
       //***********************************************************************
       ETL_CONSTEXPR etl::chrono::day operator ""_d(unsigned long long d) ETL_NOEXCEPT
       {
-        return etl::chrono::day(d);
+        return etl::chrono::day(static_cast<unsigned>(d));
       }
     }
   }

diff --git a/include/etl/private/chrono/duration.h b/include/etl/private/chrono/duration.h
@@ -50,6 +50,7 @@ namespace etl
 
       //***********************************************************************
       ETL_CONSTEXPR duration() ETL_NOEXCEPT
+        : value(0)
       {
       }
 

diff --git a/include/etl/private/chrono/month.h b/include/etl/private/chrono/month.h
@@ -42,6 +42,12 @@ namespace etl
 {
   namespace chrono
   {
+    class month;
+
+    ETL_CONSTEXPR etl::chrono::month operator +(const etl::chrono::month& m,   const etl::chrono::months& ms) ETL_NOEXCEPT;
+    ETL_CONSTEXPR etl::chrono::month operator +(const etl::chrono::months& ms, const etl::chrono::month& m)   ETL_NOEXCEPT;
+    ETL_CONSTEXPR etl::chrono::month operator -(const etl::chrono::month& m,   const etl::chrono::months& ms) ETL_NOEXCEPT;
+
     //***********************************************************************
     /// month
     //***********************************************************************
@@ -88,12 +94,7 @@ namespace etl
       //***********************************************************************
       ETL_CONSTEXPR etl::chrono::month& operator ++() ETL_NOEXCEPT
       {
-        value %= 12U;
-
-        if (++value == 13U)
-        {
-          value = 1U;
-        }
+        *this += etl::chrono::months(1);
 
         return *this;
       }
@@ -105,7 +106,7 @@ namespace etl
       {
         const etl::chrono::month temp = *this;
 
-        this->operator++();
+        *this += etl::chrono::months(1);
 
         return temp;
       }
@@ -115,19 +116,7 @@ namespace etl
       //***********************************************************************
       ETL_CONSTEXPR etl::chrono::month& operator --() ETL_NOEXCEPT
       {
-        if (value > 0U)
-        {
-          value = ((value - 1U) % 12U) + 1U;
-        }
-
-        if (value == 1U)
-        {
-          value = 12U;
-        }
-        else
-        {
-          --value;
-        }
+        *this -= etl::chrono::months(1);
 
         return *this;
       }
@@ -139,7 +128,7 @@ namespace etl
       {
         etl::chrono::month temp = *this;
 
-        this->operator--();
+        *this -= etl::chrono::months(1);
 
         return temp;
       }
@@ -149,7 +138,7 @@ namespace etl
       //***********************************************************************
       ETL_CONSTEXPR etl::chrono::month& operator +=(const etl::chrono::months& ms) ETL_NOEXCEPT
       {
-        value += static_cast<unsigned char>(ms.count());
+        *this = *this + ms;
 
         return *this;
       }
@@ -159,7 +148,7 @@ namespace etl
       //***********************************************************************
       ETL_CONSTEXPR etl::chrono::month& operator -=(const etl::chrono::months& ms) ETL_NOEXCEPT
       {
-        value -= static_cast<unsigned char>(ms.count());
+        *this = *this - ms;
 
         return *this;
       }
@@ -207,11 +196,24 @@ namespace etl
     //***********************************************************************
     ETL_CONSTEXPR etl::chrono::month operator +(const etl::chrono::month& m, const etl::chrono::months& ms) ETL_NOEXCEPT
     {
-      etl::chrono::month result(m);
+      unsigned int value = static_cast<unsigned int>(m);
+
+      value = value % 12U;
+
+      if (value == 0U)
+      {
+        value = 12U;
+      }
 
-      result += ms;
+      int delta = ms.count() % 12;
 
-      return result;
+      // Adjust to allow a limited +-11 month delta
+      value += 11U;
+      value += delta;
+      value %= 12U;
+      ++value;
+
+      return etl::chrono::month(value);
     }
 
     //***********************************************************************
@@ -220,11 +222,7 @@ namespace etl
     //***********************************************************************
     ETL_CONSTEXPR etl::chrono::month operator +(const etl::chrono::months& ms, const etl::chrono::month& m) ETL_NOEXCEPT
     {
-      etl::chrono::month result(m);
-
-      result += ms;
-
-      return result;
+      return m + ms;
     }
 
     //***********************************************************************
@@ -233,21 +231,28 @@ namespace etl
     //***********************************************************************
     ETL_CONSTEXPR etl::chrono::month operator -(const etl::chrono::month& m, const etl::chrono::months& ms) ETL_NOEXCEPT
     {
-      etl::chrono::month result(m);
-
-      result -= ms;
-
-      return result;
+      return m + etl::chrono::months(-ms.count());
     }
 
     //***********************************************************************
     /// Subtract etl::chrono::month from etl::chrono::month
     ///\return etl::chrono::months
     //***********************************************************************
-    ETL_CONSTEXPR etl::chrono::months operator -(const etl::chrono::month& d1, const etl::chrono::month& d2) ETL_NOEXCEPT
+    ETL_CONSTEXPR etl::chrono::months operator -(const etl::chrono::month& m1, const etl::chrono::month& m2) ETL_NOEXCEPT
     {
-      return etl::chrono::months(static_cast<int>(static_cast<unsigned>(d1)) - 
-                               static_cast<int>(static_cast<unsigned>(d2)));
+      if (m1.ok() && m2.ok())
+      {
+        etl::chrono::months ms(static_cast<signed>(static_cast<unsigned>(m1)) - 
+                               static_cast<signed>(static_cast<unsigned>(m2)) % 12);
+
+        if (m1 == (m2 + ms))
+        {
+          return ms;
+        }
+      }
+
+
+      return etl::chrono::months();
     }
 
     //***********************************************************************

diff --git a/include/etl/private/chrono/year.h b/include/etl/private/chrono/year.h
@@ -328,7 +328,7 @@ namespace etl
       //***********************************************************************
       constexpr etl::chrono::year operator ""_y(unsigned long long y) noexcept
       {
-        return etl::chrono::year(y);
+        return etl::chrono::year(static_cast<int16_t>(y));
       }
     }
   }