Skip to content

Commit dc4a8d1

Browse files
RomanSoloweowRomanSoloweow
authored
Merge pull request #40 from SimpleStateMachine/personal/rsolovev/switch
Switch to primary ctr, add props files
2 parents 6656baf + 66081d7 commit dc4a8d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+272
-548
lines changed

‎Directory.Build.props‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Authors>SimpleStateMachine</Authors>
4+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
5+
<PackageTags>structural structural-search structural-search-replace search-replace</PackageTags>
6+
<RepositoryUrl>https://github.com/SimpleStateMachine/SimpleStateMachine.StructuralSearch</RepositoryUrl>
7+
<PackageProjectUrl>https://github.com/SimpleStateMachine/SimpleStateMachine.StructuralSearch</PackageProjectUrl>
8+
<Description>Library for Structural Search and Replace</Description>
9+
<PackageIcon>SimpleStateMachine.png</PackageIcon>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<None Include="SimpleStateMachine.png">
13+
<Pack>True</Pack>
14+
</None>
15+
</ItemGroup>
16+
<PropertyGroup>
17+
<TargetFramework>net8.0</TargetFramework>
18+
<Nullable>enable</Nullable>
19+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
20+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
21+
</PropertyGroup>
22+
</Project>

‎Directory.Packages.props‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageVersion Include="Pidgin" Version="3.5.1" />
4+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
5+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
6+
<PackageVersion Include="xunit" Version="2.9.3" />
7+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
8+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
9+
</ItemGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Update="xunit.runner.visualstudio">
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
<PrivateAssets>all</PrivateAssets>
15+
</PackageReference>
16+
<PackageReference Update="coverlet.collector">
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
<PrivateAssets>all</PrivateAssets>
19+
</PackageReference>
20+
</ItemGroup>
21+
</Project>

‎SimpleStateMachine.StructuralSearch.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
global.json = global.json
1616
LICENSE = LICENSE
1717
README.md = README.md
18+
Directory.Build.props = Directory.Build.props
19+
Directory.Packages.props = Directory.Packages.props
1820
EndProjectSection
1921
EndProject
2022
Global

‎src/SimpleStateMachine.StructuralSearch.Sandbox/Program.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
namespace SimpleStateMachine.StructuralSearch.Sandbox;
1+
using System.IO;
2+
3+
namespace SimpleStateMachine.StructuralSearch.Sandbox;
24

35
internal static class Program
46
{
5-
static void Main(string[] args)
7+
private static void Main(string[] args)
68
{
79
//StructuralSearch.ParseFindTemplate()
810

911
var path = "Test.txt";
1012
var oldText = "0123456789";
11-
var text = "test";
1213
File.WriteAllText(path, oldText);
1314

1415
// using var stringReader = text.AsStream();
1516
// using var streamWriter = File.OpenWrite(path);
1617
//
1718
// stringReader.CopyPartTo(streamWriter, 0, 7);
18-
19+
1920
// var config = YmlHelper.Parse(
2021
// @"C:\Users\roman\GitHub\SimpleStateMachine.StructuralSearch\src\SimpleStateMachine.StructuralSearch.Tests\ConfigurationFile\FullConfig.yml");
2122
//

‎src/SimpleStateMachine.StructuralSearch.Sandbox/SimpleStateMachine.StructuralSearch.Sandbox.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
<LangVersion>10</LangVersion>
95
</PropertyGroup>
106

117
<ItemGroup>
12-
<ProjectReference Include="..\SimpleStateMachine.StructuralSearch\SimpleStateMachine.StructuralSearch.csproj" />
8+
<ProjectReference Include="..\SimpleStateMachine.StructuralSearch\SimpleStateMachine.StructuralSearch.csproj"/>
139
</ItemGroup>
14-
1510
</Project>

‎src/SimpleStateMachine.StructuralSearch.Tests/Attributes/StringMemberDataAttribute.cs‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,16 @@
55

66
namespace SimpleStateMachine.StructuralSearch.Tests.Attributes;
77

8-
[CLSCompliant(false)]
9-
public class StringMemberDataAttribute : MemberDataAttributeBase
8+
public class StringMemberDataAttribute(string memberName, params object[] parameters)
9+
: MemberDataAttributeBase(memberName, parameters)
1010
{
11-
private readonly string _memberName;
12-
13-
public StringMemberDataAttribute(string memberName, params object[] parameters)
14-
: base(memberName, parameters)
15-
{
16-
_memberName = memberName;
17-
}
18-
1911
protected override object[] ConvertDataItem(MethodInfo testMethod, object item)
2012
{
21-
if (item == null)
22-
return null;
23-
24-
var str = item as string;
25-
if (str == null)
13+
if (item is not string str)
2614
throw new ArgumentException
2715
(
28-
string.Format(
16+
string.Format
17+
(
2918
CultureInfo.CurrentCulture,
3019
"Property {0} on {1} yielded an item that is not string",
3120
MemberName,

‎src/SimpleStateMachine.StructuralSearch.Tests/Mock/Configuration.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ namespace SimpleStateMachine.StructuralSearch.Tests.Mock;
55

66
public static class ConfigurationMock
77
{
8-
public static Configuration GetConfigurationFromFiles(string name)
8+
public static Configuration GetConfigurationFromFiles(string fileName)
99
{
10-
var fileName = $"{name}.txt";
10+
fileName = $"{fileName}.txt";
1111
var findTemplate = FileOrNull("FindTemplate", fileName);
1212
var fileRule = FileOrNull("FindRule", fileName) ;
1313
var replaceTemplate = FileOrNull("ReplaceTemplate", fileName);

‎src/SimpleStateMachine.StructuralSearch.Tests/PlaceholderParserTests.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ namespace SimpleStateMachine.StructuralSearch.Tests;
66
public static class PlaceholderParserTests
77
{
88
[Theory]
9-
// [InlineData("($test$):", "(value (test) );", "value (test) ")]
10-
// [InlineData("$var$", "temp1 ?? temp2", "temp1 ?? temp2")]
11-
// [InlineData("$var$;.", "temp1 ?? temp2;.", "temp1 ?? temp2")]
12-
// [InlineData("$var$;", "temp1 ?? temp2;", "temp1 ?? temp2")]
13-
9+
[InlineData("$var$", "temp1 temp2", "temp1 temp2")]
10+
[InlineData("$test$", "value (test)", "value (test)")]
11+
[InlineData("$test$", "value (test) ", "value (test) ")]
12+
[InlineData("$var$;.", "temp1 temp2;.", "temp1 temp2")]
13+
[InlineData("$var$;", "temp1 temp2;", "temp1 temp2")]
14+
[InlineData("$test$ ", "value (test) ", "value (test)")]
15+
[InlineData("($test$):", "(value (test) ):", "value (test) ")]
16+
[InlineData("($var$);", "(((test)));", "((test))")]
1417
[InlineData("($test$)", "(value )", "value ")]
1518
[InlineData("($test$ )", "(value )", "value")]
1619
[InlineData("($test$)", "(value (test))", "value (test)")]

‎src/SimpleStateMachine.StructuralSearch.Tests/SimpleStateMachine.StructuralSearch.Tests.csproj‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<IsPackable>false</IsPackable>
7-
<Nullable>enable</Nullable>
8-
</PropertyGroup>
9-
102
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
12-
<PackageReference Include="xunit" Version="2.9.3" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
<PrivateAssets>all</PrivateAssets>
16-
</PackageReference>
17-
<PackageReference Include="coverlet.collector" Version="6.0.4">
18-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19-
<PrivateAssets>all</PrivateAssets>
20-
</PackageReference>
3+
<PackageReference Include="Microsoft.NET.Test.Sdk"/>
4+
<PackageReference Include="xunit"/>
5+
<PackageReference Include="xunit.runner.visualstudio"/>
6+
<PackageReference Include="coverlet.collector"/>
217
</ItemGroup>
228

239
<ItemGroup>
24-
<ProjectReference Include="..\SimpleStateMachine.StructuralSearch\SimpleStateMachine.StructuralSearch.csproj" />
10+
<ProjectReference Include="..\SimpleStateMachine.StructuralSearch\SimpleStateMachine.StructuralSearch.csproj"/>
2511
</ItemGroup>
2612

2713
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
@@ -53,5 +39,5 @@
5339
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5440
</Content>
5541
</ItemGroup>
56-
42+
5743
</Project>

‎src/SimpleStateMachine.StructuralSearch.Tests/Tests.cs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@ namespace SimpleStateMachine.StructuralSearch.Tests;
77

88
public static class Tests
99
{
10-
// [Theory]
11-
// [InlineData("test;", ";", "test")]
12-
// [InlineData("test;;", ";", "test")]
13-
// [InlineData("test;;.", ".", "test;;")]
14-
// [InlineData("(value (test));", ";", "value (test)")]
15-
// [InlineData("(value (test) );", ";", "value (test) ")]
16-
// public static void PlaceholderParsingShouldBeSuccess(string input, string terminator, string expectedResult)
17-
// {
18-
// var terminatorParser = Parser.Lookahead(Parser.String(terminator)).WithDebug("terminator").Select(x => Unit.Value);
19-
// var result = Parser.AnyCharExcept(Constant.AllParenthesis).AtLeastOnceAsStringUntil(terminatorParser).ParseOrThrow(input);
20-
// Assert.Equal(expectedResult, result);
21-
// }
22-
2310
[Theory]
2411
[InlineData("test;", ";", "test")]
2512
[InlineData("test;;", ";", "test")]

0 commit comments

Comments
 (0)