Fix issue 125. Add the missing case 2 and 3 with refinement and opened imports.

For the following situation
 module LibA {
 // ...things declared here...
 }

 module LibB {
 // ...things declared here...
 }

 module R {
 import opened LibA
 // ...things declared here...
 }

 module S refines R {
 import opened LibB
 // ...declared here...
 }

 1. If module R declares a TopLevelDecl “G”, then we should report an error if S
 attempts to declare an incompatible TopLevelDecl “G”. Dafny does this already.

 2. If LibA declares a TopLevelDecl “G” but R does not directly declare any
 TopLevelDecl G”, then we should also issue an error for any TopLevelDecl “G”
 in S. This behavior is missing in Dafny.

 3. If each of LibA and LibB declares some TopLevelDecl “G”, but neither R nor S
 directly declares any TopLevelDecl “G”, then no error should be issued, and
 any use of “G” in S should resolve to the “G” in LibA. This behavior is missing
 in Dafny.

1 files changed, 11 insertions, 0 deletions

diff --git a/Source/Dafny/Resolver.cs b/Source/Dafny/Resolver.cs
index e47220d7..99b31923 100644
--- a/Source/Dafny/Resolver.cs
+++ b/Source/Dafny/Resolver.cs
@@ -1103,6 +1103,17 @@ namespace Microsoft.Dafny
           }

         }

       }

+

+      // second go through and overriding anything from the opened imports with the ones from the refinementBase

+      if (useImports && moduleDef.RefinementBaseSig != null) {

+        foreach (var kv in moduleDef.RefinementBaseSig.TopLevels) {

+          sig.TopLevels[kv.Key] = kv.Value;

+        }

+        foreach (var kv in moduleDef.RefinementBaseSig.StaticMembers) {

+          sig.StaticMembers[kv.Key] = kv.Value;

+        }

+      }

+

       // This is solely used to detect duplicates amongst the various e

       Dictionary<string, TopLevelDecl> toplevels = new Dictionary<string, TopLevelDecl>();

       // Now add the things present