#363 - Continue applying shims to RDFModelUtilities

Author: mdesalvo

RDFSharp/Model/RDFModelShims.cs

@@ -31,6 +31,7 @@ internal static partial class RDFModelShims
         internal const string EightByteUnicodeRegexMask = @"\\U([0-9A-Fa-f]{8})";
         internal const string FourByteUnicodeRegexMask = @"\\u([0-9A-Fa-f]{4})";
         internal const string HexBinaryRegexMask = "^([0-9a-fA-F]{2})*$";
+        internal const string OwlRationalRegexMask = "^(0|(-)?([1-9])+([0-9])*)(/([1-9])+([0-9])*)?$";
         #endregion
 
         #region Ctors
@@ -43,13 +44,15 @@ static RDFModelShims()
             EightByteUnicodeRegexShim = EightByteUnicodeRegex();
             FourByteUnicodeRegexShim = FourByteUnicodeRegex();
             HexBinaryRegexShim = HexBinaryRegex();
+            OwlRationalRegexShim = OwlRationalRegex();
 #else
             PrefixRegexShim = new Regex(PrefixRegexMask, RegexOptions.Compiled);
             LanguageTagRegexShim = new Regex("^" + LanguageTagRegexMask + "$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
             TurtleLongLiteralCharsRegexShim = new Regex(TurtleLongLiteralCharsRegexMask, RegexOptions.Compiled);
             EightByteUnicodeRegexShim = new Regex(EightByteUnicodeRegexMask, RegexOptions.Compiled);
             FourByteUnicodeRegexShim = new Regex(FourByteUnicodeRegexMask, RegexOptions.Compiled);
             HexBinaryRegexShim = new Regex(HexBinaryRegexMask, RegexOptions.Compiled);
+            OwlRationalRegexShim = new Regex(OwlRationalRegexMask, RegexOptions.Compiled);
 #endif
         }
         #endregion
@@ -61,6 +64,7 @@ static RDFModelShims()
         internal static Regex EightByteUnicodeRegexShim { get; }
         internal static Regex FourByteUnicodeRegexShim { get; }
         internal static Regex HexBinaryRegexShim { get; }
+        internal static Regex OwlRationalRegexShim { get; }
         #endregion
 
 #if NET8_0_OR_GREATER
@@ -76,6 +80,8 @@ static RDFModelShims()
         private static partial Regex FourByteUnicodeRegex();
         [GeneratedRegex(HexBinaryRegexMask)]
         private static partial Regex HexBinaryRegex();
+        [GeneratedRegex(OwlRationalRegexMask)]
+        private static partial Regex OwlRationalRegex();
 #endif
     }
 }

RDFSharp/Model/RDFModelUtilities.cs

@@ -51,16 +51,12 @@ public static long CreateHash(string input)
         #endregion
 
         #region Strings
+
         /// <summary>
         /// UTF8 encoding which does not emit BOM (for better OS interoperability)
         /// </summary>
         internal static readonly UTF8Encoding UTF8_NoBOM = new UTF8Encoding(false);
 
-        /// <summary>
-        /// Regex to catch owl:rational typed literals
-        /// </summary>
-        internal static readonly Lazy<Regex> owlRational = new Lazy<Regex>(() => new Regex("^(0|(-)?([1-9])+([0-9])*)(/([1-9])+([0-9])*)?$", RegexOptions.Compiled));
-
         /// <summary>
         /// Alternative representations of boolean True
         /// </summary>
@@ -835,7 +831,7 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
                         : (false, literalValue);
 
                 case RDFModelEnums.RDFDatatypes.OWL_RATIONAL:
-                    bool isValidOwlRational = owlRational.Value.Match(literalValue).Success;
+                    bool isValidOwlRational = RDFModelShims.OwlRationalRegexShim.Match(literalValue).Success;
                     return (isValidOwlRational, literalValue);
 
                 case RDFModelEnums.RDFDatatypes.XSD_DOUBLE: