diff options
-rw-r--r-- | Source/AbsInt/AbsInt.csproj | 4 | ||||
-rw-r--r-- | Source/Boogie.sln | 31 | ||||
-rw-r--r-- | Source/BoogieDriver/BoogieDriver.csproj | 10 | ||||
-rw-r--r-- | Source/Core/AbsyCmd.cs | 10 | ||||
-rw-r--r-- | Source/Core/Core.csproj | 5 | ||||
-rw-r--r-- | Source/Provers/Isabelle/Isabelle.csproj | 4 | ||||
-rw-r--r-- | Source/Provers/SMTLib/SMTLib.csproj | 4 | ||||
-rw-r--r-- | Source/Provers/Simplify/Simplify.csproj | 4 | ||||
-rw-r--r-- | Source/Provers/Z3/Z3.csproj | 4 | ||||
-rw-r--r-- | Source/Provers/Z3api/Z3api.csproj | 6 | ||||
-rw-r--r-- | Source/VCExpr/VCExpr.csproj | 4 | ||||
-rw-r--r-- | Source/VCGeneration/VCGeneration.csproj | 4 |
12 files changed, 42 insertions, 48 deletions
diff --git a/Source/AbsInt/AbsInt.csproj b/Source/AbsInt/AbsInt.csproj index 9bfe22fa..c5601053 100644 --- a/Source/AbsInt/AbsInt.csproj +++ b/Source/AbsInt/AbsInt.csproj @@ -87,8 +87,8 @@ <Compile Include="..\version.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Basetypes\Basetypes.sscproj">
diff --git a/Source/Boogie.sln b/Source/Boogie.sln index 96e1337b..9020382d 100644 --- a/Source/Boogie.sln +++ b/Source/Boogie.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Provers", "Provers", "{B758C1E3-824A-439F-AA2F-0BA1143E8C8D}"
EndProject
-Project("{07C4E3D1-6B67-4060-8A92-940DB82041ED}") = "AIFramework", "AIFramework\AIFramework.sscproj", "{24B55172-AD8B-47D1-8952-5A95CFDB9B31}"
-EndProject
Project("{07C4E3D1-6B67-4060-8A92-940DB82041ED}") = "Basetypes", "Basetypes\Basetypes.sscproj", "{0C692837-77EC-415F-BF04-395E3ED06E9A}"
EndProject
Project("{07C4E3D1-6B67-4060-8A92-940DB82041ED}") = "Graph", "Graph\Graph.sscproj", "{4C28FB90-630E-4B55-A937-11A011B79765}"
@@ -25,13 +23,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VCGeneration", "VCGeneratio EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VCExpr", "VCExpr\VCExpr.csproj", "{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}"
EndProject
-<<<<<<< .mine
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{B230A69C-C466-4065-B9C1-84D80E76D802}"
EndProject
-=======
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Z3api", "Provers\Z3api\Z3api.csproj", "{966DD87B-A29D-4F3C-9406-F680A61DC0E0}"
EndProject
->>>>>>> .r56635
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIFramework", "AIFramework\AIFramework.csproj", "{39B0658D-C955-41C5-9A43-48C97A1EF5FD}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -42,16 +39,6 @@ Global Release|Mixed Platforms = Release|Mixed Platforms
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Debug|.NET.ActiveCfg = Debug|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Debug|.NET.Build.0 = Debug|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Debug|Any CPU.ActiveCfg = Debug|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Debug|Mixed Platforms.ActiveCfg = Debug|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Debug|Mixed Platforms.Build.0 = Debug|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Release|.NET.ActiveCfg = Release|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Release|.NET.Build.0 = Release|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Release|Any CPU.ActiveCfg = Release|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Release|Mixed Platforms.ActiveCfg = Release|.NET
- {24B55172-AD8B-47D1-8952-5A95CFDB9B31}.Release|Mixed Platforms.Build.0 = Release|.NET
{0C692837-77EC-415F-BF04-395E3ED06E9A}.Debug|.NET.ActiveCfg = Debug|.NET
{0C692837-77EC-415F-BF04-395E3ED06E9A}.Debug|.NET.Build.0 = Debug|.NET
{0C692837-77EC-415F-BF04-395E3ED06E9A}.Debug|Any CPU.ActiveCfg = Debug|.NET
@@ -159,7 +146,6 @@ Global {56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}.Release|Any CPU.Build.0 = Release|Any CPU
{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-<<<<<<< .mine
{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|.NET.ActiveCfg = Debug|Any CPU
{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B230A69C-C466-4065-B9C1-84D80E76D802}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -170,18 +156,25 @@ Global {B230A69C-C466-4065-B9C1-84D80E76D802}.Release|Any CPU.Build.0 = Release|Any CPU
{B230A69C-C466-4065-B9C1-84D80E76D802}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B230A69C-C466-4065-B9C1-84D80E76D802}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-=======
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|.NET.ActiveCfg = Debug|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|.NET.ActiveCfg = Release|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|Any CPU.Build.0 = Release|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{966DD87B-A29D-4F3C-9406-F680A61DC0E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
->>>>>>> .r56635
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Release|.NET.ActiveCfg = Release|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {39B0658D-C955-41C5-9A43-48C97A1EF5FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Source/BoogieDriver/BoogieDriver.csproj b/Source/BoogieDriver/BoogieDriver.csproj index b572dd6f..a31019db 100644 --- a/Source/BoogieDriver/BoogieDriver.csproj +++ b/Source/BoogieDriver/BoogieDriver.csproj @@ -3,7 +3,7 @@ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{DAB6BAA4-7AF7-449F-96AB-F58F34D03A7A}</ProjectGuid>
<OutputType>Exe</OutputType>
@@ -93,8 +93,8 @@ <Project>{0EFA3E43-690B-48DC-A72C-384A3EA7F31F}</Project>
<Name>AbsInt</Name>
</ProjectReference>
- <ProjectReference Include="..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Basetypes\Basetypes.sscproj">
@@ -121,10 +121,6 @@ <Project>{9B163AA3-36BC-4AFB-88AB-79BC9E97E401}</Project>
<Name>SMTLib</Name>
</ProjectReference>
- <ProjectReference Include="..\Provers\Z3api\Z3api.csproj">
- <Project>{966DD87B-A29D-4F3C-9406-F680A61DC0E0}</Project>
- <Name>Z3api</Name>
- </ProjectReference>
<ProjectReference Include="..\Provers\Z3\Z3.csproj">
<Project>{BB49B90B-BE21-4BE8-85BA-359FDB55F4DF}</Project>
<Name>Z3</Name>
diff --git a/Source/Core/AbsyCmd.cs b/Source/Core/AbsyCmd.cs index e31348a1..5117da09 100644 --- a/Source/Core/AbsyCmd.cs +++ b/Source/Core/AbsyCmd.cs @@ -1659,9 +1659,15 @@ namespace Microsoft.Boogie { errorData = value;
}
}
-
+ public static List<T> toList<T>(PureCollections.Sequence seq) {
+ List<T> toRet = new List<T>();
+ foreach (T t in seq)
+ if (t != null)
+ toRet.Add(t);
+ return toRet;
+ }
public CallCmd(IToken tok, string callee, ExprSeq ins, IdentifierExprSeq outs)
- : this(tok, callee, cce.toList<Expr>(ins), cce.toList<IdentifierExpr>(outs)) {
+ : this(tok, callee, toList<Expr>(ins), toList<IdentifierExpr>(outs)) {
Contract.Requires(outs != null);
Contract.Requires(ins != null);
Contract.Requires(callee != null);
diff --git a/Source/Core/Core.csproj b/Source/Core/Core.csproj index 01f6158c..54bc2cab 100644 --- a/Source/Core/Core.csproj +++ b/Source/Core/Core.csproj @@ -92,7 +92,6 @@ <Compile Include="AbsyExpr.cs" />
<Compile Include="AbsyQuant.cs" />
<Compile Include="AbsyType.cs" />
- <Compile Include="cce.cs" />
<Compile Include="CommandLineOptions.cs" />
<Compile Include="DeadVarElim.cs" />
<Compile Include="Duplicator.cs" />
@@ -114,8 +113,8 @@ <Compile Include="Xml.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Basetypes\Basetypes.sscproj">
diff --git a/Source/Provers/Isabelle/Isabelle.csproj b/Source/Provers/Isabelle/Isabelle.csproj index 6bc98823..bcf367b7 100644 --- a/Source/Provers/Isabelle/Isabelle.csproj +++ b/Source/Provers/Isabelle/Isabelle.csproj @@ -73,8 +73,8 @@ <Compile Include="..\..\version.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Basetypes\Basetypes.sscproj">
diff --git a/Source/Provers/SMTLib/SMTLib.csproj b/Source/Provers/SMTLib/SMTLib.csproj index 344c247f..de0b7227 100644 --- a/Source/Provers/SMTLib/SMTLib.csproj +++ b/Source/Provers/SMTLib/SMTLib.csproj @@ -85,8 +85,8 @@ <Compile Include="..\..\version.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Basetypes\Basetypes.sscproj">
diff --git a/Source/Provers/Simplify/Simplify.csproj b/Source/Provers/Simplify/Simplify.csproj index 693167a3..652f8eec 100644 --- a/Source/Provers/Simplify/Simplify.csproj +++ b/Source/Provers/Simplify/Simplify.csproj @@ -79,8 +79,8 @@ <Compile Include="..\..\version.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Basetypes\Basetypes.sscproj">
diff --git a/Source/Provers/Z3/Z3.csproj b/Source/Provers/Z3/Z3.csproj index 919ee5cf..ba065013 100644 --- a/Source/Provers/Z3/Z3.csproj +++ b/Source/Provers/Z3/Z3.csproj @@ -83,8 +83,8 @@ <Compile Include="..\..\version.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Basetypes\Basetypes.sscproj">
diff --git a/Source/Provers/Z3api/Z3api.csproj b/Source/Provers/Z3api/Z3api.csproj index fb01ce94..a2f5793c 100644 --- a/Source/Provers/Z3api/Z3api.csproj +++ b/Source/Provers/Z3api/Z3api.csproj @@ -3,7 +3,7 @@ <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{966DD87B-A29D-4F3C-9406-F680A61DC0E0}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -61,8 +61,8 @@ <Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Basetypes\Basetypes.sscproj">
diff --git a/Source/VCExpr/VCExpr.csproj b/Source/VCExpr/VCExpr.csproj index fdb303d3..05b12234 100644 --- a/Source/VCExpr/VCExpr.csproj +++ b/Source/VCExpr/VCExpr.csproj @@ -88,8 +88,8 @@ <Compile Include="VCExprASTVisitors.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Basetypes\Basetypes.sscproj">
diff --git a/Source/VCGeneration/VCGeneration.csproj b/Source/VCGeneration/VCGeneration.csproj index 4f652a5d..d6890363 100644 --- a/Source/VCGeneration/VCGeneration.csproj +++ b/Source/VCGeneration/VCGeneration.csproj @@ -89,8 +89,8 @@ <Compile Include="Wlp.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\AIFramework\AIFramework.sscproj">
- <Project>{24B55172-AD8B-47D1-8952-5A95CFDB9B31}</Project>
+ <ProjectReference Include="..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
<Name>AIFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Basetypes\Basetypes.sscproj">
|