@@ -29,8 +29,20 @@ infer interfaces modul = unsafePerformIO $ do
2929 do (_, vars, tipe) <- Env.freshDataScheme env name
3030 return (name, (vars, tipe))
3131
32+ let combine name importMethod interface =
33+ let tipes = iTypes interface in
34+ case importMethod of
35+ As alias -> Map.mapKeys (\v -> alias ++ "." ++ v) tipes
36+ Hiding hidens -> foldr Map.delete tipes hidens
37+ Importing visibles ->
38+ Map.intersection tipes (Map.fromList [ (v,()) | v <- visibles ])
39+
40+ locals = Map.intersectionWithKey combine (Map.fromList (imports modul)) interfaces
41+
42+ mapM print (imports modul)
43+
3244 importedVars <-
33− forM (concatMap (Map.toList . iTypes) $ Map.elems interfaces) $ \(name,tipe) ->
45+ forM (concatMap Map.toList $ Map.elems locals) $ \(name,tipe) ->
3446 (,) name `fmap` Env.instantiateTypeWithContext env tipe Map.empty
3547
3648 let allTypes = ctors ++ importedVars