Skip to content

Commit bbfcfc6

Browse files
committed
Simplify project
1 parent 28f661d commit bbfcfc6

14 files changed

+13
-47
lines changed

SimpleStateMachine.StructuralSearch.sln

-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleStateMachine.Structur
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6CB879CC-E497-41C0-AEBD-864E9D3807A6}"
1313
ProjectSection(SolutionItems) = preProject
14-
.dockerignore = .dockerignore
1514
.gitignore = .gitignore
16-
action.yml = action.yml
17-
Dockerfile = Dockerfile
1815
global.json = global.json
1916
LICENSE = LICENSE
2017
README.md = README.md

src/SimpleStateMachine.StructuralSearch.Tests/ReplaceTemplateTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static void ReplaceBuildShouldBeSuccess(string templatePath, string resul
2727
IParsingContext parsingContext = new ParsingContext(Input.Input.Empty, []);
2828
for (int i = 0; i < keys.Length; i++)
2929
{
30-
parsingContext[keys[i]] = Placeholder.CreateEmpty(keys[i], values[i]);
30+
parsingContext[keys[i]] = Placeholder.Placeholder.CreateEmpty(keys[i], values[i]);
3131
}
3232

3333
var result = replaceBuilder.Build(ref parsingContext);

src/SimpleStateMachine.StructuralSearch.Tests/Tests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Pidgin;
22
using SimpleStateMachine.StructuralSearch.Extensions;
3-
using SimpleStateMachine.StructuralSearch.Parsers;
3+
using SimpleStateMachine.StructuralSearch.Parsing;
44
using Xunit;
55

66
namespace SimpleStateMachine.StructuralSearch.Tests;

src/SimpleStateMachine.StructuralSearch/Parsing/FindParser.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using SimpleStateMachine.StructuralSearch.Input;
88
using SimpleStateMachine.StructuralSearch.Operator.Logical;
99

10-
namespace SimpleStateMachine.StructuralSearch.Parsers;
10+
namespace SimpleStateMachine.StructuralSearch.Parsing;
1111

1212
internal class FindParser : IFindParser
1313
{

src/SimpleStateMachine.StructuralSearch/Parsing/FindTemplate.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Pidgin;
44
using SimpleStateMachine.StructuralSearch.Context;
55

6-
namespace SimpleStateMachine.StructuralSearch.Parsers;
6+
namespace SimpleStateMachine.StructuralSearch.Parsing;
77

88
internal class FindTemplate : Parser<char, List<string>>, IContextDependent
99
{

src/SimpleStateMachine.StructuralSearch/Parsing/FindTemplateParser.cs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Linq;
44
using Pidgin;
55
using SimpleStateMachine.StructuralSearch.Extensions;
6-
using SimpleStateMachine.StructuralSearch.Parsers;
76

87
namespace SimpleStateMachine.StructuralSearch.Parsing;
98

src/SimpleStateMachine.StructuralSearch/Parsing/IContextDependent.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using SimpleStateMachine.StructuralSearch.Context;
22

3-
namespace SimpleStateMachine.StructuralSearch.Parsers;
3+
namespace SimpleStateMachine.StructuralSearch.Parsing;
44

55
internal interface IContextDependent
66
{

src/SimpleStateMachine.StructuralSearch/Parsing/ParserWithLookahead.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Collections.Generic;
33
using Pidgin;
44

5-
namespace SimpleStateMachine.StructuralSearch.Parsers;
5+
namespace SimpleStateMachine.StructuralSearch.Parsing;
66

77
internal abstract class ParserWithLookahead<TToken, T> : Parser<TToken, T>
88
{

src/SimpleStateMachine.StructuralSearch/Parsing/PlaceholderParser.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
using Pidgin;
55
using SimpleStateMachine.StructuralSearch.Context;
66
using SimpleStateMachine.StructuralSearch.Extensions;
7-
using SimpleStateMachine.StructuralSearch.Parsing;
87

9-
namespace SimpleStateMachine.StructuralSearch.Parsers;
8+
namespace SimpleStateMachine.StructuralSearch.Parsing;
109

1110
internal class PlaceholderParser : ParserWithLookahead<char, string>, IContextDependent
1211
{
@@ -164,7 +163,7 @@ public override bool TryParse(ref ParseState<char> state, ref PooledList<Expecte
164163
result = match.Value;
165164
if (res)
166165
{
167-
var placeholderObj = new Placeholder
166+
var placeholderObj = new Placeholder.Placeholder
168167
(
169168
name: _name,
170169
match: match

src/SimpleStateMachine.StructuralSearch/Parsing/StructuralSearch.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using SimpleStateMachine.StructuralSearch.Extensions;
33
using SimpleStateMachine.StructuralSearch.Operator.Logical;
44
using SimpleStateMachine.StructuralSearch.Parameters;
5-
using SimpleStateMachine.StructuralSearch.Parsers;
65
using SimpleStateMachine.StructuralSearch.Replace;
76

87
namespace SimpleStateMachine.StructuralSearch.Parsing;
@@ -15,7 +14,7 @@ public static IFindParser ParseFindTemplate(string? template)
1514
? []
1615
: FindTemplateParser.Template.ParseToEnd(template).ToList();
1716

18-
var templateParser = new Parsers.FindTemplate(parsers);
17+
var templateParser = new FindTemplate(parsers);
1918
return new FindParser(templateParser);
2019
}
2120

src/SimpleStateMachine.StructuralSearch/Placeholder/Placeholder.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace SimpleStateMachine.StructuralSearch;
1+
namespace SimpleStateMachine.StructuralSearch.Placeholder;
22

33
internal readonly struct Placeholder : IPlaceholder
44
{

src/SimpleStateMachine.StructuralSearch/Placeholder/PlaceholderReplace.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace SimpleStateMachine.StructuralSearch;
1+
namespace SimpleStateMachine.StructuralSearch.Placeholder;
22

33
internal class PlaceholderReplace : IPlaceholder
44
{

src/SimpleStateMachine.StructuralSearch/SourceMatch.cs

-29
This file was deleted.

src/SimpleStateMachine.StructuralSearch/StructuralSearchParser.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using SimpleStateMachine.StructuralSearch.Extensions;
55
using SimpleStateMachine.StructuralSearch.Input;
66
using SimpleStateMachine.StructuralSearch.Operator.Logical;
7+
using SimpleStateMachine.StructuralSearch.Placeholder;
78
using SimpleStateMachine.StructuralSearch.Replace;
89

910
namespace SimpleStateMachine.StructuralSearch;
@@ -39,7 +40,7 @@ public List<ReplaceResult> StructuralSearchAndReplace(IInput input)
3940
return results.Select(r => Replace(input, r)).ToList();
4041
}
4142

42-
public ReplaceResult Replace(IInput input, FindParserResult findResult)
43+
private ReplaceResult Replace(IInput input, FindParserResult findResult)
4344
{
4445
IParsingContext context = new ParsingContext(input, []);
4546

0 commit comments

Comments
 (0)