@@ -107,8 +107,11 @@ swap =
107107fromStream :: Property
108108fromStream =
109109 property
110− $ \n ->
111− testUnfoldD UF.fromStream (S.fromList n :: SerialT Identity Int) n
110+ $ \list ->
111+ testUnfoldD
112+ UF.fromStream
113+ (S.fromList list :: SerialT Identity Int)
114+ list
112115
113116fromStreamD :: Property
114117fromStreamD =
@@ -161,9 +164,9 @@ unfoldrM =
161164fromListM :: Property
162165fromListM =
163166 property
164− $ \n ->
165− let lst = Prelude.map (\x -> modify (+ 1) >> return x) n
166− in testUnfoldMD UF.fromListM lst 0 (length n) n
167+ $ \list ->
168+ let listM = Prelude.map (\x -> modify (+ 1) >> return x) list
169+ in testUnfoldMD UF.fromListM listM 0 (length list) list
167170
168171replicateM :: Property
169172replicateM =
@@ -266,49 +269,49 @@ take =
266269takeWhileM :: Property
267270takeWhileM =
268271 property
269− $ \f n ->
272+ $ \f list ->
270273 let fM x =
271274 if apply f x
272275 then modify (+ 1) >> return True
273276 else return False
274277 unf = UF.takeWhileM fM UF.fromList
275− fL = Prelude.takeWhile (apply f) n
278+ fL = Prelude.takeWhile (apply f) list
276279 fS = Prelude.length fL
277− in testUnfoldMD unf n 0 fS fL
280+ in testUnfoldMD unf list 0 fS fL
278281
279282filterM :: Property
280283filterM =
281284 property
282− $ \f n ->
285+ $ \f list ->
283286 let fM x =
284287 if apply f x
285288 then modify (+ 1) >> return True
286289 else return False
287290 unf = UF.filterM fM UF.fromList
288− fL = Prelude.filter (apply f) n
291+ fL = Prelude.filter (apply f) list
289292 fS = Prelude.length fL
290− in testUnfoldMD unf n 0 fS fL
293+ in testUnfoldMD unf list 0 fS fL
291294
292295drop :: Property
293296drop =
294297 property
295− $ \i n ->
298+ $ \i list ->
296299 let unf = UF.drop i UF.fromList
297− fL = Prelude.drop i n
298− in testUnfoldD unf n fL
300+ fL = Prelude.drop i list
301+ in testUnfoldD unf list fL
299302
300303dropWhileM :: Property
301304dropWhileM =
302305 property
303− $ \f n ->
306+ $ \f list ->
304307 let fM x =
305308 if apply f x
306309 then modify (+ 1) >> return True
307310 else return False
308311 unf = UF.dropWhileM fM UF.fromList
309− fL = Prelude.dropWhile (apply f) n
310− fS = Prelude.length n - Prelude.length fL
311− in testUnfoldMD unf n 0 fS fL
312+ fL = Prelude.dropWhile (apply f) list
313+ fS = Prelude.length list - Prelude.length fL
314+ in testUnfoldMD unf list 0 fS fL
312315
313316-------------------------------------------------------------------------------
314317-- Stream combination