Merge pull request #511 from tmilnthorp/UnitSystemSplit

Splitting UnitSystem class into more focused classes

Author: angularsen

Common/GeneratedCode/Quantities/Acceleration.Common.g.cs

@@ -654,7 +654,7 @@ public static bool TryParseUnit(string str, out AccelerationUnit unit)
         ///     Parse a string with one or two quantities of the format "<quantity> <unit>".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.Parse("5.5 m", new CultureInfo("en-US"));
         /// </example>
@@ -677,17 +677,17 @@ private static Acceleration ParseInternal(string str, [CanBeNull] IFormatProvide
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.Parse<Acceleration, AccelerationUnit>(str, provider, ParseUnitInternal, From,
+            return QuantityParser.Default.Parse<Acceleration, AccelerationUnit>(str, provider, ParseUnitInternal, From,
                 (x, y) => From(x.MetersPerSecondSquared + y.MetersPerSecondSquared, BaseUnit));
         }
 
         /// <summary>
         ///     Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="result">Resulting unit quantity if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -700,17 +700,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.TryParse<Acceleration, AccelerationUnit>(str, provider, TryParseUnitInternal, From,
+            return QuantityParser.Default.TryParse<Acceleration, AccelerationUnit>(str, provider, TryParseUnitInternal, From,
                 (x, y) => From(x.MetersPerSecondSquared + y.MetersPerSecondSquared, BaseUnit), out result);
         }
 
         /// <summary>
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.ParseUnit("m", new CultureInfo("en-US"));
         /// </example>
@@ -720,8 +720,7 @@ private static AccelerationUnit ParseUnitInternal(string str, IFormatProvider pr
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            var unit = unitSystem.Parse<AccelerationUnit>(str.Trim());
+            var unit = UnitParser.Default.Parse<AccelerationUnit>(str.Trim(), provider);
 
             if (unit == AccelerationUnit.Undefined)
             {
@@ -738,7 +737,7 @@ private static AccelerationUnit ParseUnitInternal(string str, IFormatProvider pr
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="unit">The parsed unit if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -751,8 +750,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            if(!unitSystem.TryParse<AccelerationUnit>(str.Trim(), out unit))
+            if(!UnitParser.Default.TryParse<AccelerationUnit>(str.Trim(), provider, out unit))
                 return false;
 
             if(unit == AccelerationUnit.Undefined)

Common/GeneratedCode/Quantities/AmountOfSubstance.Common.g.cs

@@ -676,7 +676,7 @@ public static bool TryParseUnit(string str, out AmountOfSubstanceUnit unit)
         ///     Parse a string with one or two quantities of the format "<quantity> <unit>".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.Parse("5.5 m", new CultureInfo("en-US"));
         /// </example>
@@ -699,17 +699,17 @@ private static AmountOfSubstance ParseInternal(string str, [CanBeNull] IFormatPr
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.Parse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, ParseUnitInternal, From,
+            return QuantityParser.Default.Parse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, ParseUnitInternal, From,
                 (x, y) => From(x.Moles + y.Moles, BaseUnit));
         }
 
         /// <summary>
         ///     Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="result">Resulting unit quantity if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -722,17 +722,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.TryParse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, TryParseUnitInternal, From,
+            return QuantityParser.Default.TryParse<AmountOfSubstance, AmountOfSubstanceUnit>(str, provider, TryParseUnitInternal, From,
                 (x, y) => From(x.Moles + y.Moles, BaseUnit), out result);
         }
 
         /// <summary>
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.ParseUnit("m", new CultureInfo("en-US"));
         /// </example>
@@ -742,8 +742,7 @@ private static AmountOfSubstanceUnit ParseUnitInternal(string str, IFormatProvid
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            var unit = unitSystem.Parse<AmountOfSubstanceUnit>(str.Trim());
+            var unit = UnitParser.Default.Parse<AmountOfSubstanceUnit>(str.Trim(), provider);
 
             if (unit == AmountOfSubstanceUnit.Undefined)
             {
@@ -760,7 +759,7 @@ private static AmountOfSubstanceUnit ParseUnitInternal(string str, IFormatProvid
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="unit">The parsed unit if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -773,8 +772,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            if(!unitSystem.TryParse<AmountOfSubstanceUnit>(str.Trim(), out unit))
+            if(!UnitParser.Default.TryParse<AmountOfSubstanceUnit>(str.Trim(), provider, out unit))
                 return false;
 
             if(unit == AmountOfSubstanceUnit.Undefined)

Common/GeneratedCode/Quantities/AmplitudeRatio.Common.g.cs

@@ -455,7 +455,7 @@ public static bool TryParseUnit(string str, out AmplitudeRatioUnit unit)
         ///     Parse a string with one or two quantities of the format "<quantity> <unit>".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.Parse("5.5 m", new CultureInfo("en-US"));
         /// </example>
@@ -478,17 +478,17 @@ private static AmplitudeRatio ParseInternal(string str, [CanBeNull] IFormatProvi
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.Parse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, ParseUnitInternal, From,
+            return QuantityParser.Default.Parse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, ParseUnitInternal, From,
                 (x, y) => From(x.DecibelVolts + y.DecibelVolts, BaseUnit));
         }
 
         /// <summary>
         ///     Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="result">Resulting unit quantity if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -501,17 +501,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.TryParse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, TryParseUnitInternal, From,
+            return QuantityParser.Default.TryParse<AmplitudeRatio, AmplitudeRatioUnit>(str, provider, TryParseUnitInternal, From,
                 (x, y) => From(x.DecibelVolts + y.DecibelVolts, BaseUnit), out result);
         }
 
         /// <summary>
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.ParseUnit("m", new CultureInfo("en-US"));
         /// </example>
@@ -521,8 +521,7 @@ private static AmplitudeRatioUnit ParseUnitInternal(string str, IFormatProvider
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            var unit = unitSystem.Parse<AmplitudeRatioUnit>(str.Trim());
+            var unit = UnitParser.Default.Parse<AmplitudeRatioUnit>(str.Trim(), provider);
 
             if (unit == AmplitudeRatioUnit.Undefined)
             {
@@ -539,7 +538,7 @@ private static AmplitudeRatioUnit ParseUnitInternal(string str, IFormatProvider
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="unit">The parsed unit if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -552,8 +551,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            if(!unitSystem.TryParse<AmplitudeRatioUnit>(str.Trim(), out unit))
+            if(!UnitParser.Default.TryParse<AmplitudeRatioUnit>(str.Trim(), provider, out unit))
                 return false;
 
             if(unit == AmplitudeRatioUnit.Undefined)

Common/GeneratedCode/Quantities/Angle.Common.g.cs

@@ -675,7 +675,7 @@ public static bool TryParseUnit(string str, out AngleUnit unit)
         ///     Parse a string with one or two quantities of the format "<quantity> <unit>".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.Parse("5.5 m", new CultureInfo("en-US"));
         /// </example>
@@ -698,17 +698,17 @@ private static Angle ParseInternal(string str, [CanBeNull] IFormatProvider provi
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.Parse<Angle, AngleUnit>(str, provider, ParseUnitInternal, From,
+            return QuantityParser.Default.Parse<Angle, AngleUnit>(str, provider, ParseUnitInternal, From,
                 (x, y) => From(x.Degrees + y.Degrees, BaseUnit));
         }
 
         /// <summary>
         ///     Try to parse a string with one or two quantities of the format "&lt;quantity&gt; &lt;unit&gt;".
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="result">Resulting unit quantity if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -721,17 +721,17 @@ private static bool TryParseInternal([CanBeNull] string str, [CanBeNull] IFormat
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            provider = provider ?? UnitSystem.DefaultCulture;
+            provider = provider ?? GlobalConfiguration.DefaultCulture;
 
-            return QuantityParser.TryParse<Angle, AngleUnit>(str, provider, TryParseUnitInternal, From,
+            return QuantityParser.Default.TryParse<Angle, AngleUnit>(str, provider, TryParseUnitInternal, From,
                 (x, y) => From(x.Degrees + y.Degrees, BaseUnit), out result);
         }
 
         /// <summary>
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <example>
         ///     Length.ParseUnit("m", new CultureInfo("en-US"));
         /// </example>
@@ -741,8 +741,7 @@ private static AngleUnit ParseUnitInternal(string str, IFormatProvider provider
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            var unit = unitSystem.Parse<AngleUnit>(str.Trim());
+            var unit = UnitParser.Default.Parse<AngleUnit>(str.Trim(), provider);
 
             if (unit == AngleUnit.Undefined)
             {
@@ -759,7 +758,7 @@ private static AngleUnit ParseUnitInternal(string str, IFormatProvider provider
         ///     Parse a unit string.
         /// </summary>
         /// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
-        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="UnitSystem.DefaultCulture" />.</param>
+        /// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
         /// <param name="unit">The parsed unit if successful.</param>
         /// <returns>True if successful, otherwise false.</returns>
         /// <example>
@@ -772,8 +771,7 @@ private static bool TryParseUnitInternal(string str, IFormatProvider provider, o
             if(string.IsNullOrWhiteSpace(str))
                 return false;
 
-            var unitSystem = UnitSystem.GetCached(provider);
-            if(!unitSystem.TryParse<AngleUnit>(str.Trim(), out unit))
+            if(!UnitParser.Default.TryParse<AngleUnit>(str.Trim(), provider, out unit))
                 return false;
 
             if(unit == AngleUnit.Undefined)