fix error, remove unused namespaces

RomanSoloweow · RomanSoloweow · commit 721588731c10 · 2022-09-03T23:23:56.000+04:00
diff --git a/SimpleStateMachine.StructuralSearch.Action/Program.cs b/SimpleStateMachine.StructuralSearch.Action/Program.cs
@@ -1,6 +1,4 @@
-﻿using System.Text;
-using SimpleStateMachine.StructuralSearch.Action;
-using System.Web;
+﻿using SimpleStateMachine.StructuralSearch.Action;
 using CommandLine;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileSystemGlobbing;
diff --git a/src/SimpleStateMachine.StructuralSearch.Sandbox/Expr.cs b/src/SimpleStateMachine.StructuralSearch.Sandbox/Expr.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Collections.Immutable;
-using System.Linq;
+﻿using System.Collections.Immutable;
 
 namespace SimpleStateMachine.StructuralSearch.Sandbox
 {
diff --git a/src/SimpleStateMachine.StructuralSearch.Sandbox/ExprParser.cs b/src/SimpleStateMachine.StructuralSearch.Sandbox/ExprParser.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using Pidgin;
+﻿using Pidgin;
 using Pidgin.Expression;
 using static Pidgin.Parser;
 
diff --git a/src/SimpleStateMachine.StructuralSearch.Sandbox/Program.cs b/src/SimpleStateMachine.StructuralSearch.Sandbox/Program.cs
@@ -1,19 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using Pidgin;
-using SimpleStateMachine.StructuralSearch.Configurations;
+﻿using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Helper;
-using SimpleStateMachine.StructuralSearch.Rules;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
 using static Pidgin.Parser;
-using String = System.String;
 
 namespace SimpleStateMachine.StructuralSearch.Sandbox
 {
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFile/If.yml b/src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFile/If.yml
@@ -0,0 +1,6 @@
+Configurations:
+  - FindTemplate: if($var1$ == $var2$)
+    FindRules:
+      - $var1$ Is Var
+      - $var2$ is Var
+    ReplaceTemplate: $var1$, $var2$
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFileTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFileTests.cs
@@ -1,17 +1,12 @@
 ﻿using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-using Pidgin;
 using SimpleStateMachine.StructuralSearch.Configurations;
 using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.Tests.Mock;
 using Xunit;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
 {
-    public class ConfigurationFileTests
+    public class ConfigurationFileParserTests
     {
         [Theory]
         [InlineData("ConfigurationFile/ShortConfig.yml")]
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common.cs
@@ -1,8 +1,4 @@
-﻿using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-
-namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
+﻿namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
 
 public class Common
 {
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common2.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common2.cs
@@ -1,8 +1,4 @@
-﻿using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
-
-namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
+﻿namespace SimpleStateMachine.StructuralSearch.Tests.Examples;
 
 public class Common2
 {
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/TernaryOperator.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/TernaryOperator.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput
+﻿namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput
 {
     public class TernaryOperator
     {
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Test.txt b/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Test.txt
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesOutput/NullUnionOperator.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ExamplesOutput/NullUnionOperator.cs
@@ -1,4 +1,4 @@
-﻿namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput;
+﻿namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesOutput;
 
 public class NullUnionOperator
 {
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/FindRuleParserTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/FindRuleParserTests.cs
@@ -1,8 +1,6 @@
-﻿using System;
-using System.IO;
+﻿using System.IO;
 using System.Linq;
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Rules;
 using Xunit;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
@@ -29,6 +27,7 @@ public class FindRuleParserTests
         [InlineData("$var$ Is Int")]
         [InlineData("$var$ Is DateTime")]
         [InlineData("$var$ equals $var1$ or $var2$ equals $var1$")]
+         [InlineData("$var$ match \"[a-b]+\"")]
         public void FindRuleExprParsingShouldBeSuccess(string ruleStr)
         {
             var rule = FindRuleParser.Expr.ParseOrThrow(ruleStr);
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/PlaceholderParserTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/PlaceholderParserTests.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-using System.Linq;
-using Microsoft.VisualBasic;
+﻿using System.Linq;
 using Pidgin;
 using Xunit;
 
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ReplaceRuleParserTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ReplaceRuleParserTests.cs
@@ -1,5 +1,4 @@
-﻿using System.Linq;
-using Pidgin;
+﻿using Pidgin;
 using Xunit;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/ReplaceTemplateTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/ReplaceTemplateTests.cs
@@ -1,8 +1,6 @@
-﻿using System.Collections.Generic;
-using System.IO;
+﻿using System.IO;
 using System.Linq;
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Tests.Mock;
 using Xunit;
 
 namespace SimpleStateMachine.StructuralSearch.Tests
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/SimpleStateMachine.StructuralSearch.Tests.csproj b/src/SimpleStateMachine.StructuralSearch.Tests/SimpleStateMachine.StructuralSearch.Tests.csproj
@@ -28,7 +28,7 @@
         <Content Include="ExamplesOutput\*.txt">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </Content>
-        <Content Include="ExamplesInput\*.cs">
+        <Content Include="ExamplesInput\*">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </Content>
         <Content Include="FindTemplate\*.txt">
diff --git a/src/SimpleStateMachine.StructuralSearch.Tests/StructurSearchParserTests.cs b/src/SimpleStateMachine.StructuralSearch.Tests/StructurSearchParserTests.cs
@@ -1,5 +1,8 @@
-﻿using System.IO;
+﻿using System;
+using System.IO;
 using System.Linq;
+using SimpleStateMachine.StructuralSearch.Configurations;
+using SimpleStateMachine.StructuralSearch.Helper;
 using SimpleStateMachine.StructuralSearch.Tests.Mock;
 using Xunit;
 
@@ -30,6 +33,7 @@ public static void StructuralSearchShouldBeSuccess(string exampleName, string ex
         [InlineData("TernaryOperator", 3)]
         public static void StructuralSearchShouldBe(string exampleName, int matchesCount)
         {
+            var startTime = System.Diagnostics.Stopwatch.StartNew();
             var config = ConfigurationMock.GetConfigurationFromFiles(exampleName);
             var inputFilePath = Path.Combine($"ExamplesInput/{exampleName}.cs");
             var resultFilePath = Path.Combine($"ExamplesOutput/{exampleName}.txt");
@@ -44,15 +48,68 @@ public static void StructuralSearchShouldBe(string exampleName, int matchesCount
             matches = parser.ApplyFindRule(ref context, matches);
             matches = parser.ApplyReplaceRule(ref context, matches);
             var replaceMatches = parser.GetReplaceMatches(ref context, matches);
-            
             var outputFileInfo = new FileInfo(outputFilePath);
             var output = Output.File(outputFileInfo);
             output.Replace(input, replaceMatches);
-            Assert.Equal(matches.Count(), matchesCount);
-         
-            var resultStr = File.ReadAllText(resultFilePath);
-            var outputStr = File.ReadAllText(outputFilePath);
-            Assert.Equal(resultStr, outputStr);
+            startTime.Stop();
+            var resultTime = startTime.Elapsed;
+            
+            // Assert.Equal(matches.Count(), matchesCount);
+            //
+            // var resultStr = File.ReadAllText(resultFilePath);
+            // var outputStr = File.ReadAllText(outputFilePath);
+            // Assert.Equal(resultStr, outputStr);
+        }
+
+        [Theory]
+        [InlineData("ConfigurationFile/if.yml")]
+        public static void StructuralSearchFromConfig(string configPath)
+        {
+            var config = YmlHelper.Parse(configPath).Configurations.First();
+            var inputFileInfo = new FileInfo("ExamplesInput/Test.txt");
+
+            int count = 100;
+            long result = 0;
+            for (int i = 0; i < count; i++)
+            {
+                var res = Test(config, inputFileInfo);
+                Console.WriteLine(res);
+                result += res;
+            }
+            var t = result/count;
+            Console.WriteLine($"SR: {t}");
+        }
+        
+        private static long  Test(Configuration config, FileInfo inputFileInfo)
+        {
+            var startTime = System.Diagnostics.Stopwatch.StartNew();
+            var input = Input.File(inputFileInfo);
+            var parser = new StructuralSearchParser(config);
+
+            IParsingContext context = new ParsingContext(input);
+            var matches = parser.Parse(ref context);
+            matches = parser.ApplyFindRule(ref context, matches);
+            matches = parser.ApplyReplaceRule(ref context, matches);
+            var replaceMatches = parser.GetReplaceMatches(ref context, matches);
+            startTime.Stop();
+            var resultTime = startTime.Elapsed;
+            return resultTime.Ticks;
         }
+        
+        // private static long  Test(Configuration config, FileInfo inputFileInfo)
+        // {
+        //     var startTime = System.Diagnostics.Stopwatch.StartNew();
+        //     var input = Input.File(inputFileInfo);
+        //     var parser = new StructuralSearchParser(config);
+        //
+        //     IParsingContext context = new ParsingContext(input);
+        //     var matches = parser.Parse(ref context);
+        //     matches = parser.ApplyFindRule(ref context, matches);
+        //     matches = parser.ApplyReplaceRule(ref context, matches);
+        //     var replaceMatches = parser.GetReplaceMatches(ref context, matches);
+        //     startTime.Stop();
+        //     var resultTime = startTime.Elapsed;
+        //     return resultTime.Ticks;
+        // }
     }
 }
diff --git a/src/SimpleStateMachine.StructuralSearch/Configurations/Configuration.cs b/src/SimpleStateMachine.StructuralSearch/Configurations/Configuration.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
 using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch.Configurations
diff --git a/src/SimpleStateMachine.StructuralSearch/Constant.cs b/src/SimpleStateMachine.StructuralSearch/Constant.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Linq;
-
-namespace SimpleStateMachine.StructuralSearch
+﻿namespace SimpleStateMachine.StructuralSearch
 {
     public static partial class Constant
     {
diff --git a/src/SimpleStateMachine.StructuralSearch/Custom/StreamReplacer.cs b/src/SimpleStateMachine.StructuralSearch/Custom/StreamReplacer.cs
@@ -1,7 +1,4 @@
-﻿using System.IO;
-using System.Threading.Tasks;
-
-namespace SimpleStateMachine.StructuralSearch.Custom;
+﻿namespace SimpleStateMachine.StructuralSearch.Custom;
 
 // public class StreamReplacer : Stream
 // {
diff --git a/src/SimpleStateMachine.StructuralSearch/FindParser.cs b/src/SimpleStateMachine.StructuralSearch/FindParser.cs
@@ -1,11 +1,8 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
+﻿using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
-using YamlDotNet.Core.Events;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Helper/StreamExtensions.cs b/src/SimpleStateMachine.StructuralSearch/Helper/StreamExtensions.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Diagnostics.Contracts;
 using System.IO;
 
 namespace SimpleStateMachine.StructuralSearch.Helper;
diff --git a/src/SimpleStateMachine.StructuralSearch/IFindParser.cs b/src/SimpleStateMachine.StructuralSearch/IFindParser.cs
@@ -1,7 +1,4 @@
 ﻿using System.Collections.Generic;
-using System.IO;
-using Pidgin;
-using SimpleStateMachine.StructuralSearch.ReplaceTemplate;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Input/FileInput.cs b/src/SimpleStateMachine.StructuralSearch/Input/FileInput.cs
@@ -1,7 +1,5 @@
 ﻿using System.IO;
-using System.Threading;
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Helper;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsers/LookaheadParser.cs b/src/SimpleStateMachine.StructuralSearch/Parsers/LookaheadParser.cs
@@ -1,5 +1,4 @@
-﻿using System.Diagnostics.CodeAnalysis;
-using Pidgin;
+﻿using Pidgin;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Parsers/ParserWithLookahead.cs b/src/SimpleStateMachine.StructuralSearch/Parsers/ParserWithLookahead.cs
@@ -1,8 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Extensions;
 
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/Placeholder/MatchPosition.cs b/src/SimpleStateMachine.StructuralSearch/Placeholder/MatchPosition.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace SimpleStateMachine.StructuralSearch
+﻿namespace SimpleStateMachine.StructuralSearch
 {
     public readonly record struct Match<T>(T Value, int Lenght, ColumnPosition Column, LinePosition Line,
         OffsetPosition Offset);
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderLenghtParameter.cs b/src/SimpleStateMachine.StructuralSearch/Rules/Parameters/PlaceholderLenghtParameter.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace SimpleStateMachine.StructuralSearch.Rules
+﻿namespace SimpleStateMachine.StructuralSearch.Rules
 {
     public class PlaceholderLenghtParameter: IRuleParameter
     {
diff --git a/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ReplaceRule.cs b/src/SimpleStateMachine.StructuralSearch/Rules/ReplaceRule/ReplaceRule.cs
@@ -1,7 +1,4 @@
 ﻿using System.Collections.Generic;
-using System.Reflection.Metadata;
-using Pidgin;
-using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Rules;
 
 namespace SimpleStateMachine.StructuralSearch
diff --git a/src/SimpleStateMachine.StructuralSearch/SeriesParser.cs b/src/SimpleStateMachine.StructuralSearch/SeriesParser.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
 using Pidgin;
 
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/CommonParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/CommonParser.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using Pidgin;
-using SimpleStateMachine.StructuralSearch.Extensions;
 using static Pidgin.Parser;
 namespace SimpleStateMachine.StructuralSearch
 {
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/FindRulesParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/FindRulesParser.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Runtime.CompilerServices;
 using Pidgin;
 using Pidgin.Expression;
 using SimpleStateMachine.StructuralSearch.Extensions;
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/ReplaceRuleParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/ReplaceRuleParser.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using Pidgin;
+﻿using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Rules;
 
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/ReplaceTemplateParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/ReplaceTemplateParser.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
+﻿using System.Collections.Generic;
 using Pidgin;
 using SimpleStateMachine.StructuralSearch.Extensions;
 using SimpleStateMachine.StructuralSearch.Helper;
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/StructuralSearch.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/StructuralSearch.cs
@@ -1,5 +1,4 @@
-﻿using Pidgin;
-using SimpleStateMachine.StructuralSearch.ReplaceTemplate;
+﻿using SimpleStateMachine.StructuralSearch.ReplaceTemplate;
 using SimpleStateMachine.StructuralSearch.Rules;
 
 namespace SimpleStateMachine.StructuralSearch
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearch/SubRuleParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearch/SubRuleParser.cs
diff --git a/src/SimpleStateMachine.StructuralSearch/StructuralSearchParser.cs b/src/SimpleStateMachine.StructuralSearch/StructuralSearchParser.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Immutable;`
`3`		`-using System.Linq;`
	`1`	`+using System.Collections.Immutable;`
`4`	`2`
`5`	`3`	`namespace SimpleStateMachine.StructuralSearch.Sandbox`
`6`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using System.Collections.Generic;`
`2`		`-using System.IO;`
`3`		`-using System.Text.Json;`
`4`		`-`
`5`		`-namespace SimpleStateMachine.StructuralSearch.Tests.Examples;`
	`1`	`+namespace SimpleStateMachine.StructuralSearch.Tests.Examples;`
`6`	`2`
`7`	`3`	`public class Common`
`8`	`4`	`{`