Skip to content

Commit f42535d

Browse files
committed
body to expression
1 parent b987a41 commit f42535d

Some content is hidden

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

59 files changed

+296
-581
lines changed

src/SimpleStateMachine.StructuralSearch/Configurations/Configuration.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@ public bool Equals(Configuration? other)
2020
return findTemplateEquals && findRulesEquals && replaceTemplateEquals && replaceRulesEquals;
2121
}
2222

23-
public override bool Equals(object? obj)
24-
{
25-
return obj?.GetType() == GetType() && Equals((Configuration)obj);
26-
}
23+
public override bool Equals(object? obj)
24+
=> obj?.GetType() == GetType() && Equals((Configuration)obj);
2725

28-
public override int GetHashCode()
29-
{
30-
return HashCode.Combine(FindTemplate, FindRules, ReplaceTemplate, ReplaceRules);
31-
}
26+
public override int GetHashCode()
27+
=> HashCode.Combine(FindTemplate, FindRules, ReplaceTemplate, ReplaceRules);
3228
}
3329
}

src/SimpleStateMachine.StructuralSearch/Configurations/ConfigurationFile.cs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,13 @@ public ConfigurationFile(List<Configuration> configurations)
1919

2020
public List<Configuration> Configurations { get; init; }
2121

22-
public bool Equals(ConfigurationFile? other)
23-
{
24-
return other?.Configurations != null && Configurations.SequenceEqual(other.Configurations);
25-
}
22+
public bool Equals(ConfigurationFile? other)
23+
=> other?.Configurations != null && Configurations.SequenceEqual(other.Configurations);
2624

27-
public override bool Equals(object? obj)
28-
{
29-
return obj?.GetType() == GetType() && Equals((ConfigurationFile)obj);
30-
}
25+
public override bool Equals(object? obj)
26+
=> obj?.GetType() == GetType() && Equals((ConfigurationFile)obj);
3127

32-
public override int GetHashCode()
33-
{
34-
return Configurations.GetHashCode();
35-
}
28+
public override int GetHashCode()
29+
=> Configurations.GetHashCode();
3630
}
3731
}

src/SimpleStateMachine.StructuralSearch/EmptyParsingContext.cs

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,21 @@ public EmptyParsingContext(IInput input)
1212
}
1313

1414
public bool TryGetPlaceholder(string name, out IPlaceholder value)
15-
{
16-
throw new System.NotImplementedException();
17-
}
15+
=> throw new System.NotImplementedException();
1816

19-
public void AddPlaceholder(IPlaceholder placeholder)
20-
{
21-
throw new System.NotImplementedException();
22-
}
17+
public void AddPlaceholder(IPlaceholder placeholder)
18+
=> throw new System.NotImplementedException();
2319

24-
public IPlaceholder GetPlaceholder(string name)
25-
{
26-
return Placeholder.CreateEmpty(this, name, string.Empty);
27-
}
20+
public IPlaceholder GetPlaceholder(string name)
21+
=> Placeholder.CreateEmpty(this, name, string.Empty);
2822

29-
public IReadOnlyDictionary<string, IPlaceholder> SwitchOnNew()
30-
{
31-
throw new System.NotImplementedException();
32-
}
23+
public IReadOnlyDictionary<string, IPlaceholder> SwitchOnNew()
24+
=> throw new System.NotImplementedException();
3325

34-
public void Fill(IReadOnlyDictionary<string, IPlaceholder> placeholders)
35-
{
36-
throw new System.NotImplementedException();
37-
}
26+
public void Fill(IReadOnlyDictionary<string, IPlaceholder> placeholders)
27+
=> throw new System.NotImplementedException();
3828

3929
public IReadOnlyDictionary<string, IPlaceholder> Clear()
40-
{
41-
throw new System.NotImplementedException();
42-
}
30+
=> throw new System.NotImplementedException();
4331
}
4432
}

src/SimpleStateMachine.StructuralSearch/Extensions/CharParserExtensions.cs

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,13 @@ namespace SimpleStateMachine.StructuralSearch.Extensions
55
{
66
public static class CharParserExtensions
77
{
8-
public static Parser<TToken, string> AsString<TToken>(this Parser<TToken, char> parser)
9-
{
10-
return parser.Select(x => x.ToString());
11-
}
12-
13-
public static Parser<TToken, string> AtLeastOnceAsStringUntil<TToken, U>(
14-
this Parser<TToken, char> parser, Parser<TToken, U> terminator)
15-
{
16-
return parser != null ? parser.AtLeastOnceUntil(terminator).AsString() : throw new ArgumentNullException(nameof (parser));
17-
}
18-
19-
public static Parser<TToken, string> AtLeastOnceAsStringUntilNot<TToken, U>(this Parser<TToken, char> parser,
20-
Parser<TToken, U> terminator)
21-
{
22-
return parser != null ? parser.AtLeastOnceUntilNot(terminator).AsString() : throw new ArgumentNullException(nameof (parser));
23-
}
8+
public static Parser<TToken, string> AsString<TToken>(this Parser<TToken, char> parser)
9+
=> parser.Select(x => x.ToString());
10+
11+
public static Parser<TToken, string> AtLeastOnceAsStringUntil<TToken, U>(this Parser<TToken, char> parser, Parser<TToken, U> terminator)
12+
=> parser != null ? parser.AtLeastOnceUntil(terminator).AsString() : throw new ArgumentNullException(nameof (parser));
13+
14+
public static Parser<TToken, string> AtLeastOnceAsStringUntilNot<TToken, U>(this Parser<TToken, char> parser, Parser<TToken, U> terminator)
15+
=> parser != null ? parser.AtLeastOnceUntilNot(terminator).AsString() : throw new ArgumentNullException(nameof (parser));
2416
}
2517
}

src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableCharExtensions.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,13 @@ namespace SimpleStateMachine.StructuralSearch.Extensions
66
{
77
public static class EnumerableCharExtensions
88
{
9-
public static Parser<TToken, string> AsString<TToken>(this Parser<TToken, IEnumerable<char>> parser)
10-
{
11-
return parser.Select(x => new string(x.ToArray()));
12-
}
9+
public static Parser<TToken, string> AsString<TToken>(this Parser<TToken, IEnumerable<char>> parser)
10+
=> parser.Select(x => new string(x.ToArray()));
1311

14-
public static Parser<TToken, IEnumerable<T>> MergerMany<TToken, T>(
15-
this Parser<TToken, IEnumerable<IEnumerable<T>>> parser)
16-
{
17-
return parser.Select(x => x.SelectMany(y => y));
18-
}
19-
20-
public static Parser<TToken, IEnumerable<T>> MergerMany<TToken, T>(
21-
this Parser<TToken, IEnumerable<List<T>>> parser)
22-
{
23-
return parser.Select(x => x.SelectMany(y => y));
24-
}
12+
public static Parser<TToken, IEnumerable<T>> MergerMany<TToken, T>(this Parser<TToken, IEnumerable<IEnumerable<T>>> parser)
13+
=> parser.Select(x => x.SelectMany(y => y));
14+
15+
public static Parser<TToken, IEnumerable<T>> MergerMany<TToken, T>(this Parser<TToken, IEnumerable<List<T>>> parser)
16+
=> parser.Select(x => x.SelectMany(y => y));
2517
}
2618
}

src/SimpleStateMachine.StructuralSearch/Extensions/EnumerableStringExtensions.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/SimpleStateMachine.StructuralSearch/Extensions/IEnumerableExtensions.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ namespace SimpleStateMachine.StructuralSearch.Extensions
55
{
66
public static class IEnumerableExtensions
77
{
8-
public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T>? enumerable)
9-
{
10-
return enumerable ?? Enumerable.Empty<T>();
11-
}
8+
public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T>? enumerable)
9+
=> enumerable ?? Enumerable.Empty<T>();
1210
}
1311
}

src/SimpleStateMachine.StructuralSearch/Extensions/IEnumerableSourceMatchExtensions.cs

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/SimpleStateMachine.StructuralSearch/Extensions/ManyParserExtensions.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ namespace SimpleStateMachine.StructuralSearch.Extensions
55
{
66
public static class ManyParserExtensions
77
{
8-
public static Parser<TToken, IEnumerable<T>> ToIEnumerable<TToken, T>(this Parser<TToken, List<T>> parser)
9-
{
10-
return parser.As<TToken, List<T>, IEnumerable<T>>();
11-
}
8+
public static Parser<TToken, IEnumerable<T>> ToIEnumerable<TToken, T>(this Parser<TToken, List<T>> parser)
9+
=> parser.As<TToken, List<T>, IEnumerable<T>>();
1210
}
1311
}

src/SimpleStateMachine.StructuralSearch/Extensions/MatchExtensions.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)