Shim optimizations

Author: Marco De Salvo

RDFSharp/Model/RDFModelShims.cs

@@ -23,24 +23,30 @@ namespace RDFSharp.Model
     /// </summary>
     public static partial class RDFModelShims
     {
-        #region Regex
-
+        #region Constants
         internal const string PrefixRegexMask = @"^[a-zA-Z0-9_\-]+$";
-        internal static Regex PrefixRegexShim =>
-#if NET8_0_OR_GREATER
-            PrefixRegex();
-#else
-            new Regex(PrefixRegexMask, RegexOptions.Compiled);
-#endif
-
         internal const string SubLanguageTagRegexMask = "(-[a-zA-Z0-9]{1,8})*(--ltr|--rtl)?";
         internal const string LanguageTagRegexMask = "[a-zA-Z]{1,8}" + SubLanguageTagRegexMask;
-        internal static Regex LanguageTagRegexShim() =>
+        #endregion
+
+        #region Ctors
+        static RDFModelShims()
+        {
 #if NET8_0_OR_GREATER
-            LanguageTagRegex();
+            PrefixRegexShim = PrefixRegex();
+            LanguageTagRegexShim = LanguageTagRegex();
 #else
-            new Regex("^" + LanguageTagRegexMask + "$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+            PrefixRegexShim = new Regex(PrefixRegexMask, RegexOptions.Compiled);
+            LanguageTagRegexShim = new Regex("^" + LanguageTagRegexMask + "$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 #endif
+        }
+        #endregion
+
+        #region Properties
+        internal static Regex PrefixRegexShim { get; }
+
+        internal static Regex LanguageTagRegexShim { get; }
+        #endregion
 
 #if NET8_0_OR_GREATER
         [GeneratedRegex(PrefixRegexMask)]
@@ -49,7 +55,5 @@ internal static Regex LanguageTagRegexShim() =>
         [GeneratedRegex("^" + LanguageTagRegexMask + "$", RegexOptions.IgnoreCase)]
         private static partial Regex LanguageTagRegex();
 #endif
-
-        #endregion
     }
 }

RDFSharp/Model/RDFModelUtilities.cs

@@ -664,7 +664,7 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
                     return (isValidNormalizedString, literalValue);
 
                 case RDFModelEnums.RDFDatatypes.XSD_LANGUAGE:
-                    bool isValidLanguage = RDFModelShims.LanguageTagRegexShim().Match(literalValue).Success;
+                    bool isValidLanguage = RDFModelShims.LanguageTagRegexShim.Match(literalValue).Success;
                     return (isValidLanguage, literalValue);
 
                 case RDFModelEnums.RDFDatatypes.XSD_BASE64BINARY:

RDFSharp/Model/RDFPlainLiteral.cs

@@ -50,7 +50,7 @@ public RDFPlainLiteral(string value)
         /// </summary>
         public RDFPlainLiteral(string value, string language) : this(value)
         {
-            if (language != null && RDFModelShims.LanguageTagRegexShim().Match(language).Success)
+            if (language != null && RDFModelShims.LanguageTagRegexShim.Match(language).Success)
                 Language = language.ToUpperInvariant();
         }
         #endregion

RDFSharp/Model/Validation/Abstractions/Constraints/RDFLanguageInConstraint.cs

@@ -44,7 +44,7 @@ public RDFLanguageInConstraint(List<string> languageTags)
             languageTags?.ForEach(lt =>
             {
                 string languageTag = lt?.Trim() ?? string.Empty;
-                if (languageTag == string.Empty || languageTag == "*" || RDFModelShims.LanguageTagRegexShim().Match(languageTag).Success)
+                if (languageTag == string.Empty || languageTag == "*" || RDFModelShims.LanguageTagRegexShim.Match(languageTag).Success)
                     LanguageTags.Add(languageTag.ToUpperInvariant());
             });
         }

RDFSharp/Query/Mirella/Algebra/Filters/RDFLangMatchesFilter.cs

@@ -61,7 +61,7 @@ public RDFLangMatchesFilter(RDFVariable variable, string language)
             #endregion
 
             bool acceptsNoneOrAnyLanguageTag = (string.IsNullOrEmpty(language) || language == "*");
-            if (acceptsNoneOrAnyLanguageTag || RDFModelShims.LanguageTagRegexShim().Match(language).Success)
+            if (acceptsNoneOrAnyLanguageTag || RDFModelShims.LanguageTagRegexShim.Match(language).Success)
             {
                 VariableName = variable.ToString();
                 Language = language?.ToUpperInvariant() ?? string.Empty;