Fix TryParse overloads using optional arguments (dotnet/coreclr#14877)

stephentoub · safern · commit 7848223401de · 2018-01-16T13:09:56.000-08:00
When we originally added Parse and TryParse overloads for `ReadOnlySpan&lt;char&gt;`, we used optional arguments to minimize the number of new overloads needed.  This worked decently well for Parse, but for TryParse it necessitated reordering the parameters from the string counterparts, so that the out result argument would come before the optional parameters.  This makes it more difficult to port string-based calls to span-based calls, and we agreed to add the missing overloads so that we could order the parameters "correctly" to match the existing string-based overloads.  This does so.

Signed-off-by: dotnet-bot-corefx-mirror &lt;dotnet-bot@microsoft.com&gt;
diff --git a/src/Common/src/CoreLib/System/Byte.cs b/src/Common/src/CoreLib/System/Byte.cs
@@ -132,6 +132,11 @@ public static bool TryParse(String s, out Byte result)
             return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        public static bool TryParse(ReadOnlySpan<char> s, out byte result)
+        {
+            return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out Byte result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
@@ -145,7 +150,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid
             return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);
         }
 
-        public static bool TryParse(ReadOnlySpan<char> s, out byte result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out byte result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/Double.cs b/src/Common/src/CoreLib/System/Double.cs
@@ -306,6 +306,11 @@ public static bool TryParse(String s, out double result)
             return TryParse(s.AsReadOnlySpan(), NumberStyles.Float | NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        public static bool TryParse(ReadOnlySpan<char> s, out double result)
+        {
+            return TryParse(s, NumberStyles.Float | NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out double result)
         {
             NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
@@ -319,7 +324,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid
             return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);
         }
 
-        public static bool TryParse(ReadOnlySpan<char> s, out double result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out double result)
         {
             NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
             return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Win32.cs b/src/Common/src/CoreLib/System/Globalization/JapaneseCalendar.Win32.cs
@@ -160,9 +160,9 @@ private static EraInfo GetEraFromValue(String value, String data)
             int day;
 
             ReadOnlySpan<char> valueSpan = value.AsReadOnlySpan();
-            if (!Int32.TryParse(valueSpan.Slice(0, 4), out year, style:NumberStyles.None, provider: NumberFormatInfo.InvariantInfo) ||
-                !Int32.TryParse(valueSpan.Slice(5, 2), out month, style:NumberStyles.None, provider: NumberFormatInfo.InvariantInfo) ||
-                !Int32.TryParse(valueSpan.Slice(8, 2), out day, style:NumberStyles.None, provider: NumberFormatInfo.InvariantInfo))
+            if (!Int32.TryParse(valueSpan.Slice(0, 4), NumberStyles.None, NumberFormatInfo.InvariantInfo, out year) ||
+                !Int32.TryParse(valueSpan.Slice(5, 2), NumberStyles.None, NumberFormatInfo.InvariantInfo, out month) ||
+                !Int32.TryParse(valueSpan.Slice(8, 2), NumberStyles.None, NumberFormatInfo.InvariantInfo, out day))
             {
                 // Couldn't convert integer, fail
                 return null;
diff --git a/src/Common/src/CoreLib/System/Int16.cs b/src/Common/src/CoreLib/System/Int16.cs
@@ -167,6 +167,11 @@ public static bool TryParse(String s, out Int16 result)
             return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        public static bool TryParse(ReadOnlySpan<char> s, out short result)
+        {
+            return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out Int16 result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
@@ -180,7 +185,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid
             return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);
         }
 
-        public static bool TryParse(ReadOnlySpan<char> s, out Int16 result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out short result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/Int32.cs b/src/Common/src/CoreLib/System/Int32.cs
@@ -150,6 +150,11 @@ public static bool TryParse(String s, out Int32 result)
             return Number.TryParseInt32(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        public static bool TryParse(ReadOnlySpan<char> s, out int result)
+        {
+            return Number.TryParseInt32(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         // Parses an integer from a String in the given style. Returns false rather
         // than throwing exceptin if input is invalid
         // 
@@ -166,7 +171,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid
             return Number.TryParseInt32(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);
         }
 
-        public static bool TryParse(ReadOnlySpan<char> s, out int result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out int result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return Number.TryParseInt32(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/Int64.cs b/src/Common/src/CoreLib/System/Int64.cs
@@ -141,6 +141,11 @@ public static Boolean TryParse(String s, out Int64 result)
             return Number.TryParseInt64(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        public static bool TryParse(ReadOnlySpan<char> s, out long result)
+        {
+            return Number.TryParseInt64(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         public static Boolean TryParse(String s, NumberStyles style, IFormatProvider provider, out Int64 result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
@@ -154,7 +159,7 @@ public static Boolean TryParse(String s, NumberStyles style, IFormatProvider pro
             return Number.TryParseInt64(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);
         }
 
-        public static bool TryParse(ReadOnlySpan<char> s, out long result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out long result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return Number.TryParseInt64(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/SByte.cs b/src/Common/src/CoreLib/System/SByte.cs
@@ -185,6 +185,12 @@ public static bool TryParse(String s, out SByte result)
             return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        [CLSCompliant(false)]
+        public static bool TryParse(ReadOnlySpan<char> s, out sbyte result)
+        {
+            return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         [CLSCompliant(false)]
         public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out SByte result)
         {
@@ -200,7 +206,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid
         }
 
         [CLSCompliant(false)]
-        public static bool TryParse(ReadOnlySpan<char> s, out sbyte result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out sbyte result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/Single.cs b/src/Common/src/CoreLib/System/Single.cs
@@ -296,6 +296,11 @@ public static Boolean TryParse(String s, out Single result)
             return TryParse(s.AsReadOnlySpan(), NumberStyles.Float | NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        public static bool TryParse(ReadOnlySpan<char> s, out float result)
+        {
+            return TryParse(s, NumberStyles.Float | NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         public static Boolean TryParse(String s, NumberStyles style, IFormatProvider provider, out Single result)
         {
             NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
@@ -309,7 +314,7 @@ public static Boolean TryParse(String s, NumberStyles style, IFormatProvider pro
             return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);
         }
 
-        public static Boolean TryParse(ReadOnlySpan<char> s, out Single result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out float result)
         {
             NumberFormatInfo.ValidateParseStyleFloatingPoint(style);
             return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/TimeSpan.cs b/src/Common/src/CoreLib/System/TimeSpan.cs
@@ -366,6 +366,10 @@ public static Boolean TryParse(String s, out TimeSpan result)
             }
             return TimeSpanParse.TryParse(s.AsReadOnlySpan(), null, out result);
         }
+        public static bool TryParse(ReadOnlySpan<char> s, out TimeSpan result)
+        {
+            return TimeSpanParse.TryParse(s, null, out result);
+        }
         public static Boolean TryParse(String input, IFormatProvider formatProvider, out TimeSpan result)
         {
             if (input == null)
@@ -375,7 +379,7 @@ public static Boolean TryParse(String input, IFormatProvider formatProvider, out
             }
             return TimeSpanParse.TryParse(input.AsReadOnlySpan(), formatProvider, out result);
         }
-        public static bool TryParse(ReadOnlySpan<char> input, out TimeSpan result, IFormatProvider formatProvider = null)
+        public static bool TryParse(ReadOnlySpan<char> input, IFormatProvider formatProvider, out TimeSpan result)
         {
             return TimeSpanParse.TryParse(input, formatProvider, out result);
         }
@@ -388,6 +392,10 @@ public static Boolean TryParseExact(String input, String format, IFormatProvider
             }
             return TimeSpanParse.TryParseExact(input.AsReadOnlySpan(), format, formatProvider, TimeSpanStyles.None, out result);
         }
+        public static bool TryParseExact(ReadOnlySpan<char> input, string format, IFormatProvider formatProvider, out TimeSpan result)
+        {
+            return TimeSpanParse.TryParseExact(input, format, formatProvider, TimeSpanStyles.None, out result);
+        }
         public static Boolean TryParseExact(String input, String[] formats, IFormatProvider formatProvider, out TimeSpan result)
         {
             if (input == null)
@@ -397,6 +405,10 @@ public static Boolean TryParseExact(String input, String[] formats, IFormatProvi
             }
             return TimeSpanParse.TryParseExactMultiple(input.AsReadOnlySpan(), formats, formatProvider, TimeSpanStyles.None, out result);
         }
+        public static bool TryParseExact(ReadOnlySpan<char> input, string[] formats, IFormatProvider formatProvider, out TimeSpan result)
+        {
+            return TimeSpanParse.TryParseExactMultiple(input, formats, formatProvider, TimeSpanStyles.None, out result);
+        }
         public static Boolean TryParseExact(String input, String format, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result)
         {
             ValidateStyles(styles, nameof(styles));
@@ -407,7 +419,7 @@ public static Boolean TryParseExact(String input, String format, IFormatProvider
             }
             return TimeSpanParse.TryParseExact(input.AsReadOnlySpan(), format, formatProvider, styles, out result);
         }
-        public static bool TryParseExact(ReadOnlySpan<char> input, string format, IFormatProvider formatProvider, out TimeSpan result, TimeSpanStyles styles = TimeSpanStyles.None)
+        public static bool TryParseExact(ReadOnlySpan<char> input, string format, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result)
         {
             ValidateStyles(styles, nameof(styles));
             return TimeSpanParse.TryParseExact(input, format, formatProvider, styles, out result);
@@ -422,7 +434,7 @@ public static Boolean TryParseExact(String input, String[] formats, IFormatProvi
             }
             return TimeSpanParse.TryParseExactMultiple(input.AsReadOnlySpan(), formats, formatProvider, styles, out result);
         }
-        public static bool TryParseExact(ReadOnlySpan<char> input, string[] formats, IFormatProvider formatProvider, out TimeSpan result, TimeSpanStyles styles = TimeSpanStyles.None)
+        public static bool TryParseExact(ReadOnlySpan<char> input, string[] formats, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result)
         {
             ValidateStyles(styles, nameof(styles));
             return TimeSpanParse.TryParseExactMultiple(input, formats, formatProvider, styles, out result);
diff --git a/src/Common/src/CoreLib/System/UInt16.cs b/src/Common/src/CoreLib/System/UInt16.cs
@@ -154,6 +154,12 @@ public static bool TryParse(String s, out UInt16 result)
             return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        [CLSCompliant(false)]
+        public static bool TryParse(ReadOnlySpan<char> s, out ushort result)
+        {
+            return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         [CLSCompliant(false)]
         public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out UInt16 result)
         {
@@ -169,7 +175,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid
         }
 
         [CLSCompliant(false)]
-        public static bool TryParse(ReadOnlySpan<char> s, out ushort result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out ushort result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/UInt32.cs b/src/Common/src/CoreLib/System/UInt32.cs
@@ -146,6 +146,12 @@ public static bool TryParse(String s, out UInt32 result)
             return Number.TryParseUInt32(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        [CLSCompliant(false)]
+        public static bool TryParse(ReadOnlySpan<char> s, out uint result)
+        {
+            return Number.TryParseUInt32(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         [CLSCompliant(false)]
         public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out UInt32 result)
         {
@@ -161,7 +167,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid
         }
 
         [CLSCompliant(false)]
-        public static bool TryParse(ReadOnlySpan<char> s, out UInt32 result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out uint result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return Number.TryParseUInt32(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/UInt64.cs b/src/Common/src/CoreLib/System/UInt64.cs
@@ -143,6 +143,12 @@ public static Boolean TryParse(String s, out UInt64 result)
             return Number.TryParseUInt64(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
         }
 
+        [CLSCompliant(false)]
+        public static bool TryParse(ReadOnlySpan<char> s, out ulong result)
+        {
+            return Number.TryParseUInt64(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);
+        }
+
         [CLSCompliant(false)]
         public static Boolean TryParse(String s, NumberStyles style, IFormatProvider provider, out UInt64 result)
         {
@@ -158,7 +164,7 @@ public static Boolean TryParse(String s, NumberStyles style, IFormatProvider pro
         }
 
         [CLSCompliant(false)]
-        public static Boolean TryParse(ReadOnlySpan<char> s, out UInt64 result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)
+        public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out ulong result)
         {
             NumberFormatInfo.ValidateParseStyleInteger(style);
             return Number.TryParseUInt64(s, style, NumberFormatInfo.GetInstance(provider), out result);
diff --git a/src/Common/src/CoreLib/System/Version.cs b/src/Common/src/CoreLib/System/Version.cs
@@ -415,7 +415,7 @@ private static bool TryParseComponent(ReadOnlySpan<char> component, string compo
                 return true;
             }
 
-            return int.TryParse(component, out parsedComponent, NumberStyles.Integer, CultureInfo.InvariantCulture) && parsedComponent >= 0;
+            return int.TryParse(component, NumberStyles.Integer, CultureInfo.InvariantCulture, out parsedComponent) && parsedComponent >= 0;
         }
 
         public static bool operator ==(Version v1, Version v2)

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,11 @@ public static bool TryParse(String s, out Byte result)`
`132`	`132`	`return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
`133`	`133`	`}`
`134`	`134`
	`135`	`+ public static bool TryParse(ReadOnlySpan<char> s, out byte result)`
	`136`	`+ {`
	`137`	`+ return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
	`138`	`+ }`
	`139`	`+`
`135`	`140`	`public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out Byte result)`
`136`	`141`	`{`
`137`	`142`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`@@ -145,7 +150,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid`
`145`	`150`	`return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);`
`146`	`151`	`}`
`147`	`152`
`148`		`- public static bool TryParse(ReadOnlySpan<char> s, out byte result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`153`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out byte result)`
`149`	`154`	`{`
`150`	`155`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`151`	`156`	`return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);`
Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,11 @@ public static bool TryParse(String s, out double result)`
`306`	`306`	`return TryParse(s.AsReadOnlySpan(), NumberStyles.Float \| NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);`
`307`	`307`	`}`
`308`	`308`
	`309`	`+ public static bool TryParse(ReadOnlySpan<char> s, out double result)`
	`310`	`+ {`
	`311`	`+ return TryParse(s, NumberStyles.Float \| NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);`
	`312`	`+ }`
	`313`	`+`
`309`	`314`	`public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out double result)`
`310`	`315`	`{`
`311`	`316`	`NumberFormatInfo.ValidateParseStyleFloatingPoint(style);`
`@@ -319,7 +324,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid`
`319`	`324`	`return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);`
`320`	`325`	`}`
`321`	`326`
`322`		`- public static bool TryParse(ReadOnlySpan<char> s, out double result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`327`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out double result)`
`323`	`328`	`{`
`324`	`329`	`NumberFormatInfo.ValidateParseStyleFloatingPoint(style);`
`325`	`330`	`return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,11 @@ public static bool TryParse(String s, out Int16 result)`
`167`	`167`	`return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
`168`	`168`	`}`
`169`	`169`
	`170`	`+ public static bool TryParse(ReadOnlySpan<char> s, out short result)`
	`171`	`+ {`
	`172`	`+ return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
	`173`	`+ }`
	`174`	`+`
`170`	`175`	`public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out Int16 result)`
`171`	`176`	`{`
`172`	`177`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`@@ -180,7 +185,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid`
`180`	`185`	`return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);`
`181`	`186`	`}`
`182`	`187`
`183`		`- public static bool TryParse(ReadOnlySpan<char> s, out Int16 result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`188`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out short result)`
`184`	`189`	`{`
`185`	`190`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`186`	`191`	`return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,11 @@ public static bool TryParse(String s, out Int32 result)`
`150`	`150`	`return Number.TryParseInt32(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
`151`	`151`	`}`
`152`	`152`
	`153`	`+ public static bool TryParse(ReadOnlySpan<char> s, out int result)`
	`154`	`+ {`
	`155`	`+ return Number.TryParseInt32(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
	`156`	`+ }`
	`157`	`+`
`153`	`158`	`// Parses an integer from a String in the given style. Returns false rather`
`154`	`159`	`// than throwing exceptin if input is invalid`
`155`	`160`	`//`
`@@ -166,7 +171,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid`
`166`	`171`	`return Number.TryParseInt32(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);`
`167`	`172`	`}`
`168`	`173`
`169`		`- public static bool TryParse(ReadOnlySpan<char> s, out int result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`174`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out int result)`
`170`	`175`	`{`
`171`	`176`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`172`	`177`	`return Number.TryParseInt32(s, style, NumberFormatInfo.GetInstance(provider), out result);`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,11 @@ public static Boolean TryParse(String s, out Int64 result)`
`141`	`141`	`return Number.TryParseInt64(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ public static bool TryParse(ReadOnlySpan<char> s, out long result)`
	`145`	`+ {`
	`146`	`+ return Number.TryParseInt64(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
	`147`	`+ }`
	`148`	`+`
`144`	`149`	`public static Boolean TryParse(String s, NumberStyles style, IFormatProvider provider, out Int64 result)`
`145`	`150`	`{`
`146`	`151`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`@@ -154,7 +159,7 @@ public static Boolean TryParse(String s, NumberStyles style, IFormatProvider pro`
`154`	`159`	`return Number.TryParseInt64(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);`
`155`	`160`	`}`
`156`	`161`
`157`		`- public static bool TryParse(ReadOnlySpan<char> s, out long result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`162`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out long result)`
`158`	`163`	`{`
`159`	`164`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`160`	`165`	`return Number.TryParseInt64(s, style, NumberFormatInfo.GetInstance(provider), out result);`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,12 @@ public static bool TryParse(String s, out SByte result)`
`185`	`185`	`return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
`186`	`186`	`}`
`187`	`187`
	`188`	`+ [CLSCompliant(false)]`
	`189`	`+ public static bool TryParse(ReadOnlySpan<char> s, out sbyte result)`
	`190`	`+ {`
	`191`	`+ return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
	`192`	`+ }`
	`193`	`+`
`188`	`194`	`[CLSCompliant(false)]`
`189`	`195`	`public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out SByte result)`
`190`	`196`	`{`
`@@ -200,7 +206,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid`
`200`	`206`	`}`
`201`	`207`
`202`	`208`	`[CLSCompliant(false)]`
`203`		`- public static bool TryParse(ReadOnlySpan<char> s, out sbyte result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`209`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out sbyte result)`
`204`	`210`	`{`
`205`	`211`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`206`	`212`	`return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);`
Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,11 @@ public static Boolean TryParse(String s, out Single result)`
`296`	`296`	`return TryParse(s.AsReadOnlySpan(), NumberStyles.Float \| NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);`
`297`	`297`	`}`
`298`	`298`
	`299`	`+ public static bool TryParse(ReadOnlySpan<char> s, out float result)`
	`300`	`+ {`
	`301`	`+ return TryParse(s, NumberStyles.Float \| NumberStyles.AllowThousands, NumberFormatInfo.CurrentInfo, out result);`
	`302`	`+ }`
	`303`	`+`
`299`	`304`	`public static Boolean TryParse(String s, NumberStyles style, IFormatProvider provider, out Single result)`
`300`	`305`	`{`
`301`	`306`	`NumberFormatInfo.ValidateParseStyleFloatingPoint(style);`
`@@ -309,7 +314,7 @@ public static Boolean TryParse(String s, NumberStyles style, IFormatProvider pro`
`309`	`314`	`return TryParse(s.AsReadOnlySpan(), style, NumberFormatInfo.GetInstance(provider), out result);`
`310`	`315`	`}`
`311`	`316`
`312`		`- public static Boolean TryParse(ReadOnlySpan<char> s, out Single result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`317`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out float result)`
`313`	`318`	`{`
`314`	`319`	`NumberFormatInfo.ValidateParseStyleFloatingPoint(style);`
`315`	`320`	`return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);`
Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,10 @@ public static Boolean TryParse(String s, out TimeSpan result)`
`366`	`366`	`}`
`367`	`367`	`return TimeSpanParse.TryParse(s.AsReadOnlySpan(), null, out result);`
`368`	`368`	`}`
	`369`	`+ public static bool TryParse(ReadOnlySpan<char> s, out TimeSpan result)`
	`370`	`+ {`
	`371`	`+ return TimeSpanParse.TryParse(s, null, out result);`
	`372`	`+ }`
`369`	`373`	`public static Boolean TryParse(String input, IFormatProvider formatProvider, out TimeSpan result)`
`370`	`374`	`{`
`371`	`375`	`if (input == null)`
`@@ -375,7 +379,7 @@ public static Boolean TryParse(String input, IFormatProvider formatProvider, out`
`375`	`379`	`}`
`376`	`380`	`return TimeSpanParse.TryParse(input.AsReadOnlySpan(), formatProvider, out result);`
`377`	`381`	`}`
`378`		`- public static bool TryParse(ReadOnlySpan<char> input, out TimeSpan result, IFormatProvider formatProvider = null)`
	`382`	`+ public static bool TryParse(ReadOnlySpan<char> input, IFormatProvider formatProvider, out TimeSpan result)`
`379`	`383`	`{`
`380`	`384`	`return TimeSpanParse.TryParse(input, formatProvider, out result);`
`381`	`385`	`}`
`@@ -388,6 +392,10 @@ public static Boolean TryParseExact(String input, String format, IFormatProvider`
`388`	`392`	`}`
`389`	`393`	`return TimeSpanParse.TryParseExact(input.AsReadOnlySpan(), format, formatProvider, TimeSpanStyles.None, out result);`
`390`	`394`	`}`
	`395`	`+ public static bool TryParseExact(ReadOnlySpan<char> input, string format, IFormatProvider formatProvider, out TimeSpan result)`
	`396`	`+ {`
	`397`	`+ return TimeSpanParse.TryParseExact(input, format, formatProvider, TimeSpanStyles.None, out result);`
	`398`	`+ }`
`391`	`399`	`public static Boolean TryParseExact(String input, String[] formats, IFormatProvider formatProvider, out TimeSpan result)`
`392`	`400`	`{`
`393`	`401`	`if (input == null)`
`@@ -397,6 +405,10 @@ public static Boolean TryParseExact(String input, String[] formats, IFormatProvi`
`397`	`405`	`}`
`398`	`406`	`return TimeSpanParse.TryParseExactMultiple(input.AsReadOnlySpan(), formats, formatProvider, TimeSpanStyles.None, out result);`
`399`	`407`	`}`
	`408`	`+ public static bool TryParseExact(ReadOnlySpan<char> input, string[] formats, IFormatProvider formatProvider, out TimeSpan result)`
	`409`	`+ {`
	`410`	`+ return TimeSpanParse.TryParseExactMultiple(input, formats, formatProvider, TimeSpanStyles.None, out result);`
	`411`	`+ }`
`400`	`412`	`public static Boolean TryParseExact(String input, String format, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result)`
`401`	`413`	`{`
`402`	`414`	`ValidateStyles(styles, nameof(styles));`
`@@ -407,7 +419,7 @@ public static Boolean TryParseExact(String input, String format, IFormatProvider`
`407`	`419`	`}`
`408`	`420`	`return TimeSpanParse.TryParseExact(input.AsReadOnlySpan(), format, formatProvider, styles, out result);`
`409`	`421`	`}`
`410`		`- public static bool TryParseExact(ReadOnlySpan<char> input, string format, IFormatProvider formatProvider, out TimeSpan result, TimeSpanStyles styles = TimeSpanStyles.None)`
	`422`	`+ public static bool TryParseExact(ReadOnlySpan<char> input, string format, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result)`
`411`	`423`	`{`
`412`	`424`	`ValidateStyles(styles, nameof(styles));`
`413`	`425`	`return TimeSpanParse.TryParseExact(input, format, formatProvider, styles, out result);`
`@@ -422,7 +434,7 @@ public static Boolean TryParseExact(String input, String[] formats, IFormatProvi`
`422`	`434`	`}`
`423`	`435`	`return TimeSpanParse.TryParseExactMultiple(input.AsReadOnlySpan(), formats, formatProvider, styles, out result);`
`424`	`436`	`}`
`425`		`- public static bool TryParseExact(ReadOnlySpan<char> input, string[] formats, IFormatProvider formatProvider, out TimeSpan result, TimeSpanStyles styles = TimeSpanStyles.None)`
	`437`	`+ public static bool TryParseExact(ReadOnlySpan<char> input, string[] formats, IFormatProvider formatProvider, TimeSpanStyles styles, out TimeSpan result)`
`426`	`438`	`{`
`427`	`439`	`ValidateStyles(styles, nameof(styles));`
`428`	`440`	`return TimeSpanParse.TryParseExactMultiple(input, formats, formatProvider, styles, out result);`
Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,12 @@ public static bool TryParse(String s, out UInt16 result)`
`154`	`154`	`return TryParse(s.AsReadOnlySpan(), NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
`155`	`155`	`}`
`156`	`156`
	`157`	`+ [CLSCompliant(false)]`
	`158`	`+ public static bool TryParse(ReadOnlySpan<char> s, out ushort result)`
	`159`	`+ {`
	`160`	`+ return TryParse(s, NumberStyles.Integer, NumberFormatInfo.CurrentInfo, out result);`
	`161`	`+ }`
	`162`	`+`
`157`	`163`	`[CLSCompliant(false)]`
`158`	`164`	`public static bool TryParse(String s, NumberStyles style, IFormatProvider provider, out UInt16 result)`
`159`	`165`	`{`
`@@ -169,7 +175,7 @@ public static bool TryParse(String s, NumberStyles style, IFormatProvider provid`
`169`	`175`	`}`
`170`	`176`
`171`	`177`	`[CLSCompliant(false)]`
`172`		`- public static bool TryParse(ReadOnlySpan<char> s, out ushort result, NumberStyles style = NumberStyles.Integer, IFormatProvider provider = null)`
	`178`	`+ public static bool TryParse(ReadOnlySpan<char> s, NumberStyles style, IFormatProvider provider, out ushort result)`
`173`	`179`	`{`
`174`	`180`	`NumberFormatInfo.ValidateParseStyleInteger(style);`
`175`	`181`	`return TryParse(s, style, NumberFormatInfo.GetInstance(provider), out result);`