Merge pull request #1 from alienlab/and-or-chars

Add one-char aliases for And and Or

Author: spavkov

BooleanLogicParser.Tests/ParserTests.cs

@@ -36,6 +36,36 @@ public class ParserTests
         [TestCase("!false and !true", ExpectedResult = false)]
         [TestCase("false and true and true", ExpectedResult = false)]
         [TestCase("false or true or false", ExpectedResult = true)]
+        [TestCase("true", ExpectedResult = true)]
+        [TestCase(")", ExpectedException = (typeof(Exception)))]
+        [TestCase("az", ExpectedException = (typeof(Exception)))]
+        [TestCase("", ExpectedException = (typeof(Exception)))]
+        [TestCase("()", ExpectedException = typeof(Exception))]
+        [TestCase("true&", ExpectedException = typeof(Exception))]
+        [TestCase("false", ExpectedResult = false)]
+        [TestCase("true ", ExpectedResult = true)]
+        [TestCase("false ", ExpectedResult = false)]
+        [TestCase(" true", ExpectedResult = true)]
+        [TestCase(" false", ExpectedResult = false)]
+        [TestCase(" true ", ExpectedResult = true)]
+        [TestCase(" false ", ExpectedResult = false)]
+        [TestCase("(false)", ExpectedResult = false)]
+        [TestCase("(true)", ExpectedResult = true)]
+        [TestCase("true&false", ExpectedResult = false)]
+        [TestCase("false&true", ExpectedResult = false)]
+        [TestCase("false&false", ExpectedResult = false)]
+        [TestCase("true&true", ExpectedResult = true)]
+        [TestCase("!true", ExpectedResult = false)]
+        [TestCase("!(true)", ExpectedResult = false)]
+        [TestCase("!(true", ExpectedException = typeof(Exception))]
+        [TestCase("!(!(true))", ExpectedResult = true)]
+        [TestCase("!false", ExpectedResult = true)]
+        [TestCase("!(false)", ExpectedResult = true)]
+        [TestCase("(!(false))&(!(true))", ExpectedResult = false)]
+        [TestCase("!((!(false))&(!(true)))", ExpectedResult = true)]
+        [TestCase("!false&!true", ExpectedResult = false)]
+        [TestCase("false&true&true", ExpectedResult = false)]
+        [TestCase("false|true|false", ExpectedResult = true)]
         public bool CanParseSingleToken(string expression)
         {
             var tokens = new Tokenizer(expression).Tokenize();

BooleanLogicParser.Tests/TokenizerTests.cs

@@ -8,9 +8,11 @@ namespace BooleanLogicParser.Tests
     public class TokenizerTests
     {
         [TestCase("And", ExpectedResult = typeof(AndToken))]
+        [TestCase("&", ExpectedResult = typeof(AndToken))]
         [TestCase("and", ExpectedResult = typeof(AndToken))]
         [TestCase("Or", ExpectedResult = typeof(OrToken))]
         [TestCase("or", ExpectedResult = typeof(OrToken))]
+        [TestCase("|", ExpectedResult = typeof(OrToken))]
         [TestCase("True", ExpectedResult = typeof(TrueToken))]
         [TestCase("False", ExpectedResult = typeof(FalseToken))]
         [TestCase("!", ExpectedResult = typeof(NegationToken))]

BooleanLogicParser/Tokenizer.cs

@@ -32,6 +32,14 @@ public IEnumerable<Token> Tokenize()
                 var c = (char) _reader.Peek();
                 switch (c)
                 {
+                    case '&':
+                        tokens.Add(new AndToken());
+                        _reader.Read();
+                        break;
+                    case '|':
+                        tokens.Add(new OrToken());
+                        _reader.Read();
+                        break;
                     case '!':
                         tokens.Add(new NegationToken());
                         _reader.Read();