@@ -12,8 +12,8 @@ import qualified AST.Expression.Canonical as Canonical
1212import qualified AST.Literal as Literal
1313import qualified AST.Pattern as P
1414import qualified AST.Variable as Var
15+import qualified Generate.Substitute as S
1516import qualified Reporting.Annotation as A
16−import Transform.Substitute (subst)
1717
1818
1919-- MATCHES
@@ -62,7 +62,7 @@ matchSubst pairs match =
6262 Seq (map (matchSubst pairs) ms)
6363
6464 Other (A.A a e) ->
65− Other . A.A a $ foldr ($) e $ map (\(x,y) -> subst x (Expr.localVar y)) pairs
65+ Other . A.A a $ foldr ($) e $ map (\(x,y) -> S.subst x (Expr.localVar y)) pairs
6666
6767 Match n cs m ->
6868 Match (varSubst n) (map clauseSubst cs) (matchSubst pairs m)
@@ -103,7 +103,7 @@ dealias var branch@(p:ps, A.A ann e) =
103103 case p of
104104 A.A _ (P.Alias alias pattern) ->
105105 ( pattern:ps
106− , A.A ann (subst alias (Expr.localVar var) e)
106+ , A.A ann (S.subst alias (Expr.localVar var) e)
107107 )
108108
109109 _ ->
@@ -143,12 +143,12 @@ matchVar (var:vars) branches match =
143143 expr
144144
145145 P.Var x ->
146− subst x (Expr.localVar var) expr
146+ S.subst x (Expr.localVar var) expr
147147
148148 P.Record fields ->
149149 let access = Expr.Access (A.A ann (Expr.localVar var))
150150 in
151− foldr (\x -> subst x (access x)) expr fields
151+ foldr (\x -> S.subst x (access x)) expr fields
152152
153153 _ ->
154154 noMatch "matchVar.subVar"