DafnyExtension: Added menu for invoking specific Dafny functionality (e.g., compilation).

7 files changed, 678 insertions, 10 deletions

diff --git a/Source/DafnyExtension/ClassificationTagger.cs b/Source/DafnyExtension/ClassificationTagger.cs
index 09835ac9..8f6191e5 100644
--- a/Source/DafnyExtension/ClassificationTagger.cs
+++ b/Source/DafnyExtension/ClassificationTagger.cs
@@ -37,6 +37,8 @@ namespace DafnyLanguage
     ITagAggregator<DafnyTokenTag> _aggregator;

     IDictionary<DafnyTokenKinds, IClassificationType> _typeMap;

 

+    static bool DafnyMenuWasInitialized;

+

     internal DafnyClassifier(ITextBuffer buffer,

                              ITagAggregator<DafnyTokenTag> tagAggregator,

                              IClassificationTypeRegistryService typeService, Microsoft.VisualStudio.Language.StandardClassification.IStandardClassificationService standards) {

@@ -51,6 +53,19 @@ namespace DafnyLanguage
       _typeMap[DafnyTokenKinds.Comment] = standards.Comment;

       _typeMap[DafnyTokenKinds.VariableIdentifier] = standards.Identifier;

       _typeMap[DafnyTokenKinds.VariableIdentifierDefinition] = typeService.GetClassificationType("Dafny identifier");

+

+      if (!DafnyMenuWasInitialized)

+      {

+        // Initialize the Dafny menu.

+        var shell = Microsoft.VisualStudio.Shell.Package.GetGlobalService(typeof(Microsoft.VisualStudio.Shell.Interop.SVsShell)) as Microsoft.VisualStudio.Shell.Interop.IVsShell;

+        if (shell != null)

+        {

+          Microsoft.VisualStudio.Shell.Interop.IVsPackage package = null;

+          Guid PackageToBeLoadedGuid = new Guid("e1baf989-88a6-4acf-8d97-e0dc243476aa");

+          shell.LoadPackage(ref PackageToBeLoadedGuid, out package);

+        }

+        DafnyMenuWasInitialized = true;

+      }

     }

 

     public event EventHandler<SnapshotSpanEventArgs> TagsChanged;

diff --git a/Source/DafnyExtension/DafnyDriver.cs b/Source/DafnyExtension/DafnyDriver.cs
index a2c60cca..27d17dfe 100644
--- a/Source/DafnyExtension/DafnyDriver.cs
+++ b/Source/DafnyExtension/DafnyDriver.cs
@@ -16,7 +16,7 @@ using VC;
 

 namespace DafnyLanguage

 {

-  class DafnyDriver

+  public class DafnyDriver

   {

     readonly string _programText;

     readonly string _filename;

@@ -120,6 +120,12 @@ namespace DafnyLanguage
       }

     }

 

+    public static void Compile(Dafny.Program dafnyProgram)

+    {

+      Microsoft.Dafny.DafnyOptions.O.SpillTargetCode = true;

+      Microsoft.Dafny.DafnyDriver.CompileDafnyProgram(dafnyProgram, dafnyProgram.Name);

+    }

+

     enum PipelineOutcome { Done, ResolutionError, TypeCheckingError, ResolvedAndTypeChecked, FatalError, VerificationCompleted }

 

     /// <summary>

diff --git a/Source/DafnyExtension/DafnyExtension.csproj b/Source/DafnyExtension/DafnyExtension.csproj
index 3534366e..9399a1d2 100644
--- a/Source/DafnyExtension/DafnyExtension.csproj
+++ b/Source/DafnyExtension/DafnyExtension.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

   <PropertyGroup>

@@ -88,9 +88,6 @@
       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\..\boogie\Binaries\Basetypes.dll</HintPath>

     </Reference>

-    <Reference Include="BVD">

-      <HintPath>..\..\..\boogie\Binaries\BVD.exe</HintPath>

-    </Reference>

     <Reference Include="CodeContractsExtender, Version=2.2.30705.1126, Culture=neutral, PublicKeyToken=736440c9b414ea16, processorArchitecture=MSIL">

       <SpecificVersion>False</SpecificVersion>

       <HintPath>..\..\..\boogie\Binaries\CodeContractsExtender.dll</HintPath>

@@ -197,6 +194,9 @@
     <Content Include="UnivBackPred2.smt2">

       <IncludeInVSIX>true</IncludeInVSIX>

     </Content>

+    <Content Include="DafnyRuntime.cs">

+      <IncludeInVSIX>true</IncludeInVSIX>

+    </Content>

     <None Include="source.extension.vsixmanifest">

       <SubType>Designer</SubType>

     </None>

@@ -218,7 +218,8 @@
   </PropertyGroup>

   <PropertyGroup>

     <PreBuildEvent>copy /y $(SolutionDir)\..\..\boogie\Binaries\UnivBackPred2.smt2 $(ProjectDir)

-copy /y $(SolutionDir)\..\Binaries\DafnyPrelude.bpl $(ProjectDir)</PreBuildEvent>

+copy /y $(SolutionDir)\..\Binaries\DafnyPrelude.bpl $(ProjectDir)

+copy /y $(SolutionDir)\..\Binaries\DafnyRuntime.cs $(ProjectDir)</PreBuildEvent>

   </PropertyGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

@@ -227,4 +228,4 @@ copy /y $(SolutionDir)\..\Binaries\DafnyPrelude.bpl $(ProjectDir)</PreBuildEvent
   <Target Name="AfterBuild">

   </Target>

   -->

-</Project>
\ No newline at end of file
+</Project>

diff --git a/Source/DafnyExtension/DafnyRuntime.cs b/Source/DafnyExtension/DafnyRuntime.cs
new file mode 100644
index 00000000..a8faafae
--- /dev/null
+++ b/Source/DafnyExtension/DafnyRuntime.cs
@@ -0,0 +1,631 @@
+using System.Numerics;

+

+namespace Dafny

+{

+  using System.Collections.Generic;

+

+  public class Set<T>

+  {

+    Dictionary<T, bool> dict;

+    Set(Dictionary<T, bool> d) {

+      dict = d;

+    }

+    public static Set<T> Empty {

+      get {

+        return new Set<T>(new Dictionary<T, bool>(0));

+      }

+    }

+    public static Set<T> FromElements(params T[] values) {

+      Dictionary<T, bool> d = new Dictionary<T, bool>(values.Length);

+      foreach (T t in values)

+        d[t] = true;

+      return new Set<T>(d);

+    }

+    public static Set<T> FromCollection(ICollection<T> values) {

+      Dictionary<T, bool> d = new Dictionary<T, bool>();

+      foreach (T t in values)

+        d[t] = true;

+      return new Set<T>(d);

+    }

+    

+    public IEnumerable<T> Elements {

+      get {

+        return dict.Keys;

+      }

+    }

+    /// <summary>

+    /// This is an inefficient iterator for producing all subsets of "this".  Each set returned is the same

+    /// Set<T> object (but this Set<T> object is fresh; in particular, it is not "this").

+    /// </summary>

+    public IEnumerable<Set<T>> AllSubsets {

+      get {

+        // Start by putting all set elements into a list

+        var elmts = new List<T>();

+        elmts.AddRange(dict.Keys);

+        var n = elmts.Count;

+        var which = new bool[n];

+        var s = new Set<T>(new Dictionary<T, bool>(0));

+        while (true) {

+          yield return s;

+          // "add 1" to "which", as if doing a carry chain.  For every digit changed, change the membership of the corresponding element in "s".

+          int i = 0;

+          for (; i < n && which[i]; i++) {

+            which[i] = false;

+            s.dict.Remove(elmts[i]);

+          }

+          if (i == n) {

+            // we have cycled through all the subsets

+            break;

+          }

+          which[i] = true;

+          s.dict.Add(elmts[i], true);

+        }

+      }

+    }

+    public bool Equals(Set<T> other) {

+      return dict.Count == other.dict.Count && IsSubsetOf(other);

+    }

+    public override bool Equals(object other) {

+      return other is Set<T> && Equals((Set<T>)other);

+    }

+    public override int GetHashCode() {

+      return dict.GetHashCode();

+    }

+    public override string ToString() {

+      var s = "{";

+      var sep = "";

+      foreach (var t in dict.Keys) {

+        s += sep + t.ToString();

+        sep = ", ";

+      }

+      return s + "}";

+    }

+    public bool IsProperSubsetOf(Set<T> other) {

+      return dict.Count < other.dict.Count && IsSubsetOf(other);

+    }

+    public bool IsSubsetOf(Set<T> other) {

+      if (other.dict.Count < dict.Count)

+        return false;

+      foreach (T t in dict.Keys) {

+        if (!other.dict.ContainsKey(t))

+          return false;

+      }

+      return true;

+    }

+    public bool IsSupersetOf(Set<T> other) {

+      return other.IsSubsetOf(this);

+    }

+    public bool IsProperSupersetOf(Set<T> other) {

+      return other.IsProperSubsetOf(this);

+    }

+    public bool IsDisjointFrom(Set<T> other) {

+      Dictionary<T, bool> a, b;

+      if (dict.Count < other.dict.Count) {

+        a = dict; b = other.dict;

+      } else {

+        a = other.dict; b = dict;

+      }

+      foreach (T t in a.Keys) {

+        if (b.ContainsKey(t))

+          return false;

+      }

+      return true;

+    }

+    public bool Contains(T t) {

+      return dict.ContainsKey(t);

+    }

+    public Set<T> Union(Set<T> other) {

+      if (dict.Count == 0)

+        return other;

+      else if (other.dict.Count == 0)

+        return this;

+      Dictionary<T, bool> a, b;

+      if (dict.Count < other.dict.Count) {

+        a = dict; b = other.dict;

+      } else {

+        a = other.dict; b = dict;

+      }

+      Dictionary<T, bool> r = new Dictionary<T, bool>();

+      foreach (T t in b.Keys)

+        r[t] = true;

+      foreach (T t in a.Keys)

+        r[t] = true;

+      return new Set<T>(r);

+    }

+    public Set<T> Intersect(Set<T> other) {

+      if (dict.Count == 0)

+        return this;

+      else if (other.dict.Count == 0)

+        return other;

+      Dictionary<T, bool> a, b;

+      if (dict.Count < other.dict.Count) {

+        a = dict; b = other.dict;

+      } else {

+        a = other.dict; b = dict;

+      }

+      var r = new Dictionary<T, bool>();

+      foreach (T t in a.Keys) {

+        if (b.ContainsKey(t))

+          r.Add(t, true);

+      }

+      return new Set<T>(r);

+    }

+    public Set<T> Difference(Set<T> other) {

+      if (dict.Count == 0)

+        return this;

+      else if (other.dict.Count == 0)

+        return this;

+      var r = new Dictionary<T, bool>();

+      foreach (T t in dict.Keys) {

+        if (!other.dict.ContainsKey(t))

+          r.Add(t, true);

+      }

+      return new Set<T>(r);

+    }

+  }

+  public class MultiSet<T>

+  {

+    Dictionary<T, int> dict;

+    MultiSet(Dictionary<T, int> d) {

+      dict = d;

+    }

+    public static MultiSet<T> Empty {

+      get {

+        return new MultiSet<T>(new Dictionary<T, int>(0));

+      }

+    }

+    public static MultiSet<T> FromElements(params T[] values) {

+      Dictionary<T, int> d = new Dictionary<T, int>(values.Length);

+      foreach (T t in values) {

+        var i = 0;

+        if (!d.TryGetValue(t, out i)) {

+          i = 0;

+        }

+        d[t] = i + 1;

+      }

+      return new MultiSet<T>(d);

+    }

+    public static MultiSet<T> FromCollection(ICollection<T> values) {

+      Dictionary<T, int> d = new Dictionary<T, int>();

+      foreach (T t in values) {

+        var i = 0;

+        if (!d.TryGetValue(t, out i)) {

+          i = 0;

+        }

+        d[t] = i + 1;

+      }

+      return new MultiSet<T>(d);

+    }

+    public static MultiSet<T> FromSeq(Sequence<T> values) {

+      Dictionary<T, int> d = new Dictionary<T, int>();

+      foreach (T t in values.Elements) {

+        var i = 0;

+        if (!d.TryGetValue(t, out i)) {

+          i = 0;

+        }

+        d[t] = i + 1;

+      }

+      return new MultiSet<T>(d);

+    }

+    public static MultiSet<T> FromSet(Set<T> values) {

+      Dictionary<T, int> d = new Dictionary<T, int>();

+      foreach (T t in values.Elements) {

+        d[t] = 1;

+      }

+      return new MultiSet<T>(d);

+    }

+

+    public bool Equals(MultiSet<T> other) {

+      return other.IsSubsetOf(this) && this.IsSubsetOf(other);

+    }

+    public override bool Equals(object other) {

+      return other is MultiSet<T> && Equals((MultiSet<T>)other);

+    }

+    public override int GetHashCode() {

+      return dict.GetHashCode();

+    }

+    public override string ToString() {

+      var s = "multiset{";

+      var sep = "";

+      foreach (var kv in dict) {

+        var t = kv.Key.ToString();

+        for (int i = 0; i < kv.Value; i++) {

+          s += sep + t.ToString();

+          sep = ", ";

+        }

+      }

+      return s + "}";

+    }

+    public bool IsProperSubsetOf(MultiSet<T> other) {

+      return !Equals(other) && IsSubsetOf(other);

+    }

+    public bool IsSubsetOf(MultiSet<T> other) {

+      foreach (T t in dict.Keys) {

+        if (!other.dict.ContainsKey(t) || other.dict[t] < dict[t])

+          return false;

+      }

+      return true;

+    }

+    public bool IsSupersetOf(MultiSet<T> other) {

+      return other.IsSubsetOf(this);

+    }

+    public bool IsProperSupersetOf(MultiSet<T> other) {

+      return other.IsProperSubsetOf(this);

+    }

+    public bool IsDisjointFrom(MultiSet<T> other) {

+      foreach (T t in dict.Keys) {

+        if (other.dict.ContainsKey(t))

+          return false;

+      }

+      foreach (T t in other.dict.Keys) {

+        if (dict.ContainsKey(t))

+          return false;

+      }

+      return true;

+    }

+    public bool Contains(T t) {

+      return dict.ContainsKey(t);

+    }

+    public MultiSet<T> Union(MultiSet<T> other) {

+      if (dict.Count == 0)

+        return other;

+      else if (other.dict.Count == 0)

+        return this;

+      var r = new Dictionary<T, int>();

+      foreach (T t in dict.Keys) {

+        var i = 0;

+        if (!r.TryGetValue(t, out i)) {

+          i = 0;

+        }

+        r[t] = i + dict[t];

+      }

+      foreach (T t in other.dict.Keys) {

+        var i = 0;

+        if (!r.TryGetValue(t, out i)) {

+          i = 0;

+        }

+        r[t] = i + other.dict[t];

+      }

+      return new MultiSet<T>(r);

+    }

+    public MultiSet<T> Intersect(MultiSet<T> other) {

+      if (dict.Count == 0)

+        return this;

+      else if (other.dict.Count == 0)

+        return other;

+      var r = new Dictionary<T, int>();

+      foreach (T t in dict.Keys) {

+        if (other.dict.ContainsKey(t)) {

+          r.Add(t, other.dict[t] < dict[t] ? other.dict[t] : dict[t]);

+        }

+      }

+      return new MultiSet<T>(r);

+    }

+    public MultiSet<T> Difference(MultiSet<T> other) { // \result == this - other

+      if (dict.Count == 0)

+        return this;

+      else if (other.dict.Count == 0)

+        return this;

+      var r = new Dictionary<T, int>();

+      foreach (T t in dict.Keys) {

+        if (!other.dict.ContainsKey(t)) {

+          r.Add(t, dict[t]);

+        } else if (other.dict[t] < dict[t]) {

+          r.Add(t, dict[t] - other.dict[t]);

+        }

+      }

+      return new MultiSet<T>(r);

+    }

+    public IEnumerable<T> Elements {

+      get {

+        List<T> l = new List<T>();

+        foreach (T t in dict.Keys) {

+          int n;

+          dict.TryGetValue(t, out n);

+          for (int i = 0; i < n; i ++) {

+            l.Add(t);

+          }

+        }

+        return l;

+      }

+    }

+  }

+

+  public class Map<U, V>

+  {

+    Dictionary<U, V> dict;

+    Map(Dictionary<U, V> d) {

+      dict = d;

+    }

+    public static Map<U, V> Empty {

+      get {

+        return new Map<U, V>(new Dictionary<U,V>());

+      }

+    }

+    public static Map<U, V> FromElements(params Pair<U, V>[] values) {

+      Dictionary<U, V> d = new Dictionary<U, V>(values.Length);

+      foreach (Pair<U, V> p in values) {

+        d[p.Car] = p.Cdr;

+      }

+      return new Map<U, V>(d);

+    }

+    public static Map<U, V> FromCollection(List<Pair<U, V>> values) {

+      Dictionary<U, V> d = new Dictionary<U, V>(values.Count);

+      foreach (Pair<U, V> p in values) {

+        d[p.Car] = p.Cdr;

+      }

+      return new Map<U, V>(d);

+    }

+    public bool Equals(Map<U, V> other) {

+      foreach (U u in dict.Keys) {

+        V v1, v2;

+        if (!dict.TryGetValue(u, out v1)) {

+          return false; // this shouldn't happen

+        }

+        if (!other.dict.TryGetValue(u, out v2)) {

+          return false; // other dictionary does not contain this element

+        }

+        if (!v1.Equals(v2)) {

+          return false;

+        }

+      }

+      foreach (U u in other.dict.Keys) {

+        if (!dict.ContainsKey(u)) {

+          return false; // this shouldn't happen

+        }

+      }

+      return true;

+    }

+    public override bool Equals(object other) {

+      return other is Map<U, V> && Equals((Map<U, V>)other);

+    }

+    public override int GetHashCode() {

+      return dict.GetHashCode();

+    }

+    public override string ToString() {

+      var s = "map[";

+      var sep = "";

+      foreach (var kv in dict) {

+        s += sep + kv.Key.ToString() + " := " + kv.Value.ToString();

+        sep = ", ";

+      }

+      return s + "]";

+    }

+    public bool IsDisjointFrom(Map<U, V> other) {

+      foreach (U u in dict.Keys) {

+        if (other.dict.ContainsKey(u))

+          return false;

+      }

+      foreach (U u in other.dict.Keys) {

+        if (dict.ContainsKey(u))

+          return false;

+      }

+      return true;

+    }

+    public bool Contains(U u) {

+      return dict.ContainsKey(u);

+    }

+    public V Select(U index) {

+      return dict[index];

+    }

+    public Map<U, V> Update(U index, V val) {

+      Dictionary<U, V> d = new Dictionary<U, V>(dict);

+      d[index] = val;

+      return new Map<U, V>(d);

+    }

+    public IEnumerable<U> Domain {

+      get {

+        return dict.Keys;

+      }

+    }

+  }

+  public class Sequence<T>

+  {

+    T[] elmts;

+    public Sequence(T[] ee) {

+      elmts = ee;

+    }

+    public static Sequence<T> Empty {

+      get {

+        return new Sequence<T>(new T[0]);

+      }

+    }

+    public static Sequence<T> FromElements(params T[] values) {

+      return new Sequence<T>(values);

+    }

+    public BigInteger Length {

+      get { return new BigInteger(elmts.Length); }

+    }

+    public T[] Elements {

+      get {

+        return elmts;

+      }

+    }

+    public IEnumerable<T> UniqueElements {

+      get {

+        var st = Set<T>.FromElements(elmts);

+        return st.Elements;

+      }

+    }

+    public T Select(BigInteger index) {

+      return elmts[(int)index];

+    }

+    public Sequence<T> Update(BigInteger index, T t) {

+      T[] a = (T[])elmts.Clone();

+      a[(int)index] = t;

+      return new Sequence<T>(a);

+    }

+    public bool Equals(Sequence<T> other) {

+      int n = elmts.Length;

+      return n == other.elmts.Length && EqualUntil(other, n);

+    }

+    public override bool Equals(object other) {

+      return other is Sequence<T> && Equals((Sequence<T>)other);

+    }

+    public override int GetHashCode() {

+      return elmts.GetHashCode();

+    }

+    public override string ToString() {

+      var s = "[";

+      var sep = "";

+      foreach (var t in elmts) {

+        s += sep + t.ToString();

+        sep = ", ";

+      }

+      return s + "]";

+    }

+    bool EqualUntil(Sequence<T> other, int n) {

+      for (int i = 0; i < n; i++) {

+        if (!elmts[i].Equals(other.elmts[i]))

+          return false;

+      }

+      return true;

+    }

+    public bool IsProperPrefixOf(Sequence<T> other) {

+      int n = elmts.Length;

+      return n < other.elmts.Length && EqualUntil(other, n);

+    }

+    public bool IsPrefixOf(Sequence<T> other) {

+      int n = elmts.Length;

+      return n <= other.elmts.Length && EqualUntil(other, n);

+    }

+    public Sequence<T> Concat(Sequence<T> other) {

+      if (elmts.Length == 0)

+        return other;

+      else if (other.elmts.Length == 0)

+        return this;

+      T[] a = new T[elmts.Length + other.elmts.Length];

+      System.Array.Copy(elmts, 0, a, 0, elmts.Length);

+      System.Array.Copy(other.elmts, 0, a, elmts.Length, other.elmts.Length);

+      return new Sequence<T>(a);

+    }

+    public bool Contains(T t) {

+      int n = elmts.Length;

+      for (int i = 0; i < n; i++) {

+        if (t.Equals(elmts[i]))

+          return true;

+      }

+      return false;

+    }

+    public Sequence<T> Take(BigInteger n) {

+      int m = (int)n;

+      if (elmts.Length == m)

+        return this;

+      T[] a = new T[m];

+      System.Array.Copy(elmts, a, m);

+      return new Sequence<T>(a);

+    }

+    public Sequence<T> Drop(BigInteger n) {

+      if (n.IsZero)

+        return this;

+      int m = (int)n;

+      T[] a = new T[elmts.Length - m];

+      System.Array.Copy(elmts, m, a, 0, elmts.Length - m);

+      return new Sequence<T>(a);

+    }

+  }

+  public struct Pair<A, B>

+  {

+    public readonly A Car;

+    public readonly B Cdr;

+    public Pair(A a, B b) {

+      this.Car = a;

+      this.Cdr = b;

+    }

+  }

+  public partial class Helpers {

+    // Computing forall/exists quantifiers

+    public static bool QuantBool(bool frall, System.Predicate<bool> pred) {

+      if (frall) {

+        return pred(false) && pred(true);

+      } else {

+        return pred(false) || pred(true);

+      }

+    }

+    public static bool QuantInt(BigInteger lo, BigInteger hi, bool frall, System.Predicate<BigInteger> pred) {

+      for (BigInteger i = lo; i < hi; i++) {

+        if (pred(i) != frall) { return !frall; }

+      }

+      return frall;

+    }

+    public static bool QuantSet<U>(Dafny.Set<U> set, bool frall, System.Predicate<U> pred) {

+      foreach (var u in set.Elements) {

+        if (pred(u) != frall) { return !frall; }

+      }

+      return frall;

+    }

+    public static bool QuantMap<U,V>(Dafny.Map<U,V> map, bool frall, System.Predicate<U> pred) {

+      foreach (var u in map.Domain) {

+        if (pred(u) != frall) { return !frall; }

+      }

+      return frall;

+    }

+    public static bool QuantSeq<U>(Dafny.Sequence<U> seq, bool frall, System.Predicate<U> pred) {

+      foreach (var u in seq.Elements) {

+        if (pred(u) != frall) { return !frall; }

+      }

+      return frall;

+    }

+    public static bool QuantDatatype<U>(IEnumerable<U> set, bool frall, System.Predicate<U> pred) {

+      foreach (var u in set) {

+        if (pred(u) != frall) { return !frall; }

+      }

+      return frall;

+    }

+    // Enumerating other collections

+    public delegate Dafny.Set<T> ComprehensionDelegate<T>();

+    public delegate Dafny.Map<U, V> MapComprehensionDelegate<U, V>();

+    public static IEnumerable<bool> AllBooleans {

+      get {

+        yield return false;

+        yield return true;

+      }

+    }

+    // pre: b != 0

+    // post: result == a/b, as defined by Euclidean Division (http://en.wikipedia.org/wiki/Modulo_operation)

+    public static BigInteger EuclideanDivision(BigInteger a, BigInteger b) {

+      if (0 <= a.Sign) {

+        if (0 <= b.Sign) {

+          // +a +b: a/b

+          return BigInteger.Divide(a, b);

+        } else {

+          // +a -b: -(a/(-b))

+          return BigInteger.Negate(BigInteger.Divide(a, BigInteger.Negate(b)));

+        }

+      } else {

+        if (0 <= b.Sign) {

+          // -a +b: -((-a-1)/b) - 1

+          return BigInteger.Negate(BigInteger.Divide(BigInteger.Negate(a) - 1, b)) - 1;

+        } else {

+          // -a -b: ((-a-1)/(-b)) + 1

+          return BigInteger.Divide(BigInteger.Negate(a) - 1, BigInteger.Negate(b)) + 1;

+        }

+      }

+    }

+    // pre: b != 0

+    // post: result == a%b, as defined by Euclidean Division (http://en.wikipedia.org/wiki/Modulo_operation)

+    public static BigInteger EuclideanModulus(BigInteger a, BigInteger b) {

+      var bp = BigInteger.Abs(b);

+      if (0 <= a.Sign) {

+        // +a: a % b'

+        return BigInteger.Remainder(a, bp);

+      } else {

+        // c = ((-a) % b')

+        // -a: b' - c if c > 0

+        // -a: 0 if c == 0

+        var c = BigInteger.Remainder(BigInteger.Negate(a), bp);

+        return c.IsZero ? c : BigInteger.Subtract(bp, c);

+      }

+    }

+    public static Sequence<T> SeqFromArray<T>(T[] array) {

+      return new Sequence<T>(array);

+    }

+    // In .NET version 4.5, it it possible to mark a method with "AggressiveInlining", which says to inline the

+    // method if possible.  Method "ExpressionSequence" would be a good candidate for it:

+    // [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]

+    public static U ExpressionSequence<T, U>(T t, U u)

+    {

+      return u;

+    }

+  }

+}

diff --git a/Source/DafnyExtension/ProgressMargin.cs b/Source/DafnyExtension/ProgressMargin.cs
index 7fdf38a6..3f4da8ed 100644
--- a/Source/DafnyExtension/ProgressMargin.cs
+++ b/Source/DafnyExtension/ProgressMargin.cs
@@ -79,7 +79,7 @@ namespace DafnyLanguage
     }

   }

 

-  internal class ProgressTagger : ITagger<ProgressGlyphTag>

+  internal class ProgressTagger : ITagger<ProgressGlyphTag>, IDisposable

   {

     ErrorListProvider _errorProvider;

     ITextBuffer _buffer;

@@ -100,6 +100,7 @@ namespace DafnyLanguage
     }

 

     public void Dispose() {

+      _errorProvider.Dispose();

     }

 

     // The following fields and the contents of the following two lists are protected by the lock "this".

diff --git a/Source/DafnyExtension/ResolverTagger.cs b/Source/DafnyExtension/ResolverTagger.cs
index ca9ed169..81efe28a 100644
--- a/Source/DafnyExtension/ResolverTagger.cs
+++ b/Source/DafnyExtension/ResolverTagger.cs
@@ -6,6 +6,7 @@
 using EnvDTE;

 using System;

 using System.Collections.Generic;

+using System.Collections.Concurrent;

 using System.Linq;

 using System.Text;

 using System.ComponentModel.Composition;

@@ -66,7 +67,7 @@ namespace DafnyLanguage
   /// <summary>

   /// Translate PkgDefTokenTags into ErrorTags and Error List items

   /// </summary>

-  internal sealed class ResolverTagger : ITagger<DafnyResolverTag>, IDisposable

+  public sealed class ResolverTagger : ITagger<DafnyResolverTag>, IDisposable

   {

     ITextBuffer _buffer;

     ITextDocument _document;

@@ -77,6 +78,8 @@ namespace DafnyLanguage
     List<DafnyError> _verificationErrors = new List<DafnyError>();

     ErrorListProvider _errorProvider;

 

+    public static IDictionary<string, Dafny.Program> Programs = new ConcurrentDictionary<string, Dafny.Program>();

+

     internal ResolverTagger(ITextBuffer buffer, IServiceProvider serviceProvider, ITextDocumentFactoryService textDocumentFactory) {

       _buffer = buffer;

       if (!textDocumentFactory.TryGetTextDocument(_buffer, out _document))

@@ -178,6 +181,16 @@ namespace DafnyLanguage
         _snapshot = snapshot;

         _program = program;

       }

+

+      if (program != null && _document != null)

+      {

+        Programs[_document.FilePath] = program;

+      }

+      else if (_document != null)

+      {

+        Programs.Remove(_document.FilePath);

+      }

+

       PopulateErrorList(newErrors, false, snapshot);

     }

 

@@ -287,7 +300,7 @@ namespace DafnyLanguage
     ProcessError, ParseWarning, ParseError, ResolveError, VerificationError, AuxInformation, InternalError

   }

 

-  internal class DafnyError

+  public class DafnyError

   {

     public readonly int Line;  // 0 based

     public readonly int Column;  // 0 based

diff --git a/Source/DafnyExtension/source.extension.vsixmanifest b/Source/DafnyExtension/source.extension.vsixmanifest
index ef5c1cf5..e3e2623f 100644
--- a/Source/DafnyExtension/source.extension.vsixmanifest
+++ b/Source/DafnyExtension/source.extension.vsixmanifest
@@ -19,6 +19,7 @@
   <References />

   <Content>

     <MefComponent>|%CurrentProject%|</MefComponent>

+    <VsPackage>DafnyMenu</VsPackage>

     <CustomExtension Type="Boogie">DafnyPrelude.bpl</CustomExtension>

     <CustomExtension Type="SMTLib 2">UnivBackPred2.smt2</CustomExtension>

   </Content>