1 files changed, 6 insertions, 6 deletions

diff --git a/Source/DafnyExtension/ResolverTagger.cs b/Source/DafnyExtension/ResolverTagger.cs
index df7878c4..1fdd3827 100644
--- a/Source/DafnyExtension/ResolverTagger.cs
+++ b/Source/DafnyExtension/ResolverTagger.cs
@@ -154,9 +154,9 @@ namespace DafnyLanguage
 

     string MostRecentRequestId;

     

-    internal void ReInitializeVerificationErrors(string mostRecentRequestId, List<Microsoft.Boogie.Declaration> units)

+    internal void ReInitializeVerificationErrors(string mostRecentRequestId, IEnumerable<Microsoft.Boogie.Implementation> implementations)

     {

-      var implNames = units.OfType<Microsoft.Boogie.Implementation>().Select(impl => impl.Name);

+      var implNames = implementations.Select(impl => impl.Name);

       lock (this)

       {

         MostRecentRequestId = mostRecentRequestId;

@@ -327,7 +327,7 @@ namespace DafnyLanguage
       }

       catch (Exception e)

       {

-        newErrors = new List<DafnyError> { new DafnyError(filename, 0, 0, ErrorCategory.InternalError, "internal Dafny error: " + e.Message, snapshot) };

+        newErrors = new List<DafnyError> { new DafnyError(filename, 0, 0, ErrorCategory.InternalError, "internal Dafny error: " + e.Message, snapshot, false) };

         program = null;

       }

 

@@ -499,7 +499,7 @@ namespace DafnyLanguage
         {

           using (var rd = new StringReader(ModelText))

           {

-            var models = Microsoft.Boogie.Model.ParseModels(rd, null).ToArray();

+            var models = Microsoft.Boogie.Model.ParseModels(rd).ToArray();

             Contract.Assert(models.Length == 1);

             _model = models[0];

           }

@@ -575,13 +575,13 @@ namespace DafnyLanguage
     /// <summary>

     /// "line" and "col" are expected to be 0-based

     /// </summary>

-    public DafnyError(string filename, int line, int col, ErrorCategory cat, string msg, ITextSnapshot snapshot, string model = null, bool inCurrentDocument=true)

+    public DafnyError(string filename, int line, int col, ErrorCategory cat, string msg, ITextSnapshot snapshot, bool isRecycled, string model = null, bool inCurrentDocument = true)

     {

       Filename = filename;

       Line = Math.Max(0, line);

       Column = Math.Max(0, col);

       Category = cat;

-      Message = msg;

+      Message = msg + ((isRecycled && cat == ErrorCategory.VerificationError) ? " (recycled)" : "");

       Snapshot = snapshot;

       if (inCurrentDocument) {

         var sLine = snapshot.GetLineFromLineNumber(line);