Limit access modifers throughout the Regex codebase

Author: ViktorHofer

src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunner.cs

@@ -10,9 +10,9 @@ internal sealed class CompiledRegexRunner : RegexRunner
         private Func<RegexRunner, bool> _findFirstCharMethod;
         private Action<RegexRunner> _initTrackCountMethod;
 
-        internal CompiledRegexRunner() { }
+        public CompiledRegexRunner() { }
 
-        internal void SetDelegates(Action<RegexRunner> go, Func<RegexRunner,bool> firstChar, Action<RegexRunner> trackCount)
+        public void SetDelegates(Action<RegexRunner> go, Func<RegexRunner,bool> firstChar, Action<RegexRunner> trackCount)
         {
             _goMethod = go;
             _findFirstCharMethod = firstChar;

src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/CompiledRegexRunnerFactory.cs

@@ -12,7 +12,7 @@ internal sealed class CompiledRegexRunnerFactory : RegexRunnerFactory
         private readonly DynamicMethod _findFirstCharMethod;
         private readonly DynamicMethod _initTrackCountMethod;
 
-        internal CompiledRegexRunnerFactory(DynamicMethod go, DynamicMethod firstChar, DynamicMethod trackCount)
+        public CompiledRegexRunnerFactory(DynamicMethod go, DynamicMethod firstChar, DynamicMethod trackCount)
         {
             _goMethod = go;
             _findFirstCharMethod = firstChar;

src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Reference.cs

@@ -21,7 +21,7 @@ internal sealed class ExclusiveReference
         /// If the exclusive lock can't be obtained, null is returned;
         /// if the object can't be returned, the lock is released.
         /// </summary>
-        internal object Get()
+        public object Get()
         {
             // try to obtain the lock
 
@@ -53,7 +53,7 @@ internal object Get()
         /// If the object is the one that's under lock, the lock is released.
         /// If there is no cached object, then the lock is obtained and the object is placed in the cache.
         /// </summary>
-        internal void Release(object obj)
+        public void Release(object obj)
         {
             if (obj == null)
                 throw new ArgumentNullException(nameof(obj));
@@ -100,7 +100,7 @@ internal sealed class SharedReference
         /// If the exclusive lock can't be obtained, null is returned;
         /// Note that _ref.Target is referenced only under the protection of the lock. (Is this necessary?)
         /// </summary>
-        internal object Get()
+        public object Get()
         {
             if (0 == Interlocked.Exchange(ref _locked, 1))
             {
@@ -117,7 +117,7 @@ internal object Get()
         /// 
         /// Note that _ref.Target is referenced only under the protection of the lock. (Is this necessary?)
         /// </summary>
-        internal void Cache(object obj)
+        public void Cache(object obj)
         {
             if (0 == Interlocked.Exchange(ref _locked, 1))
             {

src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.Cache.cs

@@ -13,7 +13,6 @@ public partial class Regex
         internal static LinkedList<CachedCodeEntry> s_livecode = new LinkedList<CachedCodeEntry>();// the cache of code and factories that are currently loaded
         internal static int s_cacheSize = 15;
 
-        [SuppressMessage("Microsoft.Concurrency", "CA8001", Justification = "Reviewed for thread-safety")]
         public static int CacheSize
         {
             get
@@ -101,7 +100,7 @@ private CachedCodeEntry CacheCode(CachedCodeEntryKey key)
             private readonly string _cultureKey;
             private readonly string _pattern;
 
-            internal CachedCodeEntryKey(RegexOptions options, string cultureKey, string pattern)
+            public CachedCodeEntryKey(RegexOptions options, string cultureKey, string pattern)
             {
                 _options = options;
                 _cultureKey = cultureKey;
@@ -139,19 +138,20 @@ public override int GetHashCode()
         /// </summary>
         internal sealed class CachedCodeEntry
         {
-            internal CachedCodeEntryKey _key;
-            internal RegexCode _code;
-            internal Hashtable _caps;
-            internal Hashtable _capnames;
-            internal string[] _capslist;
+            public CachedCodeEntryKey _key;
+            public RegexCode _code;
+            public Hashtable _caps;
+            public Hashtable _capnames;
+            public string[] _capslist;
 #if FEATURE_COMPILED
-            internal RegexRunnerFactory _factory;
+            public RegexRunnerFactory _factory;
 #endif
-            internal int _capsize;
-            internal ExclusiveReference _runnerref;
-            internal SharedReference _replref;
+            public int _capsize;
+            public ExclusiveReference _runnerref;
+            public SharedReference _replref;
 
-            internal CachedCodeEntry(CachedCodeEntryKey key, Hashtable capnames, string[] capslist, RegexCode code, Hashtable caps, int capsize, ExclusiveReference runner, SharedReference repl)
+            public CachedCodeEntry(CachedCodeEntryKey key, Hashtable capnames, string[] capslist, RegexCode code, 
+                Hashtable caps, int capsize, ExclusiveReference runner, SharedReference repl)
             {
                 _key = key;
                 _capnames = capnames;
@@ -166,7 +166,7 @@ internal CachedCodeEntry(CachedCodeEntryKey key, Hashtable capnames, string[] ca
             }
 
 #if FEATURE_COMPILED
-            internal void AddCompiled(RegexRunnerFactory factory)
+            public void AddCompiled(RegexRunnerFactory factory)
             {
                 _factory = factory;
                 _code = null;

src/System.Text.RegularExpressions/src/System/Text/RegularExpressions/Regex.cs

@@ -124,11 +124,11 @@ private Regex(string pattern, RegexOptions options, TimeSpan matchTimeout, bool
                 RegexTree tree = RegexParser.Parse(pattern, roptions);
 
                 // Extract the relevant information
-                capnames = tree._capnames;
-                capslist = tree._capslist;
+                capnames = tree.CapNames;
+                capslist = tree.CapsList;
                 _code = RegexWriter.Write(tree);
-                caps = _code._caps;
-                capsize = _code._capsize;
+                caps = _code.Caps;
+                capsize = _code.CapSize;
 
                 InitializeReferences();