@@ -73,7 +73,7 @@ toEnv interfaces environ (name,method)
73addValue :: String -> Module.Interface -> Environment -> Var.Value
73addValue :: String -> Module.Interface -> Environment -> Var.Value
74 -> Either [Doc] Environment
74 -> Either [Doc] Environment
75addValue name interface env value =
75addValue 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)
77 msg x = "Import Error: Could not import value '" ++ name ++ "." ++ x ++
77 msg x = "Import Error: Could not import value '" ++ name ++ "." ++ x ++
78 "'.\n It is not exported by module " ++ name ++ "."
78 "'.\n It is not exported by module " ++ name ++ "."
79 notFound x = Left [ P.text (msg x) ]
79 notFound x = Left [ P.text (msg x) ]
@@ -88,7 +88,7 @@ addValue name interface env value =
88 case Map.lookup x (iAliases interface) of
88 case Map.lookup x (iAliases interface) of
89 Just (tvars, t) ->
89 Just (tvars, t) ->
90 let v = (Var.Canonical (Var.Module name) x, tvars, t) in
90 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) }
92 Nothing ->
92 Nothing ->
93 case Map.lookup x (iAdts interface) of
93 case Map.lookup x (iAdts interface) of
94 Nothing -> notFound x
94 Nothing -> notFound x
@@ -118,8 +118,8 @@ addValue name interface env value =
118addDecl :: String -> Environment -> D.ValidDecl -> Either [Doc] Environment
118addDecl :: String -> Environment -> D.ValidDecl -> Either [Doc] Environment
119addDecl moduleName env decl =
119addDecl moduleName env decl =
120 let namespacedVar = Var.Canonical (Var.Module moduleName)
120 let namespacedVar = Var.Canonical (Var.Module moduleName)
121− addLocal x e = insert x (Var.local x) e
121+ addLocal x e = Env.insert x (Var.local x) e
122− addNamespaced x e = insert x (namespacedVar x) e
122+ addNamespaced x e = Env.insert x (namespacedVar x) e
124 case decl of
124 case decl of
125 D.Definition (Valid.Definition pattern _ _) ->
125 D.Definition (Valid.Definition pattern _ _) ->
@@ -138,7 +138,7 @@ addDecl moduleName env decl =
138 D.TypeAlias name tvars alias ->
138 D.TypeAlias name tvars alias ->
139 do alias' <- Either.either throw return (Canonicalize.tipe env alias)
139 do alias' <- Either.either throw return (Canonicalize.tipe env alias)
140 return $ env
140 return $ env
141− { _aliases = insert name (namespacedVar name, tvars, alias') (_aliases env)
141+ { _aliases = Env.insert name (namespacedVar name, tvars, alias') (_aliases env)
142 , _values = case alias of
142 , _values = case alias of
143 Type.Record _ _ -> addLocal name (_values env)
143 Type.Record _ _ -> addLocal name (_values env)
144 _ -> _values env
144 _ -> _values env