Skip to content

Commit c1b83b6

Browse files
keyboardDrummerkeyboardDrummer
authored
Fix split printing (#996)
1 parent 7f9f784 commit c1b83b6

File tree

10 files changed

+39
-39
lines changed

10 files changed

+39
-39
lines changed

‎Source/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- Target framework and package configuration -->
44
<PropertyGroup>
5-
<Version>3.4.3</Version>
5+
<Version>3.4.4</Version>
66
<TargetFramework>net6.0</TargetFramework>
77
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
88
<Authors>Boogie</Authors>

‎Source/VCGeneration/Splits/Split.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private void PrintSplit() {
114114
Thread.Sleep(100);
115115
}
116116

117-
var prefix = this is ManualSplit manualSplit ? manualSplit.Token.ShortName : "";
117+
var prefix = this is ManualSplit manualSplit ? "-" + manualSplit.SplitIndex + manualSplit.Token.ShortName : "";
118118
var name = Implementation.Name + prefix;
119119
using var writer = printToConsole
120120
? new TokenTextWriter("<console>", Options.OutputWriter, false, Options.PrettyPrint, Options)

‎Test/implementationDivision/focus/focus.bpl.expect‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementation Ex() returns (y: int)
1+
implementation Ex-0() returns (y: int)
22
{
33

44
anon0:
@@ -13,7 +13,7 @@ implementation Ex() returns (y: int)
1313
}
1414

1515

16-
implementation Ex/focus[+16,-20,-25]/afterSplit@15() returns (y: int)
16+
implementation Ex-1/focus[+16,-20,-25]/afterSplit@15() returns (y: int)
1717
{
1818

1919
anon0:
@@ -32,7 +32,7 @@ implementation Ex/focus[+16,-20,-25]/afterSplit@15() returns (y: int)
3232
}
3333

3434

35-
implementation Ex/focus[+16,-20,+25]() returns (y: int)
35+
implementation Ex-2/focus[+16,-20,+25]() returns (y: int)
3636
{
3737

3838
anon0:
@@ -56,7 +56,7 @@ implementation Ex/focus[+16,-20,+25]() returns (y: int)
5656
}
5757

5858

59-
implementation Ex/focus[+16,+20,-25]() returns (y: int)
59+
implementation Ex-3/focus[+16,+20,-25]() returns (y: int)
6060
{
6161

6262
anon0:
@@ -76,7 +76,7 @@ implementation Ex/focus[+16,+20,-25]() returns (y: int)
7676
}
7777

7878

79-
implementation Ex/focus[+16,+20,+25]() returns (y: int)
79+
implementation Ex-4/focus[+16,+20,+25]() returns (y: int)
8080
{
8181

8282
anon0:
@@ -102,7 +102,7 @@ implementation Ex/focus[+16,+20,+25]() returns (y: int)
102102

103103

104104
focus.bpl(15,5): Error: this assertion could not be proved
105-
implementation focusInconsistency/focus[+38](x: int) returns (y: int)
105+
implementation focusInconsistency--1/focus[+38](x: int) returns (y: int)
106106
{
107107

108108
anon0:

‎Test/implementationDivision/isolateAssertion/isolateAssertion.bpl.expect‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementation IsolateAssertion/assert@20(x: int, y: int)
1+
implementation IsolateAssertion-0/assert@20(x: int, y: int)
22
{
33

44
anon0:
@@ -38,7 +38,7 @@ implementation IsolateAssertion/assert@20(x: int, y: int)
3838
}
3939

4040

41-
implementation IsolateAssertion(x: int, y: int)
41+
implementation IsolateAssertion-1(x: int, y: int)
4242
{
4343

4444
anon0:
@@ -81,7 +81,7 @@ implementation IsolateAssertion(x: int, y: int)
8181

8282
isolateAssertion.bpl(20,3): Error: this assertion could not be proved
8383
isolateAssertion.bpl(21,3): Error: this assertion could not be proved
84-
implementation IsolatePathsAssertion/assert@50/path[29,45](x: int, y: int)
84+
implementation IsolatePathsAssertion-0/assert@50/path[29,45](x: int, y: int)
8585
{
8686

8787
anon0:
@@ -112,7 +112,7 @@ implementation IsolatePathsAssertion/assert@50/path[29,45](x: int, y: int)
112112
}
113113

114114

115-
implementation IsolatePathsAssertion/assert@50/path[29,47](x: int, y: int)
115+
implementation IsolatePathsAssertion-1/assert@50/path[29,47](x: int, y: int)
116116
{
117117

118118
anon0:
@@ -143,7 +143,7 @@ implementation IsolatePathsAssertion/assert@50/path[29,47](x: int, y: int)
143143
}
144144

145145

146-
implementation IsolatePathsAssertion/assert@50/path[31,32,45](x: int, y: int)
146+
implementation IsolatePathsAssertion-2/assert@50/path[31,32,45](x: int, y: int)
147147
{
148148

149149
anon0:
@@ -175,7 +175,7 @@ implementation IsolatePathsAssertion/assert@50/path[31,32,45](x: int, y: int)
175175
}
176176

177177

178-
implementation IsolatePathsAssertion/assert@50/path[31,32,47](x: int, y: int)
178+
implementation IsolatePathsAssertion-3/assert@50/path[31,32,47](x: int, y: int)
179179
{
180180

181181
anon0:
@@ -207,7 +207,7 @@ implementation IsolatePathsAssertion/assert@50/path[31,32,47](x: int, y: int)
207207
}
208208

209209

210-
implementation IsolatePathsAssertion/assert@50/path[31,35,45](x: int, y: int)
210+
implementation IsolatePathsAssertion-4/assert@50/path[31,35,45](x: int, y: int)
211211
{
212212

213213
anon0:
@@ -239,7 +239,7 @@ implementation IsolatePathsAssertion/assert@50/path[31,35,45](x: int, y: int)
239239
}
240240

241241

242-
implementation IsolatePathsAssertion/assert@50/path[31,35,47](x: int, y: int)
242+
implementation IsolatePathsAssertion-5/assert@50/path[31,35,47](x: int, y: int)
243243
{
244244

245245
anon0:
@@ -271,7 +271,7 @@ implementation IsolatePathsAssertion/assert@50/path[31,35,47](x: int, y: int)
271271
}
272272

273273

274-
implementation IsolatePathsAssertion(x: int, y: int)
274+
implementation IsolatePathsAssertion-6(x: int, y: int)
275275
{
276276

277277
anon0:

‎Test/implementationDivision/isolateJump/isolateContinue.bpl.expect‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementation IsolateContinue/remainingAssertions(x: int) returns (r: int)
1+
implementation IsolateContinue-0/remainingAssertions(x: int) returns (r: int)
22
{
33

44
anon0:
@@ -26,7 +26,7 @@ implementation IsolateContinue/remainingAssertions(x: int) returns (r: int)
2626
}
2727

2828

29-
implementation IsolateContinue/goto@17(x: int) returns (r: int)
29+
implementation IsolateContinue-1/goto@17(x: int) returns (r: int)
3030
{
3131

3232
anon0:

‎Test/implementationDivision/isolateJump/isolateJump.bpl.expect‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementation IsolateReturn/remainingAssertions(x: int, y: int) returns (r: int)
1+
implementation IsolateReturn-0/remainingAssertions(x: int, y: int) returns (r: int)
22
{
33

44
anon0:
@@ -25,7 +25,7 @@ implementation IsolateReturn/remainingAssertions(x: int, y: int) returns (r: int
2525
}
2626

2727

28-
implementation IsolateReturn/return@16(x: int, y: int) returns (r: int)
28+
implementation IsolateReturn-1/return@16(x: int, y: int) returns (r: int)
2929
{
3030

3131
anon0:
@@ -54,7 +54,7 @@ implementation IsolateReturn/return@16(x: int, y: int) returns (r: int)
5454

5555
isolateJump.bpl(16,21): Error: a postcondition could not be proved on this return path
5656
isolateJump.bpl(5,3): Related location: this is the postcondition that could not be proved
57-
implementation IsolateReturnPaths/remainingAssertions(x: int, y: int) returns (r: int)
57+
implementation IsolateReturnPaths-0/remainingAssertions(x: int, y: int) returns (r: int)
5858
{
5959

6060
anon0:
@@ -98,7 +98,7 @@ implementation IsolateReturnPaths/remainingAssertions(x: int, y: int) returns (r
9898
}
9999

100100

101-
implementation IsolateReturnPaths/return@44/path[27](x: int, y: int) returns (r: int)
101+
implementation IsolateReturnPaths-1/return@44/path[27](x: int, y: int) returns (r: int)
102102
{
103103

104104
anon0:
@@ -125,7 +125,7 @@ implementation IsolateReturnPaths/return@44/path[27](x: int, y: int) returns (r:
125125
}
126126

127127

128-
implementation IsolateReturnPaths/return@44/path[29,30](x: int, y: int) returns (r: int)
128+
implementation IsolateReturnPaths-2/return@44/path[29,30](x: int, y: int) returns (r: int)
129129
{
130130

131131
anon0:
@@ -153,7 +153,7 @@ implementation IsolateReturnPaths/return@44/path[29,30](x: int, y: int) returns
153153
}
154154

155155

156-
implementation IsolateReturnPaths/return@44/path[29,33](x: int, y: int) returns (r: int)
156+
implementation IsolateReturnPaths-3/return@44/path[29,33](x: int, y: int) returns (r: int)
157157
{
158158

159159
anon0:

‎Test/implementationDivision/isolateJump/isolateJumpAndSplitOnEveryAssert.bpl.expect‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementation {:vcs_split_on_every_assert} MergeAtEnd/assert@5(x: int) returns (r: int)
1+
implementation {:vcs_split_on_every_assert} MergeAtEnd--1/assert@5(x: int) returns (r: int)
22
{
33

44
anon0:
@@ -22,7 +22,7 @@ implementation {:vcs_split_on_every_assert} MergeAtEnd/assert@5(x: int) returns
2222

2323
isolateJumpAndSplitOnEveryAssert.bpl(9,3): Error: a postcondition could not be proved on this return path
2424
isolateJumpAndSplitOnEveryAssert.bpl(5,3): Related location: this is the postcondition that could not be proved
25-
implementation {:vcs_split_on_every_assert} MultipleEnsures/return@25/assert@16(x: int) returns (r: int)
25+
implementation {:vcs_split_on_every_assert} MultipleEnsures-0/return@25/assert@16(x: int) returns (r: int)
2626
{
2727

2828
anon0:
@@ -33,7 +33,7 @@ implementation {:vcs_split_on_every_assert} MultipleEnsures/return@25/assert@16(
3333
}
3434

3535

36-
implementation {:vcs_split_on_every_assert} MultipleEnsures/return@25/assert@17(x: int) returns (r: int)
36+
implementation {:vcs_split_on_every_assert} MultipleEnsures-1/return@25/assert@17(x: int) returns (r: int)
3737
{
3838

3939
anon0:
@@ -45,7 +45,7 @@ implementation {:vcs_split_on_every_assert} MultipleEnsures/return@25/assert@17(
4545
}
4646

4747

48-
implementation {:vcs_split_on_every_assert} MultipleEnsures/return@21/assert@16(x: int) returns (r: int)
48+
implementation {:vcs_split_on_every_assert} MultipleEnsures-2/return@21/assert@16(x: int) returns (r: int)
4949
{
5050

5151
anon0:
@@ -56,7 +56,7 @@ implementation {:vcs_split_on_every_assert} MultipleEnsures/return@21/assert@16(
5656
}
5757

5858

59-
implementation {:vcs_split_on_every_assert} MultipleEnsures/return@21/assert@17(x: int) returns (r: int)
59+
implementation {:vcs_split_on_every_assert} MultipleEnsures-3/return@21/assert@17(x: int) returns (r: int)
6060
{
6161

6262
anon0:

‎Test/implementationDivision/split/AssumeFalseSplit.bpl.expect‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementation Foo/untilFirstSplit()
1+
implementation Foo-0/untilFirstSplit()
22
{
33

44
anon3_Then:
@@ -8,7 +8,7 @@ implementation Foo/untilFirstSplit()
88
}
99

1010

11-
implementation Foo/afterSplit@11()
11+
implementation Foo-1/afterSplit@11()
1212
{
1313

1414
anon3_Else:
@@ -20,7 +20,7 @@ implementation Foo/afterSplit@11()
2020
}
2121

2222

23-
implementation Foo/afterSplit@12()
23+
implementation Foo-2/afterSplit@12()
2424
{
2525

2626
anon3_Else:

‎Test/implementationDivision/split/Split.bpl.expect‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
implementation Foo/untilFirstSplit() returns (y: int)
1+
implementation Foo-0/untilFirstSplit() returns (y: int)
22
{
33

44
anon0:
@@ -13,7 +13,7 @@ implementation Foo/untilFirstSplit() returns (y: int)
1313
}
1414

1515

16-
implementation Foo/afterSplit@15() returns (y: int)
16+
implementation Foo-1/afterSplit@15() returns (y: int)
1717
{
1818

1919
anon0:
@@ -32,7 +32,7 @@ implementation Foo/afterSplit@15() returns (y: int)
3232
}
3333

3434

35-
implementation Foo/afterSplit@22() returns (y: int)
35+
implementation Foo-2/afterSplit@22() returns (y: int)
3636
{
3737

3838
anon0:
@@ -51,7 +51,7 @@ implementation Foo/afterSplit@22() returns (y: int)
5151
}
5252

5353

54-
implementation Foo/afterSplit@25() returns (y: int)
54+
implementation Foo-3/afterSplit@25() returns (y: int)
5555
{
5656

5757
anon0:
@@ -86,7 +86,7 @@ implementation Foo/afterSplit@25() returns (y: int)
8686
}
8787

8888

89-
implementation Foo/afterSplit@19() returns (y: int)
89+
implementation Foo-4/afterSplit@19() returns (y: int)
9090
{
9191

9292
anon0:

‎Test/pruning/MonomorphicSplit.bpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %parallel-boogie /prune:1 /errorTrace:0 /printSplit:"%t" /printSplitDeclarations "%s" > "%t"
2-
// RUN: %OutputCheck "%s" --file-to-check="%t-monomorphicSplit.spl"
2+
// RUN: %OutputCheck "%s" --file-to-check="%t-monomorphicSplit--1.spl"
33

44
// The following checks are a bit simplistic, but this is
55
// on purpose to reduce brittleness. We assume there would now be two uses clauses

0 commit comments

Comments
 (0)