Merge branch 'regex-complied'

Humanizr · Dec 22, 2014 · 9210e17 · 9210e17
2 parents d5b6587 + 002cb06
commit 9210e17
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/release_notes.md b/release_notes.md
@@ -1,6 +1,7 @@
 ###In Development
 
- - [#364](https://github.com/MehdiK/Humanizer/pull/364): Adding "campuses" as plural of "campus"
+ - [#364](https://github.com/MehdiK/Humanizer/pull/364): Added "campuses" as plural of "campus"
+ - [#363](https://github.com/MehdiK/Humanizer/pull/363): Use RegexOptions.Compiled if available
 
 [Commits](https://github.com/MehdiK/Humanizer/compare/v1.32.0...master)
 
@@ -18,7 +19,7 @@
 
 ###v1.31.0 - 2014-11-08
   - [#340](https://github.com/MehdiK/Humanizer/pull/340): Fixed TimeSpan humanization precision skips units after the largest one when they're zero until it finds a non-zero unit
-  - [#347](https://github.com/MehdiK/Humanizer/pull/347): Changed één to 1 for dutch language.
+  - [#347](https://github.com/MehdiK/Humanizer/pull/347): Changed één to 1 for dutch language.
 
 [Commits](https://github.com/MehdiK/Humanizer/compare/v1.30.0...v1.31.0)
 

diff --git a/src/Humanizer/Humanizer.csproj b/src/Humanizer/Humanizer.csproj
@@ -109,6 +109,7 @@
     <Compile Include="Localisation\Ordinalizers\ItalianOrdinalizer.cs" />
     <Compile Include="Localisation\Tense.cs" />
     <Compile Include="Localisation\NumberToWords\SpanishNumberToWordsConverter.cs" />
+    <Compile Include="RegexOptionsUtil.cs" />
     <Compile Include="TimeSpanHumanizeExtensions.cs" />
     <Compile Include="FluentDate\In.SomeTimeFrom.cs">
       <AutoGen>True</AutoGen>

diff --git a/src/Humanizer/InflectorExtensions.cs b/src/Humanizer/InflectorExtensions.cs
@@ -127,7 +127,7 @@ private class Rule
 
             public Rule(string pattern, string replacement)
             {
-                _regex = new Regex(pattern, RegexOptions.IgnoreCase);
+                _regex = new Regex(pattern, RegexOptions.IgnoreCase | RegexOptionsUtil.Compiled);
                 _replacement = replacement;
             }
 

diff --git a/src/Humanizer/RegexOptionsUtil.cs b/src/Humanizer/RegexOptionsUtil.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace Humanizer
+{
+    internal static class RegexOptionsUtil
+    {
+        private static readonly RegexOptions _compiled;
+
+        static RegexOptionsUtil()
+        {
+            RegexOptions compiled;
+            _compiled = Enum.TryParse("Compiled", out compiled) ? compiled : RegexOptions.None;
+        }
+
+        public static RegexOptions Compiled
+        {
+            get { return _compiled; }
+        }
+    }
+}
diff --git a/src/Humanizer/RomanNumeralExtensions.cs b/src/Humanizer/RomanNumeralExtensions.cs
@@ -34,7 +34,7 @@ public static class RomanNumeralExtensions
         private static readonly Regex ValidRomanNumeral = 
             new Regex(
                 "^(?i:(?=[MDCLXVI])((M{0,3})((C[DM])|(D?C{0,3}))?((X[LC])|(L?XX{0,2})|L)?((I[VX])|(V?(II{0,2}))|V)?))$",
-                RegexOptions.None);
+                RegexOptionsUtil.Compiled);
 
         /// <summary>
         /// Converts Roman numbers into integer

diff --git a/src/Humanizer/StringHumanizeExtensions.cs b/src/Humanizer/StringHumanizeExtensions.cs
@@ -15,8 +15,8 @@ public static class StringHumanizeExtensions
         static StringHumanizeExtensions()
         {
             PascalCaseWordPartsRegex = new Regex(@"[A-Z]?[a-z]+|[0-9]+|[A-Z]+(?=[A-Z][a-z]|[0-9]|\b)",
-                RegexOptions.IgnorePatternWhitespace | RegexOptions.ExplicitCapture);
-            FreestandingSpacingCharRegex = new Regex(@"\s[-_]|[-_]\s");
+                RegexOptions.IgnorePatternWhitespace | RegexOptions.ExplicitCapture | RegexOptionsUtil.Compiled);
+            FreestandingSpacingCharRegex = new Regex(@"\s[-_]|[-_]\s", RegexOptionsUtil.Compiled);
         }
 
         static string FromUnderscoreDashSeparatedWords (string input)