Merge pull request #1698 from GaloisInc/issue_1691_2

Make fixes for 1691 work with more nested modules.

src/Cryptol/ModuleSystem/Renamer/ImplicitImports.hs

@@ -76,7 +76,13 @@ processModule dcl =
                  Private -> []
              )
 
-        FunctorInstance {} -> ([dcl, mkImp loc [mname]], [])
+        FunctorInstance {} ->
+          let imps = [[mname]]
+          in ( dcl : map (mkImp loc) imps
+             , case tlExport m of
+                 Public  -> imps
+                 Private -> []
+             )
         InterfaceModule {} -> ([dcl], [])
     _ -> panic "processModule" ["Not a module"]
 

tests/issues/issue_1691_2.cry

@@ -0,0 +1,12 @@
+
+
+submodule F where
+  parameter x: Integer
+  y = x + 1
+
+submodule B = submodule F where x = 2
+
+submodule M where
+  submodule A where
+    a = 2
+  submodule B = submodule F where x = 2

tests/issues/issue_1691_2.icry

@@ -0,0 +1,2 @@
+:load issue_1691_2.cry
+:t M::B::y

tests/issues/issue_1691_2.icry.stdout

@@ -0,0 +1,4 @@
+Loading module Cryptol
+Loading module Cryptol
+Loading module Main
+M::B::y : Integer