diff options
| author |  wuestholz <unknown> | 2013-12-09 09:48:11 +0100 |
|---|---|---|
| committer | wuestholz <unknown> | 2013-12-09 09:48:11 +0100 |
| commit | 3de67fcd5ee66fa69c1b156fe67409812ee8a12c (patch) | |
| tree | a5d7964f49d45948258f50204548f41472ae3f61 /Source/DafnyExtension | |
| parent | 75aad652723efe9d0e41ee2e82f8123044b817a9 (diff) | |
Fix some things due to changes in Boogie (execution engine API, 'UnivBackPred2.smt2' no longer needed).
Diffstat (limited to 'Source/DafnyExtension')
| -rw-r--r-- | Source/DafnyExtension/DafnyDriver.cs | 5 | ||||
| -rw-r--r-- | Source/DafnyExtension/DafnyExtension.csproj | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Source/DafnyExtension/DafnyDriver.cs b/Source/DafnyExtension/DafnyDriver.cs index 168e69b5..c92caf4e 100644 --- a/Source/DafnyExtension/DafnyDriver.cs +++ b/Source/DafnyExtension/DafnyDriver.cs @@ -251,7 +251,10 @@ namespace DafnyLanguage PipelineOutcome oc = BoogieResolveAndTypecheck(program);
if (oc == PipelineOutcome.ResolvedAndTypeChecked) {
- ExecutionEngine.EliminateDeadVariablesAndInline(program);
+ ExecutionEngine.EliminateDeadVariables(program);
+ ExecutionEngine.CollectModSets(program);
+ ExecutionEngine.CoalesceBlocks(program);
+ ExecutionEngine.Inline(program);
return ExecutionEngine.InferAndVerify(program, new PipelineStatistics(), er, requestId);
}
return oc;
diff --git a/Source/DafnyExtension/DafnyExtension.csproj b/Source/DafnyExtension/DafnyExtension.csproj index 47a3516c..d29da5d2 100644 --- a/Source/DafnyExtension/DafnyExtension.csproj +++ b/Source/DafnyExtension/DafnyExtension.csproj @@ -163,9 +163,6 @@ <Content Include="DafnyPrelude.bpl">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
- <Content Include="UnivBackPred2.smt2">
- <IncludeInVSIX>true</IncludeInVSIX>
- </Content>
<Content Include="DafnyRuntime.cs">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
@@ -189,8 +186,7 @@ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup>
- <PreBuildEvent>copy /y "..\..\boogie\Binaries\UnivBackPred2.smt2" "$(ProjectDir)"
-copy /y "..\Binaries\DafnyPrelude.bpl" "$(ProjectDir)"
+ <PreBuildEvent>copy /y "..\Binaries\DafnyPrelude.bpl" "$(ProjectDir)"
copy /y "..\Binaries\DafnyRuntime.cs" "$(ProjectDir)"</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|