@@ -73,7 +73,7 @@ toEnv interfaces environ (name,method)
7373addValue :: String -> Module.Interface -> Environment -> Var.Value
7474 -> Either [Doc] Environment
7575addValue name interface env value =
76− let insert' x = insert x (Var.Canonical (Var.Module name) x)
76+ let insert' x = Env.insert x (Var.Canonical (Var.Module name) x)
7777 msg x = "Import Error: Could not import value '" ++ name ++ "." ++ x ++
7878 "'.\n It is not exported by module " ++ name ++ "."
7979 notFound x = Left [ P.text (msg x) ]
@@ -88,7 +88,7 @@ addValue name interface env value =
8888 case Map.lookup x (iAliases interface) of
8989 Just (tvars, t) ->
9090 let v = (Var.Canonical (Var.Module name) x, tvars, t) in
91− return $ env { _aliases = insert x v (_aliases env) }
91+ return $ env { _aliases = Env.insert x v (_aliases env) }
9292 Nothing ->
9393 case Map.lookup x (iAdts interface) of
9494 Nothing -> notFound x
@@ -118,8 +118,8 @@ addValue name interface env value =
118118addDecl :: String -> Environment -> D.ValidDecl -> Either [Doc] Environment
119119addDecl moduleName env decl =
120120 let namespacedVar = Var.Canonical (Var.Module moduleName)
121− addLocal x e = insert x (Var.local x) e
122− addNamespaced x e = insert x (namespacedVar x) e
121+ addLocal x e = Env.insert x (Var.local x) e
122+ addNamespaced x e = Env.insert x (namespacedVar x) e
123123 in
124124 case decl of
125125 D.Definition (Valid.Definition pattern _ _) ->
@@ -138,7 +138,7 @@ addDecl moduleName env decl =
138138 D.TypeAlias name tvars alias ->
139139 do alias' <- Either.either throw return (Canonicalize.tipe env alias)
140140 return $ env
141− { _aliases = insert name (namespacedVar name, tvars, alias') (_aliases env)
141+ { _aliases = Env.insert name (namespacedVar name, tvars, alias') (_aliases env)
142142 , _values = case alias of
143143 Type.Record _ _ -> addLocal name (_values env)
144144 _ -> _values env