improve submodule support for CLI cryptol_load

- This fix doesn't fully solve the problem.

Author: mtullsen

cryptol-saw-core/src/CryptolSAWCore/CryptolEnv.hs

@@ -586,7 +586,11 @@ updateFFITypes m env = env { eFFITypes = eFFITypes' }
 bindCryptolModule :: (P.ModName, CryptolModule) -> CryptolEnv -> CryptolEnv
 bindCryptolModule (modName, CryptolModule sm tm) env =
   env { eExtraNames = flip (foldr addName) (Map.keys tm') $
-                      flip (foldr addTSyn) (Map.keys sm) $ eExtraNames env
+                      flip (foldr addTSyn) (Map.keys sm) $
+                      flip (foldr addSubModule) (Map.keys tm') $
+                        -- FIXME: This added function doesn't really
+                        --        fix the submodule support bugs.
+                      eExtraNames env
       , eExtraTSyns = Map.union sm (eExtraTSyns env)
       , eExtraTypes = Map.union (fmap fst tm') (eExtraTypes env)
       , eTermEnv    = Map.union (fmap snd tm') (eTermEnv env)
@@ -599,6 +603,10 @@ bindCryptolModule (modName, CryptolModule sm tm) env =
           f _                                 = Nothing
 
     addName name = MN.shadowing (MN.singletonNS C.NSValue (P.mkQual modName (MN.nameIdent name)) name)
+    -- FIXME: suspicious. (we need to do any C.NSModule?)
+
+    addSubModule name = MN.shadowing (MN.singletonNS C.NSModule (P.mkQual modName (MN.nameIdent name)) name)
+
     addTSyn name = MN.shadowing (MN.singletonNS C.NSType (P.mkQual modName (MN.nameIdent name)) name)
 
 -- | NOTE: this is only used in the "cryptol_extract" primitive.