Implements new intand long overloads for TimeSpan

Closes dotnet#93890
tcortega · Oct 28, 2023 · c78cde4 · c78cde4
1 parent e307926
commit c78cde4
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 0 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/TimeSpan.cs b/src/libraries/System.Private.CoreLib/src/System/TimeSpan.cs
@@ -271,6 +271,23 @@ public static TimeSpan FromDays(double value)
             return Interval(value, TicksPerDay);
         }
 
+        public static TimeSpan FromDays(int days)
+        {
+            return Interval(days, TicksPerDay);
+        }
+
+        public static TimeSpan FromDays(int days, int hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0)
+        {
+            long totalTicks = (long)days * TicksPerDay 
+                            + (long)hours * TicksPerHour
+                            + minutes * TicksPerMinute
+                            + seconds * TicksPerSecond
+                            + milliseconds * TicksPerMillisecond
+                            + microseconds * TicksPerMicrosecond;
+
+            return IntervalFromLongTicks(totalTicks);
+        }
+
         public TimeSpan Duration()
         {
             if (Ticks == MinValue.Ticks)
@@ -307,13 +324,34 @@ public static TimeSpan FromHours(double value)
             return Interval(value, TicksPerHour);
         }
 
+        public static TimeSpan FromHours(int hours)
+        {
+            return Interval(hours, TicksPerHour);
+        }
+
+        public static TimeSpan FromHours(int hours, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0)
+        {
+            long totalTicks = (long)hours * TicksPerHour
+                            + minutes * TicksPerMinute
+                            + seconds * TicksPerSecond
+                            + milliseconds * TicksPerMillisecond
+                            + microseconds * TicksPerMicrosecond;
+
+            return IntervalFromLongTicks(totalTicks);
+        }
+
         private static TimeSpan Interval(double value, double scale)
         {
             if (double.IsNaN(value))
                 ThrowHelper.ThrowArgumentException_Arg_CannotBeNaN();
             return IntervalFromDoubleTicks(value * scale);
         }
 
+        private static TimeSpan Interval(long value, long scale)
+        {
+            return IntervalFromLongTicks(value * scale);
+        }
+
         private static TimeSpan IntervalFromDoubleTicks(double ticks)
         {
             if ((ticks > long.MaxValue) || (ticks < long.MinValue) || double.IsNaN(ticks))
@@ -323,11 +361,35 @@ private static TimeSpan IntervalFromDoubleTicks(double ticks)
             return new TimeSpan((long)ticks);
         }
 
+        private static TimeSpan IntervalFromLongTicks(long ticks)
+        {
+            if (ticks == long.MaxValue)
+                return MaxValue;
+
+            if (ticks == long.MinValue)
+                return MinValue;
+
+            return new TimeSpan(ticks);
+        }
+
         public static TimeSpan FromMilliseconds(double value)
         {
             return Interval(value, TicksPerMillisecond);
         }
 
+        public static TimeSpan FromMilliseconds(long milliseconds) 
+        {
+            return Interval(milliseconds, TicksPerMillisecond);
+        }
+
+        public static TimeSpan FromMilliseconds(long milliseconds, long microseconds = 0)
+        {
+            long totalTicks = milliseconds * TicksPerMillisecond
+                            + microseconds * TicksPerMicrosecond;
+
+            return IntervalFromLongTicks(totalTicks);
+        }
+
         /// <summary>
         /// Returns a <see cref="TimeSpan"/> that represents a specified number of microseconds.
         /// </summary>
@@ -353,11 +415,31 @@ public static TimeSpan FromMicroseconds(double value)
             return Interval(value, TicksPerMicrosecond);
         }
 
+        public static TimeSpan FromMicroseconds(long microseconds)
+        {
+            return Interval(microseconds, TicksPerMicrosecond);
+        }
+
         public static TimeSpan FromMinutes(double value)
         {
             return Interval(value, TicksPerMinute);
         }
 
+        public static TimeSpan FromMinutes(long minutes)
+        {
+            return Interval(value, TicksPerMinute);
+        }
+
+        public static TimeSpan FromMinutes(long minutes, long seconds = 0, long milliseconds = 0, long microseconds = 0)
+        {
+            long totalTicks = minutes * TicksPerMinute
+                            + seconds * TicksPerSecond
+                            + milliseconds * TicksPerMillisecond
+                            + microseconds * TicksPerMicrosecond;
+
+            return IntervalFromLongTicks(totalTicks);
+        }
+
         public TimeSpan Negate()
         {
             if (Ticks == MinValue.Ticks)
@@ -370,6 +452,20 @@ public static TimeSpan FromSeconds(double value)
             return Interval(value, TicksPerSecond);
         }
 
+        public static TimeSpan FromSeconds(long seconds)
+        {
+            return Interval(seconds, TicksPerSecond);
+        }
+
+        public static TimeSpan FromSeconds(long seconds, long milliseconds = 0, long microseconds = 0)
+        {
+            long totalTicks = seconds * TicksPerSecond
+                            + milliseconds * TicksPerMillisecond
+                            + microseconds * TicksPerMicrosecond;
+
+            return IntervalFromLongTicks(totalTicks);
+        }
+
         public TimeSpan Subtract(TimeSpan ts)
         {
             long result = _ticks - ts._ticks;

diff --git a/src/libraries/System.Runtime/ref/System.Runtime.cs b/src/libraries/System.Runtime/ref/System.Runtime.cs
@@ -5603,6 +5603,17 @@ public partial class TimeoutException : System.SystemException
         public static System.TimeSpan FromMilliseconds(double value) { throw null; }
         public static System.TimeSpan FromMinutes(double value) { throw null; }
         public static System.TimeSpan FromSeconds(double value) { throw null; }
+        public static System.TimeSpan FromDays(int days) { throw null; }
+        public static System.TimeSpan FromDays(int days, int hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long  microseconds = 0) { throw null; }
+        public static System.TimeSpan FromHours(int hours) { throw null; }
+        public static System.TimeSpan FromHours(int hours, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0) { throw null; }
+        public static System.TimeSpan FromMinutes(long minutes) { throw null; }
+        public static System.TimeSpan FromMinutes(long minutes, long seconds = 0, long milliseconds = 0, long microseconds = 0) { throw null; }
+        public static System.TimeSpan FromSeconds(long seconds) { throw null; }
+        public static System.TimeSpan FromSeconds(long seconds, long milliseconds = 0, long microseconds = 0) { throw null; }
+        public static System.TimeSpan FromMilliseconds(long milliseconds) { throw null; }
+        public static System.TimeSpan FromMilliseconds(long milliseconds, long microseconds = 0) { throw null; }
+        public static System.TimeSpan FromMicroseconds(long microseconds) { throw null; }
         public static System.TimeSpan FromTicks(long value) { throw null; }
         public override int GetHashCode() { throw null; }
         public System.TimeSpan Multiply(double factor) { throw null; }