Skip to content

Commit df40c8a

Browse files
committed
Fix NullUnion example and rulls, new parameter functions
1 parent 2a714a6 commit df40c8a

26 files changed

+351
-114
lines changed

src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFile/FullConfig.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
$var$ = $value1$;
2121
FindRules:
2222
- $sign$ In ("is", "==", "!=", "is not")
23-
- $value$ In ($value1$, "$value$\.Value", $value2$, "$value2$\.Value")
23+
- $value$ In ($value1$, $value2$)
2424
ReplaceTemplate: |-
2525
$var$ = $value1$ ?? $value2$;
26-
ReplaceRules:
27-
- $sign$ In ("!=", "is not") then $var2$ => $var1$, $var1$ => $var2$
26+
ReplaceRules:
27+
- $sign$ In ("!=", "is not") then $value2$ => $value1$, $value1$ => $value2$
2828
2929
# TernaryOperator
3030

src/SimpleStateMachine.StructuralSearch.Tests/ConfigurationFile/ShortConfig.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
$var$ = $value1$;
2020
FindRules:
2121
- $sign$ In ("is", "==", "!=", "is not")
22-
- $value$ In ($value1$, "$value1$\.Value", $value2$, "$value2$\.Value")
22+
- $value$ In ($value1$, $value2$)
2323
ReplaceTemplate: |-
2424
$var$ = $value1$ ?? $value2$;
25-
ReplaceRules:
26-
- $sign$ In ("!=", "is not") then $var2$ => $var1$, $var1$ => $var2$
25+
ReplaceRules:
26+
- $sign$ In ("!=", "is not") then $value2$ => $value1$, $value1$ => $value2$
27+
2728
# TernaryOperator
2829

2930
- FindTemplate: |-

src/SimpleStateMachine.StructuralSearch.Tests/Examples/NullUnionOperator.cs

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

src/SimpleStateMachine.StructuralSearch.Tests/Examples/Common.cs renamed to src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common.cs

File renamed without changes.

src/SimpleStateMachine.StructuralSearch.Tests/Examples/Common2.cs renamed to src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/Common2.cs

File renamed without changes.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput;
2+
3+
public class NullUnionOperator
4+
{
5+
public void Test1()
6+
{
7+
int? result;
8+
int? temp1 = 5;
9+
int? temp2 = 5;
10+
11+
if(temp1 is null)
12+
result = temp2;
13+
else
14+
result = temp1;
15+
}
16+
17+
public void Test2()
18+
{
19+
20+
int? result;
21+
int? temp1 = 6;
22+
int? temp2 = 7;
23+
if(temp1 is not null)
24+
result = temp2;
25+
else
26+
result = temp1;
27+
}
28+
29+
public int Test3()
30+
{
31+
int? temp3 = 5;
32+
33+
if(temp3 is null)
34+
return 7;
35+
else if (temp3 == 8)
36+
return 9;
37+
else
38+
return 10;
39+
}
40+
}

src/SimpleStateMachine.StructuralSearch.Tests/Examples/TernaryOperator.cs renamed to src/SimpleStateMachine.StructuralSearch.Tests/ExamplesInput/TernaryOperator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace SimpleStateMachine.StructuralSearch.Tests.Examples
3+
namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput
44
{
55
public class TernaryOperator
66
{
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput;
2+
3+
public class NullUnionOperator
4+
{
5+
public void Test1()
6+
{
7+
int? result;
8+
int? temp1 = 5;
9+
int? temp2 = 5;
10+
11+
result = temp1 ?? temp2;
12+
}
13+
14+
public void Test2()
15+
{
16+
17+
int? result;
18+
int? temp1 = 6;
19+
int? temp2 = 7;
20+
result = temp2 ?? temp1;
21+
}
22+
23+
public int Test3()
24+
{
25+
int? temp3 = 5;
26+
27+
if(temp3 is null)
28+
return 7;
29+
else if (temp3 == 8)
30+
return 9;
31+
else
32+
return 10;
33+
}
34+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System;
2+
3+
namespace SimpleStateMachine.StructuralSearch.Tests.ExamplesInput
4+
{
5+
public class TernaryOperator
6+
{
7+
public int Test1()
8+
{
9+
var temp = 1;
10+
11+
return temp == 2? 3 : 4;
12+
}
13+
14+
public int Test2()
15+
{
16+
var temp = 5;
17+
18+
return temp == 6? 7 : 8;
19+
}
20+
21+
public int Test3()
22+
{
23+
var temp2 = 1;
24+
25+
return temp2 == 2? 3 : 4;
26+
}
27+
28+
public int Test4()
29+
{
30+
var temp3 = 5;
31+
32+
if(temp3 == 6)
33+
return 7;
34+
else if (temp3 == 8)
35+
return 9;
36+
else
37+
return 10;
38+
}
39+
40+
public void Test5()
41+
{
42+
43+
}
44+
}
45+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
$sign$ In ("is", "==", "!=", "is not")
2-
$value$ In ($value1$, "$value1$\.Value", $value2$, "$value2$\.Value")
2+
$value$ In ($value1$, $value2$)

0 commit comments

Comments
 (0)