Ensure that no file is processed twice, even if one command-line file is included by another command-line file.

1 files changed, 5 insertions, 2 deletions

diff --git a/Source/Dafny/DafnyMain.cs b/Source/Dafny/DafnyMain.cs
index 34b509a0..7c522bd8 100644
--- a/Source/Dafny/DafnyMain.cs
+++ b/Source/Dafny/DafnyMain.cs
@@ -54,7 +54,7 @@ namespace Microsoft.Dafny {
       }

 

       if (!DafnyOptions.O.DisallowIncludes) {

-        string errString = ParseIncludes(module, builtIns, new Errors());

+        string errString = ParseIncludes(module, builtIns, fileNames, new Errors());

         if (errString != null) {

           return errString;

         }

@@ -84,8 +84,11 @@ namespace Microsoft.Dafny {
       }

     }

 

-    public static string ParseIncludes(ModuleDecl module, BuiltIns builtIns, Errors errs) {

+    public static string ParseIncludes(ModuleDecl module, BuiltIns builtIns, List<string> excludeFiles, Errors errs) {

       SortedSet<Include> includes = new SortedSet<Include>(new IncludeComparer());

+      foreach (string fileName in excludeFiles) {

+        includes.Add(new Include(null, fileName, Path.GetFullPath(fileName)));

+      }

       bool newlyIncluded;

       do {

         newlyIncluded = false;