Boogie: AIFramework port part 3/3: Committing reference changes, edit to Core to jive with recent changes made to the cce class.

2 files changed, 10 insertions, 5 deletions

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">