Skip to content

Commit 49c99c7

Browse files
angularsenangularsen
committed
Remove internal ParseUnit methods
Same as for Parse methods. DRY it up.
1 parent c152aec commit 49c99c7

File tree

7 files changed

+42
-413
lines changed

7 files changed

+42
-413
lines changed

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

Lines changed: 6 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ public static Information Parse(string str, [CanBeNull] string cultureName)
655655
return QuantityParser.Default.Parse<Information, InformationUnit>(
656656
str,
657657
provider,
658-
ParseUnitInternal,
658+
UnitParser.Default.Parse<InformationUnit>,
659659
From,
660660
(x, y) => From(x.Bits + y.Bits, BaseUnit));
661661
}
@@ -689,7 +689,7 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
689689
return QuantityParser.Default.TryParse<Information, InformationUnit>(
690690
str,
691691
provider,
692-
TryParseUnitInternal,
692+
UnitParser.Default.TryParse<InformationUnit>,
693693
From,
694694
(x, y) => From(x.Bits + y.Bits, BaseUnit), out result);
695695
}
@@ -705,7 +705,7 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
705705
/// <exception cref="UnitsNetException">Error parsing string.</exception>
706706
public static InformationUnit ParseUnit(string str)
707707
{
708-
return ParseUnitInternal(str, null);
708+
return ParseUnit(str, null);
709709
}
710710

711711
/// <summary>
@@ -721,12 +721,12 @@ public static InformationUnit ParseUnit(string str)
721721
public static InformationUnit ParseUnit(string str, [CanBeNull] string cultureName)
722722
{
723723
IFormatProvider provider = GetFormatProviderFromCultureName(cultureName);
724-
return ParseUnitInternal(str, provider);
724+
return UnitParser.Default.Parse<InformationUnit>(str, provider);
725725
}
726726

727727
public static bool TryParseUnit(string str, out InformationUnit unit)
728728
{
729-
return TryParseUnitInternal(str, null, out unit);
729+
return TryParseUnit(str, null, out unit);
730730
}
731731

732732
/// <summary>
@@ -742,60 +742,7 @@ public static bool TryParseUnit(string str, out InformationUnit unit)
742742
public static bool TryParseUnit(string str, [CanBeNull] string cultureName, out InformationUnit unit)
743743
{
744744
IFormatProvider provider = GetFormatProviderFromCultureName(cultureName);
745-
return TryParseUnitInternal(str, provider, out unit);
746-
}
747-
748-
/// <summary>
749-
/// Parse a unit string.
750-
/// </summary>
751-
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
752-
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
753-
/// <example>
754-
/// Length.ParseUnit("m", new CultureInfo("en-US"));
755-
/// </example>
756-
/// <exception cref="ArgumentNullException">The value of 'str' cannot be null. </exception>
757-
/// <exception cref="UnitsNetException">Error parsing string.</exception>
758-
private static InformationUnit ParseUnitInternal(string str, IFormatProvider provider = null)
759-
{
760-
if (str == null) throw new ArgumentNullException(nameof(str));
761-
762-
var unit = UnitParser.Default.Parse<InformationUnit>(str.Trim(), provider);
763-
764-
if (unit == InformationUnit.Undefined)
765-
{
766-
var newEx = new UnitsNetException("Error parsing string. The unit is not a recognized InformationUnit.");
767-
newEx.Data["input"] = str;
768-
newEx.Data["provider"] = provider?.ToString() ?? "(null)";
769-
throw newEx;
770-
}
771-
772-
return unit;
773-
}
774-
775-
/// <summary>
776-
/// Parse a unit string.
777-
/// </summary>
778-
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
779-
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
780-
/// <param name="unit">The parsed unit if successful.</param>
781-
/// <returns>True if successful, otherwise false.</returns>
782-
/// <example>
783-
/// Length.ParseUnit("m", new CultureInfo("en-US"));
784-
/// </example>
785-
private static bool TryParseUnitInternal(string str, IFormatProvider provider, out InformationUnit unit)
786-
{
787-
unit = InformationUnit.Undefined;
788-
789-
if(string.IsNullOrWhiteSpace(str))
790-
return false;
791-
792-
if(!UnitParser.Default.TryParse<InformationUnit>(str.Trim(), provider, out unit))
793-
return false;
794-
795-
if(unit == InformationUnit.Undefined)
796-
return false;
797-
798-
return true;
745+
return UnitParser.Default.TryParse<InformationUnit>(str, provider, out unit);
799746
}
800747

801748
#endregion

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

Lines changed: 6 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ public static Length Parse(string str, [CanBeNull] string cultureName)
595595
return QuantityParser.Default.Parse<Length, LengthUnit>(
596596
str,
597597
provider,
598-
ParseUnitInternal,
598+
UnitParser.Default.Parse<LengthUnit>,
599599
From,
600600
(x, y) => From(x.Meters + y.Meters, BaseUnit));
601601
}
@@ -629,7 +629,7 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
629629
return QuantityParser.Default.TryParse<Length, LengthUnit>(
630630
str,
631631
provider,
632-
TryParseUnitInternal,
632+
UnitParser.Default.TryParse<LengthUnit>,
633633
From,
634634
(x, y) => From(x.Meters + y.Meters, BaseUnit), out result);
635635
}
@@ -645,7 +645,7 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
645645
/// <exception cref="UnitsNetException">Error parsing string.</exception>
646646
public static LengthUnit ParseUnit(string str)
647647
{
648-
return ParseUnitInternal(str, null);
648+
return ParseUnit(str, null);
649649
}
650650

651651
/// <summary>
@@ -661,12 +661,12 @@ public static LengthUnit ParseUnit(string str)
661661
public static LengthUnit ParseUnit(string str, [CanBeNull] string cultureName)
662662
{
663663
IFormatProvider provider = GetFormatProviderFromCultureName(cultureName);
664-
return ParseUnitInternal(str, provider);
664+
return UnitParser.Default.Parse<LengthUnit>(str, provider);
665665
}
666666

667667
public static bool TryParseUnit(string str, out LengthUnit unit)
668668
{
669-
return TryParseUnitInternal(str, null, out unit);
669+
return TryParseUnit(str, null, out unit);
670670
}
671671

672672
/// <summary>
@@ -682,60 +682,7 @@ public static bool TryParseUnit(string str, out LengthUnit unit)
682682
public static bool TryParseUnit(string str, [CanBeNull] string cultureName, out LengthUnit unit)
683683
{
684684
IFormatProvider provider = GetFormatProviderFromCultureName(cultureName);
685-
return TryParseUnitInternal(str, provider, out unit);
686-
}
687-
688-
/// <summary>
689-
/// Parse a unit string.
690-
/// </summary>
691-
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
692-
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
693-
/// <example>
694-
/// Length.ParseUnit("m", new CultureInfo("en-US"));
695-
/// </example>
696-
/// <exception cref="ArgumentNullException">The value of 'str' cannot be null. </exception>
697-
/// <exception cref="UnitsNetException">Error parsing string.</exception>
698-
private static LengthUnit ParseUnitInternal(string str, IFormatProvider provider = null)
699-
{
700-
if (str == null) throw new ArgumentNullException(nameof(str));
701-
702-
var unit = UnitParser.Default.Parse<LengthUnit>(str.Trim(), provider);
703-
704-
if (unit == LengthUnit.Undefined)
705-
{
706-
var newEx = new UnitsNetException("Error parsing string. The unit is not a recognized LengthUnit.");
707-
newEx.Data["input"] = str;
708-
newEx.Data["provider"] = provider?.ToString() ?? "(null)";
709-
throw newEx;
710-
}
711-
712-
return unit;
713-
}
714-
715-
/// <summary>
716-
/// Parse a unit string.
717-
/// </summary>
718-
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
719-
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
720-
/// <param name="unit">The parsed unit if successful.</param>
721-
/// <returns>True if successful, otherwise false.</returns>
722-
/// <example>
723-
/// Length.ParseUnit("m", new CultureInfo("en-US"));
724-
/// </example>
725-
private static bool TryParseUnitInternal(string str, IFormatProvider provider, out LengthUnit unit)
726-
{
727-
unit = LengthUnit.Undefined;
728-
729-
if(string.IsNullOrWhiteSpace(str))
730-
return false;
731-
732-
if(!UnitParser.Default.TryParse<LengthUnit>(str.Trim(), provider, out unit))
733-
return false;
734-
735-
if(unit == LengthUnit.Undefined)
736-
return false;
737-
738-
return true;
685+
return UnitParser.Default.TryParse<LengthUnit>(str, provider, out unit);
739686
}
740687

741688
#endregion

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

Lines changed: 6 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public static Level Parse(string str, [CanBeNull] string cultureName)
295295
return QuantityParser.Default.Parse<Level, LevelUnit>(
296296
str,
297297
provider,
298-
ParseUnitInternal,
298+
UnitParser.Default.Parse<LevelUnit>,
299299
From,
300300
(x, y) => From(x.Decibels + y.Decibels, BaseUnit));
301301
}
@@ -329,7 +329,7 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
329329
return QuantityParser.Default.TryParse<Level, LevelUnit>(
330330
str,
331331
provider,
332-
TryParseUnitInternal,
332+
UnitParser.Default.TryParse<LevelUnit>,
333333
From,
334334
(x, y) => From(x.Decibels + y.Decibels, BaseUnit), out result);
335335
}
@@ -345,7 +345,7 @@ public static bool TryParse([CanBeNull] string str, [CanBeNull] string cultureNa
345345
/// <exception cref="UnitsNetException">Error parsing string.</exception>
346346
public static LevelUnit ParseUnit(string str)
347347
{
348-
return ParseUnitInternal(str, null);
348+
return ParseUnit(str, null);
349349
}
350350

351351
/// <summary>
@@ -361,12 +361,12 @@ public static LevelUnit ParseUnit(string str)
361361
public static LevelUnit ParseUnit(string str, [CanBeNull] string cultureName)
362362
{
363363
IFormatProvider provider = GetFormatProviderFromCultureName(cultureName);
364-
return ParseUnitInternal(str, provider);
364+
return UnitParser.Default.Parse<LevelUnit>(str, provider);
365365
}
366366

367367
public static bool TryParseUnit(string str, out LevelUnit unit)
368368
{
369-
return TryParseUnitInternal(str, null, out unit);
369+
return TryParseUnit(str, null, out unit);
370370
}
371371

372372
/// <summary>
@@ -382,60 +382,7 @@ public static bool TryParseUnit(string str, out LevelUnit unit)
382382
public static bool TryParseUnit(string str, [CanBeNull] string cultureName, out LevelUnit unit)
383383
{
384384
IFormatProvider provider = GetFormatProviderFromCultureName(cultureName);
385-
return TryParseUnitInternal(str, provider, out unit);
386-
}
387-
388-
/// <summary>
389-
/// Parse a unit string.
390-
/// </summary>
391-
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
392-
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
393-
/// <example>
394-
/// Length.ParseUnit("m", new CultureInfo("en-US"));
395-
/// </example>
396-
/// <exception cref="ArgumentNullException">The value of 'str' cannot be null. </exception>
397-
/// <exception cref="UnitsNetException">Error parsing string.</exception>
398-
private static LevelUnit ParseUnitInternal(string str, IFormatProvider provider = null)
399-
{
400-
if (str == null) throw new ArgumentNullException(nameof(str));
401-
402-
var unit = UnitParser.Default.Parse<LevelUnit>(str.Trim(), provider);
403-
404-
if (unit == LevelUnit.Undefined)
405-
{
406-
var newEx = new UnitsNetException("Error parsing string. The unit is not a recognized LevelUnit.");
407-
newEx.Data["input"] = str;
408-
newEx.Data["provider"] = provider?.ToString() ?? "(null)";
409-
throw newEx;
410-
}
411-
412-
return unit;
413-
}
414-
415-
/// <summary>
416-
/// Parse a unit string.
417-
/// </summary>
418-
/// <param name="str">String to parse. Typically in the form: {number} {unit}</param>
419-
/// <param name="provider">Format to use when parsing number and unit. Defaults to <see cref="GlobalConfiguration.DefaultCulture" />.</param>
420-
/// <param name="unit">The parsed unit if successful.</param>
421-
/// <returns>True if successful, otherwise false.</returns>
422-
/// <example>
423-
/// Length.ParseUnit("m", new CultureInfo("en-US"));
424-
/// </example>
425-
private static bool TryParseUnitInternal(string str, IFormatProvider provider, out LevelUnit unit)
426-
{
427-
unit = LevelUnit.Undefined;
428-
429-
if(string.IsNullOrWhiteSpace(str))
430-
return false;
431-
432-
if(!UnitParser.Default.TryParse<LevelUnit>(str.Trim(), provider, out unit))
433-
return false;
434-
435-
if(unit == LevelUnit.Undefined)
436-
return false;
437-
438-
return true;
385+
return UnitParser.Default.TryParse<LevelUnit>(str, provider, out unit);
439386
}
440387

441388
#endregion

0 commit comments

Comments
 (0)