QuantityParser: Parse using given abbreviations cache

Replace delegates for external unit parsing code with UnitParser.

Author: angularsen

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Information.WindowsRuntimeComponent.g.cs

@@ -655,7 +655,6 @@ public static Information Parse(string str, [CanBeNull] string cultureName)
             return QuantityParser.Default.Parse<Information, InformationUnit>(
                 str,
                 provider,
-                UnitParser.Default.Parse<InformationUnit>,
                 From);
         }
 
@@ -688,7 +687,6 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
             return QuantityParser.Default.TryParse<Information, InformationUnit>(
                 str,
                 provider,
-                UnitParser.Default.TryParse<InformationUnit>,
                 From,
                 out result);
         }

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Length.WindowsRuntimeComponent.g.cs

@@ -595,7 +595,6 @@ public static Length Parse(string str, [CanBeNull] string cultureName)
             return QuantityParser.Default.Parse<Length, LengthUnit>(
                 str,
                 provider,
-                UnitParser.Default.Parse<LengthUnit>,
                 From);
         }
 
@@ -628,7 +627,6 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
             return QuantityParser.Default.TryParse<Length, LengthUnit>(
                 str,
                 provider,
-                UnitParser.Default.TryParse<LengthUnit>,
                 From,
                 out result);
         }

UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Level.WindowsRuntimeComponent.g.cs

@@ -295,7 +295,6 @@ public static Level Parse(string str, [CanBeNull] string cultureName)
             return QuantityParser.Default.Parse<Level, LevelUnit>(
                 str,
                 provider,
-                UnitParser.Default.Parse<LevelUnit>,
                 From);
         }
 
@@ -328,7 +327,6 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
             return QuantityParser.Default.TryParse<Level, LevelUnit>(
                 str,
                 provider,
-                UnitParser.Default.TryParse<LevelUnit>,
                 From,
                 out result);
         }

UnitsNet/CustomCode/QuantityParser.cs

@@ -30,8 +30,6 @@
 // ReSharper disable once CheckNamespace
 namespace UnitsNet
 {
-    internal delegate TUnitType ParseUnitDelegate<out TUnitType>(string unitString, IFormatProvider formatProvider) where TUnitType : Enum;
-    internal delegate bool TryParseUnitDelegate<TUnitType>(string unitString, IFormatProvider formatProvider, out TUnitType unit) where TUnitType : Enum;
 
 #if !WINDOWS_UWP
     internal delegate TQuantity QuantityFromDelegate<out TQuantity, in TUnitType>(QuantityValue value, TUnitType fromUnit)
@@ -51,12 +49,14 @@ internal class QuantityParser
         private const NumberStyles ParseNumberStyles = NumberStyles.Number | NumberStyles.Float | NumberStyles.AllowExponent;
 
         private readonly UnitAbbreviationsCache _unitAbbreviationsCache;
+        private UnitParser _unitParser;
 
         public static QuantityParser Default { get; }
 
         public QuantityParser(UnitAbbreviationsCache unitAbbreviationsCache)
         {
             _unitAbbreviationsCache = unitAbbreviationsCache ?? UnitAbbreviationsCache.Default;
+            _unitParser = new UnitParser(_unitAbbreviationsCache);
         }
 
         static QuantityParser()
@@ -67,13 +67,11 @@ static QuantityParser()
         [SuppressMessage("ReSharper", "UseStringInterpolation")]
         internal TQuantity Parse<TQuantity, TUnitType>([NotNull] string str,
             [CanBeNull] IFormatProvider formatProvider,
-            [NotNull] ParseUnitDelegate<TUnitType> parseUnit,
             [NotNull] QuantityFromDelegate<TQuantity, TUnitType> fromDelegate)
             where TQuantity : IQuantity
             where TUnitType : Enum
         {
             if (str == null) throw new ArgumentNullException(nameof(str));
-            if (parseUnit == null) throw new ArgumentNullException(nameof(parseUnit));
 
             var numFormat = formatProvider != null
                 ? (NumberFormatInfo) formatProvider.GetFormat(typeof(NumberFormatInfo))
@@ -91,13 +89,12 @@ internal TQuantity Parse<TQuantity, TUnitType>([NotNull] string str,
                 throw ex;
             }
 
-            return ParseWithRegex(valueString, unitString, parseUnit, fromDelegate, formatProvider);
+            return ParseWithRegex(valueString, unitString, fromDelegate, formatProvider);
         }
 
         [SuppressMessage("ReSharper", "UseStringInterpolation")]
         internal bool TryParse<TQuantity, TUnitType>([NotNull] string str,
             [CanBeNull] IFormatProvider formatProvider,
-            [NotNull] TryParseUnitDelegate<TUnitType> parseUnit,
             [NotNull] QuantityFromDelegate<TQuantity, TUnitType> fromDelegate,
             out TQuantity result)
             where TQuantity : IQuantity
@@ -119,7 +116,7 @@ internal bool TryParse<TQuantity, TUnitType>([NotNull] string str,
             if (!ExtractValueAndUnit(regex, str, out var valueString, out var unitString))
                 return false;
 
-            return TryParseWithRegex(valueString, unitString, parseUnit, fromDelegate, formatProvider, out result);
+            return TryParseWithRegex(valueString, unitString, fromDelegate, formatProvider, out result);
         }
 
         internal string CreateRegexPatternForUnit<TUnitType>(
@@ -148,26 +145,24 @@ private static string GetRegexPatternForUnitAbbreviations(IEnumerable<string> ab
         ///     Parse a string given a particular regular expression.
         /// </summary>
         /// <exception cref="UnitsNetException">Error parsing string.</exception>
-        private static TQuantity ParseWithRegex<TQuantity, TUnitType>(string valueString,
+        private TQuantity ParseWithRegex<TQuantity, TUnitType>(string valueString,
             string unitString,
-            ParseUnitDelegate<TUnitType> parseUnit,
             QuantityFromDelegate<TQuantity, TUnitType> fromDelegate,
             IFormatProvider formatProvider)
             where TQuantity : IQuantity
             where TUnitType : Enum
         {
             var value = double.Parse(valueString, ParseNumberStyles, formatProvider);
-            var parsedUnit = parseUnit(unitString, formatProvider);
+            var parsedUnit = _unitParser.Parse<TUnitType>(unitString, formatProvider);
             return fromDelegate(value, parsedUnit);
         }
 
         /// <summary>
         ///     Parse a string given a particular regular expression.
         /// </summary>
         /// <exception cref="UnitsNetException">Error parsing string.</exception>
-        private static bool TryParseWithRegex<TQuantity, TUnitType>(string valueString,
+        private bool TryParseWithRegex<TQuantity, TUnitType>(string valueString,
             string unitString,
-            TryParseUnitDelegate<TUnitType> tryParseUnit,
             QuantityFromDelegate<TQuantity, TUnitType> fromDelegate,
             IFormatProvider formatProvider,
             out TQuantity result)
@@ -177,10 +172,10 @@ private static bool TryParseWithRegex<TQuantity, TUnitType>(string valueString,
             result = default;
 
             if (!double.TryParse(valueString, ParseNumberStyles, formatProvider, out var value))
-                return false;
+                    return false;
 
-            if (!tryParseUnit(unitString, formatProvider, out var parsedUnit))
-                return false;
+            if (!_unitParser.TryParse<TUnitType>(unitString, formatProvider, out var parsedUnit))
+                    return false;
 
             result = fromDelegate(value, parsedUnit);
             return true;

UnitsNet/GeneratedCode/Quantities/Information.NetFramework.g.cs

@@ -611,7 +611,6 @@ public static Information Parse(string str, [CanBeNull] IFormatProvider provider
             return QuantityParser.Default.Parse<Information, InformationUnit>(
                 str,
                 provider,
-                UnitParser.Default.Parse<InformationUnit>,
                 From);
         }
 
@@ -643,7 +642,6 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] IFormatProvider
             return QuantityParser.Default.TryParse<Information, InformationUnit>(
                 str,
                 provider,
-                UnitParser.Default.TryParse<InformationUnit>,
                 From,
                 out result);
         }

UnitsNet/GeneratedCode/Quantities/Length.NetFramework.g.cs

@@ -555,7 +555,6 @@ public static Length Parse(string str, [CanBeNull] IFormatProvider provider)
             return QuantityParser.Default.Parse<Length, LengthUnit>(
                 str,
                 provider,
-                UnitParser.Default.Parse<LengthUnit>,
                 From);
         }
 
@@ -587,7 +586,6 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] IFormatProvider
             return QuantityParser.Default.TryParse<Length, LengthUnit>(
                 str,
                 provider,
-                UnitParser.Default.TryParse<LengthUnit>,
                 From,
                 out result);
         }

UnitsNet/GeneratedCode/Quantities/Level.NetFramework.g.cs

@@ -275,7 +275,6 @@ public static Level Parse(string str, [CanBeNull] IFormatProvider provider)
             return QuantityParser.Default.Parse<Level, LevelUnit>(
                 str,
                 provider,
-                UnitParser.Default.Parse<LevelUnit>,
                 From);
         }
 
@@ -307,7 +306,6 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] IFormatProvider
             return QuantityParser.Default.TryParse<Level, LevelUnit>(
                 str,
                 provider,
-                UnitParser.Default.TryParse<LevelUnit>,
                 From,
                 out result);
         }

UnitsNet/Scripts/Include-GenerateQuantitySourceCodeNetFramework.ps1

@@ -560,7 +560,6 @@ if ($wrc) {@"
             return QuantityParser.Default.Parse<$quantityName, $unitEnumName>(
                 str,
                 provider,
-                UnitParser.Default.Parse<$unitEnumName>,
                 From);
         }
 
@@ -600,7 +599,6 @@ if ($wrc) {@"
             return QuantityParser.Default.TryParse<$quantityName, $unitEnumName>(
                 str,
                 provider,
-                UnitParser.Default.TryParse<$unitEnumName>,
                 From,
                 out result);
         }