From ed83becd12d7079e6ce2853fbebace20b1e7df5a Mon Sep 17 00:00:00 2001
From: boehmes <unknown>
Date: Thu, 27 Sep 2012 17:13:40 +0200
Subject: Removed AIFramework from Boogie -- use native trivial or native
 interval-based abstract interpretation instead. Command-line option '/infer'
 now accepts only arguments 't' and 'j' where the latter is the default now
 for Boogie. Command-line option '/logInfer' has been dropped.

---
 Source/BoogieDriver/BoogieDriver.cs     | 11 ++++++-----
 Source/BoogieDriver/BoogieDriver.csproj |  4 ----
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'Source/BoogieDriver')

diff --git a/Source/BoogieDriver/BoogieDriver.cs b/Source/BoogieDriver/BoogieDriver.cs
index 1653b723..75ba7372 100644
--- a/Source/BoogieDriver/BoogieDriver.cs
+++ b/Source/BoogieDriver/BoogieDriver.cs
@@ -20,7 +20,6 @@ namespace Microsoft.Boogie {
   using System.Diagnostics;
   using System.Linq;
   using VC;
-  using AI = Microsoft.AbstractInterpretationFramework;
   using BoogiePL = Microsoft.Boogie;
 
   /* 
@@ -583,11 +582,13 @@ namespace Microsoft.Boogie {
       // ---------- Infer invariants --------------------------------------------------------
 
       // Abstract interpretation -> Always use (at least) intervals, if not specified otherwise (e.g. with the "/noinfer" switch)
-      if (CommandLineOptions.Clo.Ai.J_Intervals || CommandLineOptions.Clo.Ai.J_Trivial) {
-        Microsoft.Boogie.AbstractInterpretation.NativeAbstractInterpretation.RunAbstractInterpretation(program);
-      } else {
-        Microsoft.Boogie.AbstractInterpretation.AbstractInterpretation.RunAbstractInterpretation(program);
+      if (CommandLineOptions.Clo.UseAbstractInterpretation) {
+        if (!CommandLineOptions.Clo.Ai.J_Intervals && !CommandLineOptions.Clo.Ai.J_Trivial) {
+          // use /infer:j as the default
+          CommandLineOptions.Clo.Ai.J_Intervals = true;
+        }
       }
+      Microsoft.Boogie.AbstractInterpretation.NativeAbstractInterpretation.RunAbstractInterpretation(program);
 
       if (CommandLineOptions.Clo.LoopUnrollCount != -1) {
         program.UnrollLoops(CommandLineOptions.Clo.LoopUnrollCount);
diff --git a/Source/BoogieDriver/BoogieDriver.csproj b/Source/BoogieDriver/BoogieDriver.csproj
index 51a10002..9edd2df7 100644
--- a/Source/BoogieDriver/BoogieDriver.csproj
+++ b/Source/BoogieDriver/BoogieDriver.csproj
@@ -214,10 +214,6 @@
       <Project>{0EFA3E43-690B-48DC-A72C-384A3EA7F31F}</Project>
       <Name>AbsInt</Name>
     </ProjectReference>
-    <ProjectReference Include="..\AIFramework\AIFramework.csproj">
-      <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
-      <Name>AIFramework</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Basetypes\Basetypes.csproj">
       <Project>{43DFAD18-3E35-4558-9BE2-CAFF6B5BA8A0}</Project>
       <Name>Basetypes</Name>
-- 
cgit v1.2.3