@@ -15,6 +15,7 @@
15module Language.PureScript.AST.Traversals where
15module Language.PureScript.AST.Traversals where
17import Data.Monoid (Monoid(..), mconcat)
17import Data.Monoid (Monoid(..), mconcat)
18+import Data.Maybe (mapMaybe)
19import Control.Applicative
20import Control.Applicative
20import Control.Monad
21import Control.Monad
@@ -50,6 +51,7 @@ everywhereOnValues f g h = (f', g', h')
50 g' (TypeClassDictionaryConstructorApp name v) = g (TypeClassDictionaryConstructorApp name (g' v))
51 g' (TypeClassDictionaryConstructorApp name v) = g (TypeClassDictionaryConstructorApp name (g' v))
51 g' (Accessor prop v) = g (Accessor prop (g' v))
52 g' (Accessor prop v) = g (Accessor prop (g' v))
52 g' (ObjectUpdate obj vs) = g (ObjectUpdate (g' obj) (map (fmap g') vs))
53 g' (ObjectUpdate obj vs) = g (ObjectUpdate (g' obj) (map (fmap g') vs))
54+ g' (ObjectUpdater obj vs) = g (ObjectUpdater (g' obj) (map (second (fmap g')) vs))
53 g' (Abs name v) = g (Abs name (g' v))
55 g' (Abs name v) = g (Abs name (g' v))
54 g' (App v1 v2) = g (App (g' v1) (g' v2))
56 g' (App v1 v2) = g (App (g' v1) (g' v2))
55 g' (IfThenElse v1 v2 v3) = g (IfThenElse (g' v1) (g' v2) (g' v3))
57 g' (IfThenElse v1 v2 v3) = g (IfThenElse (g' v1) (g' v2) (g' v3))
@@ -102,9 +104,11 @@ everywhereOnValuesTopDownM f g h = (f' <=< f, g' <=< g, h' <=< h)
102 g' (Parens v) = Parens <$> (g v >>= g')
104 g' (Parens v) = Parens <$> (g v >>= g')
103 g' (ArrayLiteral vs) = ArrayLiteral <$> mapM (g' <=< g) vs
105 g' (ArrayLiteral vs) = ArrayLiteral <$> mapM (g' <=< g) vs
104 g' (ObjectLiteral vs) = ObjectLiteral <$> mapM (sndM (g' <=< g)) vs
106 g' (ObjectLiteral vs) = ObjectLiteral <$> mapM (sndM (g' <=< g)) vs
107+ g' (ObjectConstructor vs) = ObjectConstructor <$> mapM (sndM $ maybeM (g' <=< g)) vs
105 g' (TypeClassDictionaryConstructorApp name v) = TypeClassDictionaryConstructorApp name <$> (g v >>= g')
108 g' (TypeClassDictionaryConstructorApp name v) = TypeClassDictionaryConstructorApp name <$> (g v >>= g')
106 g' (Accessor prop v) = Accessor prop <$> (g v >>= g')
109 g' (Accessor prop v) = Accessor prop <$> (g v >>= g')
107 g' (ObjectUpdate obj vs) = ObjectUpdate <$> (g obj >>= g') <*> mapM (sndM (g' <=< g)) vs
110 g' (ObjectUpdate obj vs) = ObjectUpdate <$> (g obj >>= g') <*> mapM (sndM (g' <=< g)) vs
111+ g' (ObjectUpdater obj vs) = ObjectUpdater <$> (g obj >>= g') <*> mapM (sndM $ maybeM (g' <=< g)) vs
108 g' (Abs name v) = Abs name <$> (g v >>= g')
112 g' (Abs name v) = Abs name <$> (g v >>= g')
109 g' (App v1 v2) = App <$> (g v1 >>= g') <*> (g v2 >>= g')
113 g' (App v1 v2) = App <$> (g v1 >>= g') <*> (g v2 >>= g')
110 g' (IfThenElse v1 v2 v3) = IfThenElse <$> (g v1 >>= g') <*> (g v2 >>= g') <*> (g v3 >>= g')
114 g' (IfThenElse v1 v2 v3) = IfThenElse <$> (g v1 >>= g') <*> (g v2 >>= g') <*> (g v3 >>= g')
@@ -151,9 +155,11 @@ everywhereOnValuesM f g h = (f', g', h')
151 g' (Parens v) = (Parens <$> g' v) >>= g
155 g' (Parens v) = (Parens <$> g' v) >>= g
152 g' (ArrayLiteral vs) = (ArrayLiteral <$> mapM g' vs) >>= g
156 g' (ArrayLiteral vs) = (ArrayLiteral <$> mapM g' vs) >>= g
153 g' (ObjectLiteral vs) = (ObjectLiteral <$> mapM (sndM g') vs) >>= g
157 g' (ObjectLiteral vs) = (ObjectLiteral <$> mapM (sndM g') vs) >>= g
158+ g' (ObjectConstructor vs) = (ObjectConstructor <$> mapM (sndM $ maybeM g') vs) >>= g
154 g' (TypeClassDictionaryConstructorApp name v) = (TypeClassDictionaryConstructorApp name <$> g' v) >>= g
159 g' (TypeClassDictionaryConstructorApp name v) = (TypeClassDictionaryConstructorApp name <$> g' v) >>= g
155 g' (Accessor prop v) = (Accessor prop <$> g' v) >>= g
160 g' (Accessor prop v) = (Accessor prop <$> g' v) >>= g
156 g' (ObjectUpdate obj vs) = (ObjectUpdate <$> g' obj <*> mapM (sndM g') vs) >>= g
161 g' (ObjectUpdate obj vs) = (ObjectUpdate <$> g' obj <*> mapM (sndM g') vs) >>= g
162+ g' (ObjectUpdater obj vs) = (ObjectUpdater <$> g' obj <*> mapM (sndM $ maybeM g') vs) >>= g
157 g' (Abs name v) = (Abs name <$> g' v) >>= g
163 g' (Abs name v) = (Abs name <$> g' v) >>= g
158 g' (App v1 v2) = (App <$> g' v1 <*> g' v2) >>= g
164 g' (App v1 v2) = (App <$> g' v1 <*> g' v2) >>= g
159 g' (IfThenElse v1 v2 v3) = (IfThenElse <$> g' v1 <*> g' v2 <*> g' v3) >>= g
165 g' (IfThenElse v1 v2 v3) = (IfThenElse <$> g' v1 <*> g' v2 <*> g' v3) >>= g
@@ -203,9 +209,11 @@ everythingOnValues (<>) f g h i j = (f', g', h', i', j')
203 g' v@(Parens v1) = g v <> g' v1
209 g' v@(Parens v1) = g v <> g' v1
204 g' v@(ArrayLiteral vs) = foldl (<>) (g v) (map g' vs)
210 g' v@(ArrayLiteral vs) = foldl (<>) (g v) (map g' vs)
205 g' v@(ObjectLiteral vs) = foldl (<>) (g v) (map (g' . snd) vs)
211 g' v@(ObjectLiteral vs) = foldl (<>) (g v) (map (g' . snd) vs)
212+ g' v@(ObjectConstructor vs) = foldl (<>) (g v) (map g' (mapMaybe snd vs))
206 g' v@(TypeClassDictionaryConstructorApp _ v1) = g v <> g' v1
213 g' v@(TypeClassDictionaryConstructorApp _ v1) = g v <> g' v1
207 g' v@(Accessor _ v1) = g v <> g' v1
214 g' v@(Accessor _ v1) = g v <> g' v1
208 g' v@(ObjectUpdate obj vs) = foldl (<>) (g v <> g' obj) (map (g' . snd) vs)
215 g' v@(ObjectUpdate obj vs) = foldl (<>) (g v <> g' obj) (map (g' . snd) vs)
216+ g' v@(ObjectUpdater obj vs) = foldl (<>) (g v <> g' obj) (map g' (mapMaybe snd vs))
209 g' v@(Abs _ v1) = g v <> g' v1
217 g' v@(Abs _ v1) = g v <> g' v1
210 g' v@(App v1 v2) = g v <> g' v1 <> g' v2
218 g' v@(App v1 v2) = g v <> g' v1 <> g' v2
211 g' v@(IfThenElse v1 v2 v3) = g v <> g' v1 <> g' v2 <> g' v3
219 g' v@(IfThenElse v1 v2 v3) = g v <> g' v1 <> g' v2 <> g' v3
@@ -266,9 +274,11 @@ everythingWithContextOnValues s0 r0 (<>) f g h i j = (f'' s0, g'' s0, h'' s0, i'
266 g' s (Parens v1) = g'' s v1
274 g' s (Parens v1) = g'' s v1
267 g' s (ArrayLiteral vs) = foldl (<>) r0 (map (g'' s) vs)
275 g' s (ArrayLiteral vs) = foldl (<>) r0 (map (g'' s) vs)
268 g' s (ObjectLiteral vs) = foldl (<>) r0 (map (g'' s . snd) vs)
276 g' s (ObjectLiteral vs) = foldl (<>) r0 (map (g'' s . snd) vs)
277+ g' s (ObjectConstructor vs) = foldl (<>) r0 (map (g'' s) (mapMaybe snd vs))
269 g' s (TypeClassDictionaryConstructorApp _ v1) = g'' s v1
278 g' s (TypeClassDictionaryConstructorApp _ v1) = g'' s v1
270 g' s (Accessor _ v1) = g'' s v1
279 g' s (Accessor _ v1) = g'' s v1
271 g' s (ObjectUpdate obj vs) = foldl (<>) (g'' s obj) (map (g'' s . snd) vs)
280 g' s (ObjectUpdate obj vs) = foldl (<>) (g'' s obj) (map (g'' s . snd) vs)
281+ g' s (ObjectUpdater obj vs) = foldl (<>) (g'' s obj) (map (g'' s) (mapMaybe snd vs))
272 g' s (Abs _ v1) = g'' s v1
282 g' s (Abs _ v1) = g'' s v1
273 g' s (App v1 v2) = g'' s v1 <> g'' s v2
283 g' s (App v1 v2) = g'' s v1 <> g'' s v2
274 g' s (IfThenElse v1 v2 v3) = g'' s v1 <> g'' s v2 <> g'' s v3
284 g' s (IfThenElse v1 v2 v3) = g'' s v1 <> g'' s v2 <> g'' s v3
@@ -332,9 +342,11 @@ everywhereWithContextOnValuesM s0 f g h i j = (f'' s0, g'' s0, h'' s0, i'' s0, j
332 g' s (Parens v) = Parens <$> g'' s v
342 g' s (Parens v) = Parens <$> g'' s v
333 g' s (ArrayLiteral vs) = ArrayLiteral <$> mapM (g'' s) vs
343 g' s (ArrayLiteral vs) = ArrayLiteral <$> mapM (g'' s) vs
334 g' s (ObjectLiteral vs) = ObjectLiteral <$> mapM (sndM (g'' s)) vs
344 g' s (ObjectLiteral vs) = ObjectLiteral <$> mapM (sndM (g'' s)) vs
345+ g' s (ObjectConstructor vs) = ObjectConstructor <$> mapM (sndM $ maybeM (g'' s)) vs
335 g' s (TypeClassDictionaryConstructorApp name v) = TypeClassDictionaryConstructorApp name <$> g'' s v
346 g' s (TypeClassDictionaryConstructorApp name v) = TypeClassDictionaryConstructorApp name <$> g'' s v
336 g' s (Accessor prop v) = Accessor prop <$> g'' s v
347 g' s (Accessor prop v) = Accessor prop <$> g'' s v
337 g' s (ObjectUpdate obj vs) = ObjectUpdate <$> g'' s obj <*> mapM (sndM (g'' s)) vs
348 g' s (ObjectUpdate obj vs) = ObjectUpdate <$> g'' s obj <*> mapM (sndM (g'' s)) vs
349+ g' s (ObjectUpdater obj vs) = ObjectUpdater <$> g'' s obj <*> mapM (sndM $ maybeM (g'' s)) vs
338 g' s (Abs name v) = Abs name <$> g'' s v
350 g' s (Abs name v) = Abs name <$> g'' s v
339 g' s (App v1 v2) = App <$> g'' s v1 <*> g'' s v2
351 g' s (App v1 v2) = App <$> g'' s v1 <*> g'' s v2
340 g' s (IfThenElse v1 v2 v3) = IfThenElse <$> g'' s v1 <*> g'' s v2 <*> g'' s v3
352 g' s (IfThenElse v1 v2 v3) = IfThenElse <$> g'' s v1 <*> g'' s v2 <*> g'' s v3