Regex performance changes and code tidy

Author: ZippyNeuron

src/ZippyNeuron.Metarwiz.Console/Program.cs

@@ -1,8 +1,10 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Text;
 using ZippyNeuron.Metarwiz.Parser;
 using ZippyNeuron.Metarwiz.Parser.Metars;
 using ZippyNeuron.Metarwiz.Parser.Remarks;
+using ZippyNeuron.Metarwiz.Parser.Types;
 
 namespace ZippyNeuron.Metarwiz.Console;
 
@@ -54,6 +56,11 @@ static void Main(string[] args)
         Out("Metar (Original)", $" | {metar}");
         Out("Metar (Processed)", $" | {metarwizResult}");
         Out("Metar (Checksum)", $" | Passed: {metarwizResult.ToString() == metar}");
+
+        Out("Enum CloudType", " | " + string.Join("|", Enum.GetNames<CloudType>()));
+        Out("Enum CloudFormType", " | " + string.Join("|", Enum.GetNames<CloudFormType>()));
+        Out("Enum RecentWeatherType", " | " + string.Join("|", Enum.GetNames<RecentWeatherType>()));
+        Out("Enum WeatherType", " | " + string.Join("|", Enum.GetNames<WeatherType>()));
     }
 
     private static void Out(string label, string value)

src/ZippyNeuron.Metarwiz.Console/ZippyNeuron.Metarwiz.Console.csproj

@@ -4,7 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>ZippyNeuron.Metarwiz.Console</RootNamespace>
-    <LangVersion>11</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/ZippyNeuron.Metarwiz/IMetarwiz.cs

@@ -5,6 +5,5 @@ namespace ZippyNeuron.Metarwiz;
 public interface IMetarwiz
 {
     public MetarwizResult Parse(string metar, string tag);
-
     public string ToString();
 }

src/ZippyNeuron.Metarwiz/Parser/Helpers/MetarConversion.cs

@@ -9,4 +9,4 @@ internal static class MetarConversion
     public static decimal StatuteToNauticalMiles = 0.868976m;
     public static decimal NauticalToStatuteMiles = 1.150780m;
     public static decimal MetersPerMile = 1609.34m;
-}
+}

src/ZippyNeuron.Metarwiz/Parser/IMetarItem.cs

@@ -1,6 +1,3 @@
 namespace ZippyNeuron.Metarwiz.Parser;
 
-public interface IMetarItem
-{
-
-}
+public interface IMetarItem { }

src/ZippyNeuron.Metarwiz/Parser/IMetarParser.cs

@@ -5,8 +5,7 @@ namespace ZippyNeuron.Metarwiz.Parser;
 internal interface IMetarParser
 {
     public IEnumerable<IMetarItem> Items { get; }
+    public MetarInfo Info { get; }
 
     public void Parse();
-
-    public MetarInfo Info { get; }
 }

src/ZippyNeuron.Metarwiz/Parser/MetarInfo.cs

@@ -30,25 +30,21 @@ internal MetarInfo(string metar, string tag)
 
     public bool HasRemarks => !string.IsNullOrEmpty(Remarks);
 
-    public override string ToString()
-    {
-        return $"{Metar}{((HasRemarks) ? String.Concat(" ", Remarks) : String.Empty)}{Terminator}";
-    }
+    public override string ToString() =>
+        $"{Metar}{((HasRemarks) ? string.Concat(" ", Remarks) : string.Empty)}{Terminator}";
 
-    private string RemoveTerminator(string metar)
-    {
-        return metar
+    private static string RemoveTerminator(string metar) =>
+        metar
             .Trim()
             .TrimEnd(TerminatorSymbol.ToCharArray())
             .Trim();
-    }
 
-    private string GetRemarks(string metar)
+    private static string GetRemarks(string metar)
     {
         int start = metar.IndexOf(RemarksTag, StringComparison.Ordinal);
 
         if (start < 0)
-            return String.Empty;
+            return string.Empty;
 
         return metar
             .Substring(start)
@@ -62,7 +58,7 @@ private string RemoveRemarks(string metar)
         if (start < 0)
             return metar;
 
-        return metar.Substring(0, start - 1)
+        return metar[..(start - 1)]
             .Trim();
     }
-}
+}

src/ZippyNeuron.Metarwiz/Parser/MetarItem.cs

@@ -2,8 +2,6 @@
 
 public class MetarItem : IMetarItem
 {
-    public override string ToString()
-    {
-        return string.Empty;
-    }
-}
+    public override string ToString() =>
+        string.Empty;
+}

src/ZippyNeuron.Metarwiz/Parser/MetarParser.cs

@@ -8,7 +8,7 @@ namespace ZippyNeuron.Metarwiz.Parser;
 
 internal sealed class MetarParser : IMetarParser
 {
-    private readonly List<MetarParserItem> _items = new();
+    private readonly List<MetarParserItem> _items = [];
     private readonly MetarInfo _metarInfo;
 
     internal MetarParser(string metar, string tag = null)
@@ -20,11 +20,10 @@ internal MetarParser(string metar, string tag = null)
 
     public MetarInfo Info => _metarInfo;
 
-    public IEnumerable<IMetarItem> Items => _items
+    public IEnumerable<IMetarItem> Items => [.. _items
             .OrderBy(i => i.Index)
             .Select((value) => value.Item)
-            .Cast<IMetarItem>()
-            .ToList();
+            .Cast<IMetarItem>()];
 
     public void Parse()
     {
@@ -41,9 +40,7 @@ private void ParseTypes(string metar, IEnumerable<Type> types)
 
         foreach (var type in types)
         {
-            var pattern = GetMatchPattern(type);
-
-            var matchCollection = Regex.Matches(metarCopy, pattern, RegexOptions.None);
+            var matchCollection = GetRegex(type).Matches(metarCopy);
 
             if (matchCollection.Count <= 0) continue;
 
@@ -69,9 +66,6 @@ private void ParseTypes(string metar, IEnumerable<Type> types)
         }
     }
 
-    private string GetMatchPattern(Type type)
-    {
-        return type.GetProperty("Pattern", BindingFlags.Static | BindingFlags.NonPublic)
-            ?.GetValue(null, null) as string;
-    }
-}
+    private static Regex GetRegex(Type type) =>
+        (Regex)type.GetMethod("Pattern", BindingFlags.Static | BindingFlags.NonPublic)?.Invoke(null, null);
+}

src/ZippyNeuron.Metarwiz/Parser/MetarParserFactory.cs

@@ -7,8 +7,7 @@ namespace ZippyNeuron.Metarwiz.Parser;
 
 internal static class MetarParserFactory
 {
-    public static MetarItem Create(Type t, Match m)
-    {
-        return (MetarItem)Activator.CreateInstance(t, BindingFlags.Instance | BindingFlags.NonPublic, null, new[] { m }, CultureInfo.InvariantCulture);
-    }
+    public static MetarItem Create(Type t, Match m) =>
+        (MetarItem)Activator
+            .CreateInstance(t, BindingFlags.Instance | BindingFlags.NonPublic, null, [m], CultureInfo.InvariantCulture);
 }