Added use of the Characters enum as a parameter to the Character() fu…

…nction as per Issue #2

MagicExpression.Test/GithubIssuesTests.cs

@@ -0,0 +1,45 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MagicExpression.Test
+{
+    [TestClass]
+    public class GithubIssuesTests
+    {
+        /// <summary>
+        /// Test showing the use of Character(Characters.Numerals)
+        /// </summary>
+        [TestMethod]
+        public void TestIssue2_CharacterEnumWithoutCharacterIn()
+        {
+            var ipAdress = Magex.New().Alternative(
+                Magex.New()
+                          .Character('2')
+                          .CharacterIn('0', '-', '4')
+                          .Character(Characters.Numeral),
+                Magex.New()
+                          .String("25")
+                          .CharacterIn('0', '-', '5'),
+                Magex.New()
+                          .CharacterIn('0', '1').Repeat.AtMostOnce()
+                          .Character(Characters.Numeral)
+                          .Character(Characters.Numeral).Repeat.AtMostOnce());
+
+            var expression = Magex.New().CaptureAs("First", ipAdress)
+                .Character('.')
+                .CaptureAs("Second", ipAdress)
+                .Character('.')
+                .CaptureAs("Third", ipAdress)
+                .Character('.')
+                .CaptureAs("Fourth", ipAdress);
+
+            Assert.AreEqual(
+                @"(?<First>(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))\.(?<Second>(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))\.(?<Third>(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))\.(?<Fourth>(?:2[0-4]\\d|25[0-5]|[01]?\\d\\d?))"
+                , expression.Expression, expression.Expression);
+        }
+
+    }
+}

MagicExpression.Test/MagicExpression.Test.csproj

@@ -52,6 +52,7 @@
   </Choose>
   <ItemGroup>
     <Compile Include="BackReferenceTest.cs" />
+    <Compile Include="GithubIssuesTests.cs" />
     <Compile Include="MagexBuilderTest.cs" />
     <Compile Include="RepetitionTest.cs" />
     <Compile Include="SyntaxTest.cs" />

MagicExpression/IMagex.cs

@@ -30,6 +30,7 @@ public interface IMagex : IExpressionElement
 
 		IMagex String(string val);
 		IRepeatable Character(char theChar);
+        IRepeatable Character(Characters ensemble);
 
 		IRepeatable Alternative(params IExpressionElement[] alternatives);
 		IRepeatable Alternative(params Action<IMagex>[] alternatives);

MagicExpression/Magex.cs

@@ -226,6 +226,17 @@ public IRepeatable Character(char theChar)
 			return this;
 		}
 
+        /// <summary>
+        /// Adds a specific character set
+        /// </summary>
+        /// <param name="theChar">A Characters enum.</param>
+        /// <returns>This, as a repeatable object.</returns>
+        public IRepeatable Character(Characters charEnsemble)
+        {
+            this.expression.Add(new StringElement(RegexCharacters.Get(charEnsemble)));
+            return this;
+        }
+
 		/// <summary>
 		/// Adds a line start/chain start (depending on options)
 		/// </summary>