Fixed infinite loop when trying to parse an Atom, openend internals for use in the UI

Author: Vogel612

Rubberduck.RegexAssistant/Atom.cs

@@ -5,7 +5,7 @@
 
 namespace Rubberduck.RegexAssistant
 {
-    internal interface IAtom : IDescribable
+    public interface IAtom : IDescribable
     {
         string Specifier { get; }
     }
@@ -101,9 +101,9 @@ public override int GetHashCode()
         }
     }
 
-    internal class Group : IAtom
+    public class Group : IAtom
     {
-        public static readonly string Pattern = @"(?<!\\)\((?<expression>.*)(?<!\\)\)";
+        public static readonly string Pattern = @"(?<!\\)\((?<expression>.*(?<!\\))\)";
         private static readonly Regex Matcher = new Regex("^" + Pattern + "$");
 
         private readonly IRegularExpression _subexpression;
@@ -119,6 +119,8 @@ public Group(string specifier) {
             _specifier = specifier;
         }
 
+        public IRegularExpression Subexpression { get { return _subexpression; } }
+
         public string Specifier
         {
             get

Rubberduck.RegexAssistant/IRegularExpression.cs

@@ -13,7 +13,7 @@ public interface IRegularExpression : IDescribable
         IList<IRegularExpression> Subexpressions { get; }
     }
 
-    internal class ConcatenatedExpression : IRegularExpression
+    public class ConcatenatedExpression : IRegularExpression
     {
         private readonly Quantifier _quantifier;
         private readonly IList<IRegularExpression> _subexpressions;
@@ -28,7 +28,8 @@ public string Description
         {
             get
             {
-                return string.Join(Environment.NewLine, _subexpressions.Select(exp => exp.Description));
+                return AssistantResources.ExpressionDescription_ConcatenatedExpression;
+                //return string.Join(Environment.NewLine, _subexpressions.Select(exp => exp.Description));
             }
         }
 
@@ -49,7 +50,7 @@ public IList<IRegularExpression> Subexpressions
         }
     }
 
-    internal class AlternativesExpression : IRegularExpression
+    public class AlternativesExpression : IRegularExpression
     {
         private readonly Quantifier _quantifier;
         private readonly IList<IRegularExpression> _subexpressions;
@@ -64,7 +65,8 @@ public string Description
         {
             get
             {
-                return AssistantResources.ExpressionDescription_AlternativesExpression + Environment.NewLine + string.Join(Environment.NewLine, _subexpressions.Select(exp => exp.Description));
+                return AssistantResources.ExpressionDescription_AlternativesExpression;
+                // + Environment.NewLine + string.Join(Environment.NewLine, _subexpressions.Select(exp => exp.Description))
             }
         }
 
@@ -85,7 +87,7 @@ public IList<IRegularExpression> Subexpressions
         }
     }
 
-    internal class SingleAtomExpression : IRegularExpression
+    public class SingleAtomExpression : IRegularExpression
     {
         public readonly IAtom Atom;
         private readonly Quantifier _quantifier;
@@ -190,8 +192,11 @@ private static IRegularExpression ParseIntoConcatenatedExpression(ref string spe
         {
             List<IRegularExpression> subexpressions = new List<IRegularExpression>();
             string currentSpecifier = specifier;
-            while (currentSpecifier.Length > 0)
+            int oldSpecifierLength = currentSpecifier.Length + 1;
+            while (currentSpecifier.Length > 0 && currentSpecifier.Length < oldSpecifierLength)
             {
+                // Fugly hack for an error-return
+                oldSpecifierLength = currentSpecifier.Length;
                 IRegularExpression expression;
                 // we actually have an AlternativesExpression, return the current status to Parse after updating the specifier
                 if (currentSpecifier[0].Equals('|'))

Rubberduck.RegexAssistant/Pattern.cs

@@ -5,7 +5,7 @@ namespace Rubberduck.RegexAssistant
 {
     public class Pattern : IDescribable
     {
-        IRegularExpression RootExpression;
+        public IRegularExpression RootExpression;
         MatcherFlags Flags;
 
         private readonly bool _hasStartAnchor;
@@ -29,7 +29,7 @@ public Pattern(string expression, bool ignoreCase, bool global)
             _hasStartAnchor = expression[0].Equals('^');
 
             int start = _hasStartAnchor ? 1 : 0;
-            int end = (_hasEndAnchor ? 1 : 0) + start + 1;
+            int end = (_hasEndAnchor ? 1 : 0) + start;
             RootExpression = RegularExpression.Parse(expression.Substring(start, expression.Length - end));
             _description = AssembleDescription();
         }

Rubberduck.RegexAssistant/i18n/AssistantResources.Designer.cs

@@ -189,6 +189,9 @@
   <data name="ExpressionDescription_AlternativesExpression" xml:space="preserve">
     <value>Matches one of the following alternatives:</value>
   </data>
+  <data name="ExpressionDescription_ConcatenatedExpression" xml:space="preserve">
+    <value>Matches the exact sequence given as follows:</value>
+  </data>
   <data name="PatternDescription_AnchorEnd" xml:space="preserve">
     <value>$ ensures all characters of the string are consumed</value>
   </data>