Skip to content

Commit 958fbb6

Browse files
akashlalakashlal
authored
Merge pull request #128 from smackers/update-boogie
Update boogie
2 parents 9b11c40 + 8663135 commit 958fbb6

40 files changed

+102
-107
lines changed

‎boogie‎

Submodule boogie updated 464 files

‎cba-NetCore.csproj‎

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

2121
<ItemGroup>
2222
<ProjectReference Include="boogie\Source\AbsInt\AbsInt-NetCore.csproj" />
23-
<ProjectReference Include="boogie\Source\Basetypes\Basetypes-NetCore.csproj" />
23+
<ProjectReference Include="boogie\Source\BaseTypes\BaseTypes-NetCore.csproj" />
2424
<ProjectReference Include="boogie\Source\CodeContractsExtender\CodeContractsExtender-NetCore.csproj" />
2525
<ProjectReference Include="boogie\Source\Concurrency\Concurrency-NetCore.csproj" />
2626
<ProjectReference Include="boogie\Source\Core\Core-NetCore.csproj" />

‎cba.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@
108108
<Project>{0efa3e43-690b-48dc-a72c-384a3ea7f31f}</Project>
109109
<Name>AbsInt</Name>
110110
</ProjectReference>
111-
<ProjectReference Include="boogie\Source\Basetypes\Basetypes.csproj">
111+
<ProjectReference Include="boogie\Source\BaseTypes\BaseTypes.csproj">
112112
<Project>{43dfad18-3e35-4558-9be2-caff6b5ba8a0}</Project>
113-
<Name>Basetypes</Name>
113+
<Name>BaseTypes</Name>
114114
</ProjectReference>
115115
<ProjectReference Include="boogie\Source\CodeContractsExtender\CodeContractsExtender.csproj">
116116
<Project>{accc0156-0921-43ed-8f67-ad8bdc8cde31}</Project>
@@ -215,4 +215,4 @@
215215
<PostBuildEvent>
216216
</PostBuildEvent>
217217
</PropertyGroup>
218-
</Project>
218+
</Project>

‎cba.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "boogie", "boogie", "{247E7F
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbsInt", "boogie\Source\AbsInt\AbsInt.csproj", "{0EFA3E43-690B-48DC-A72C-384A3EA7F31F}"
2525
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basetypes", "boogie\Source\Basetypes\Basetypes.csproj", "{43DFAD18-3E35-4558-9BE2-CAFF6B5BA8A0}"
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseTypes", "boogie\Source\BaseTypes\BaseTypes.csproj", "{43DFAD18-3E35-4558-9BE2-CAFF6B5BA8A0}"
2727
EndProject
2828
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeContractsExtender", "boogie\Source\CodeContractsExtender\CodeContractsExtender.csproj", "{ACCC0156-0921-43ED-8F67-AD8BDC8CDE31}"
2929
EndProject

‎source/BctCleanup/BctCleanup-NetCore.csproj‎

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

1010
<ItemGroup>
1111
<ProjectReference Include="..\..\boogie\Source\AbsInt\AbsInt-NetCore.csproj" />
12-
<ProjectReference Include="..\..\boogie\Source\Basetypes\Basetypes-NetCore.csproj" />
12+
<ProjectReference Include="..\..\boogie\Source\BaseTypes\BaseTypes-NetCore.csproj" />
1313
<ProjectReference Include="..\..\boogie\Source\CodeContractsExtender\CodeContractsExtender-NetCore.csproj" />
1414
<ProjectReference Include="..\..\boogie\Source\Concurrency\Concurrency-NetCore.csproj" />
1515
<ProjectReference Include="..\..\boogie\Source\Core\Core-NetCore.csproj" />

‎source/BctCleanup/BctCleanup.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
<Project>{0efa3e43-690b-48dc-a72c-384a3ea7f31f}</Project>
6666
<Name>AbsInt</Name>
6767
</ProjectReference>
68-
<ProjectReference Include="..\..\boogie\Source\Basetypes\Basetypes.csproj">
68+
<ProjectReference Include="..\..\boogie\Source\BaseTypes\BaseTypes.csproj">
6969
<Project>{43dfad18-3e35-4558-9be2-caff6b5ba8a0}</Project>
70-
<Name>Basetypes</Name>
70+
<Name>BaseTypes</Name>
7171
</ProjectReference>
7272
<ProjectReference Include="..\..\boogie\Source\CodeContractsExtender\CodeContractsExtender.csproj">
7373
<Project>{accc0156-0921-43ed-8f67-ad8bdc8cde31}</Project>

‎source/BctCleanup/Driver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ private static void addInitializersToMain(Program prog, string mainProcName)
217217
List<AssignLhs> lhss = new List<AssignLhs>();
218218
lhss.Add(new SimpleAssignLhs(Token.NoToken, Expr.Ident(trackVariable)));
219219
List<Expr> rhss = new List<Expr>();
220-
rhss.Add(new LiteralExpr(Token.NoToken, Microsoft.Basetypes.BigNum.ZERO));
220+
rhss.Add(new LiteralExpr(Token.NoToken, Microsoft.BaseTypes.BigNum.ZERO));
221221
newCmds.Add(new AssignCmd(Token.NoToken, lhss, rhss));
222222
}
223223

‎source/BctCleanup/app.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Basetypes" publicKeyToken="736440C9B414EA16" culture="neutral"/>
6+
<assemblyIdentity name="BaseTypes" publicKeyToken="736440C9B414EA16" culture="neutral"/>
77
<bindingRedirect oldVersion="0.0.0.0-2.2.30705.1126" newVersion="2.2.30705.1126"/>
88
</dependentAssembly>
99
<dependentAssembly>

‎source/ConstLoop.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,8 @@ private HashSet<string> FindConstantLoops(IEnumerable<Implementation> candidates
439439
var ua_old = CommandLineOptions.Clo.UseArrayTheory;
440440
CommandLineOptions.Clo.UseArrayTheory = true;
441441

442-
var to = CommandLineOptions.Clo.ProverKillTime;
443-
CommandLineOptions.Clo.ProverKillTime = 5;
442+
var to = CommandLineOptions.Clo.TimeLimit;
443+
CommandLineOptions.Clo.TimeLimit = 5;
444444

445445
// verify
446446
BoogieVerify.Verify(outProg, true, out allErrors, out timeOuts);
@@ -475,7 +475,7 @@ private HashSet<string> FindConstantLoops(IEnumerable<Implementation> candidates
475475
// Reset options
476476
CommandLineOptions.Clo.UseArrayTheory = ua_old;
477477

478-
CommandLineOptions.Clo.ProverKillTime = to;
478+
CommandLineOptions.Clo.TimeLimit = to;
479479

480480
return ret;
481481
}

‎source/CoreLib/AbstractHoudini.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public AbstractHoudini(Program program)
4949
this.name2Impl = BoogieUtil.nameImplMapping(program);
5050

5151
this.vcgen = new VCGen(program, CommandLineOptions.Clo.ProverLogFilePath, CommandLineOptions.Clo.ProverLogFileAppend, new List<Checker>());
52-
this.prover = ProverInterface.CreateProver(program, CommandLineOptions.Clo.ProverLogFilePath, CommandLineOptions.Clo.ProverLogFileAppend, CommandLineOptions.Clo.ProverKillTime);
52+
this.prover = ProverInterface.CreateProver(program, CommandLineOptions.Clo.ProverLogFilePath, CommandLineOptions.Clo.ProverLogFileAppend, CommandLineOptions.Clo.TimeLimit);
5353
this.reporter = new AbstractHoudiniErrorReporter();
5454

5555
var impls = new List<Implementation>(
@@ -443,7 +443,7 @@ public VCExpr GetSummaryExpr(Dictionary<string, VCExpr> incarnations, VCExpressi
443443
continue;
444444

445445
var vexpr = VCExpressionGenerator.False;
446-
consts.Iter(c => vexpr = gen.OrSimp(vexpr, gen.Eq(incarnations[v.Name], gen.Integer(Microsoft.Basetypes.BigNum.FromInt(c)))));
446+
consts.Iter(c => vexpr = gen.OrSimp(vexpr, gen.Eq(incarnations[v.Name], gen.Integer(Microsoft.BaseTypes.BigNum.FromInt(c)))));
447447
ret = gen.AndSimp(ret, vexpr);
448448
}
449449

@@ -592,7 +592,7 @@ private object ToValue(Model.Element elem)
592592
{
593593
if (elem is Model.Integer)
594594
{
595-
return Microsoft.Basetypes.BigNum.FromInt((elem as Model.Integer).AsInt());
595+
return Microsoft.BaseTypes.BigNum.FromInt((elem as Model.Integer).AsInt());
596596
}
597597
if (elem is Model.Boolean)
598598
{
@@ -617,9 +617,9 @@ private VCExpr ToVcExpr(Expr expr, Dictionary<string, VCExpr> incarnations, VCEx
617617
return VCExpressionGenerator.False;
618618
}
619619
}
620-
else if (val is Microsoft.Basetypes.BigNum)
620+
else if (val is Microsoft.BaseTypes.BigNum)
621621
{
622-
return gen.Integer((Microsoft.Basetypes.BigNum)val);
622+
return gen.Integer((Microsoft.BaseTypes.BigNum)val);
623623
}
624624

625625
throw new NotImplementedException("Cannot handle literals of this type");

0 commit comments

Comments
 (0)