refact FindTemplateParser

Author: RomanSoloweow

src/SimpleStateMachine.StructuralSearch.Sandbox/Program.cs

@@ -10,6 +10,7 @@ internal static class Program
     {
         static void Main(string[] args)
         {
+            var template = StructuralSearch.ParseTemplate("");
             var test = Parser.OneOf(String("Test"), CommonParser.Empty);
             var res = test.ParseOrThrow("");
             // var lookahead = Parser.Lookahead(Char(';').Then(End).Try());

src/SimpleStateMachine.StructuralSearch.Tests/PlaceholderParserTests.cs

@@ -1,10 +1,18 @@
-using Pidgin;
+using System;
+using Pidgin;
 using Xunit;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
 {
     public class PlaceholderParserTests
     {
+        // [Fact]
+        // public void FindTemplateShouldBeNotEmpty()
+        // {
+        //     Assert.Throws<Exception>(() => StructuralSearch.ParseTemplate(string.Empty));
+        // }
+        
+        
         // [Theory]
         // [InlineData("($test$)", "(value )", "value ")]
         // [InlineData("($test$ )", "(value )", "value")]

src/SimpleStateMachine.StructuralSearch/StructuralSearch/FindTemplateParser.cs

@@ -6,35 +6,44 @@ namespace SimpleStateMachine.StructuralSearch
 {
     public static class FindTemplateParser
     {
+        //TODO return string for all parsers exclude  TemplateParser
         static FindTemplateParser()
         {
             Parenthesised = Parsers.BetweenOneOfChars(ParserToParser.StringcMatch,
-                Parser.Rec(() => Term.Or(Empty)),
+                Parser.Rec(() => Term),
                 Constant.AllParenthesised);
 
             Term = Parser.OneOf(Parenthesised, Token)
-                .AtLeastOnce().MergerMany();
-            
-            TemplateParser = Term.JoinResults();
+                .Many()
+                .MergerMany();
+
+            TemplateParser = Parser.OneOf(Parenthesised, Token)
+                .AtLeastOnce()
+                .MergerMany()
+                .JoinResults();
         }
 
 
         public static readonly Parser<char, IEnumerable<Parser<char, SourceMatch>>> Empty =
-            ParserToParser.ResultAsMatch(CommonParser.Empty).AsMany();  
+            ParserToParser.ResultAsMatch(CommonParser.Empty)
+                .AsMany();  
 
         public static readonly Parser<char, Parser<char, SourceMatch>> AnyString =
-            ParserToParser.ResultAsMatch(CommonParser.AnyString).Try();
+            ParserToParser.ResultAsMatch(CommonParser.AnyString)
+                .Try();
 
         public static readonly Parser<char, Parser<char, SourceMatch>> WhiteSpaces =
-            ParserToParser.ResultAsMatch(CommonParser.WhiteSpaces).Try();  
+            ParserToParser.ResultAsMatch(CommonParser.WhiteSpaces)
+                .Try();  
 
         public static readonly Parser<char, Parser<char, SourceMatch>> Placeholder = 
             CommonTemplateParser.Placeholder
                 .Select(name => new PlaceholderParser(name))
                 .Cast<Parser<char, SourceMatch>>(); 
 
         public static readonly Parser<char, IEnumerable<Parser<char, SourceMatch>>> Token =
-            Parser.OneOf(AnyString, Placeholder, WhiteSpaces).AsMany(); 
+            Parser.OneOf(AnyString, Placeholder, WhiteSpaces)
+                .AsMany(); 
 
         public static readonly Parser<char, IEnumerable<Parser<char, SourceMatch>>> Term;