git.iko.soy/streamly
on master help sign in
Rename Toggle to Switch
e715edcRanjeet Kumar Ranjan
src/Streamly/Internal/FileSystem/Event/Darwin.hs+8−8
compare with master
unifiedsplit
@@ -92,7 +92,7 @@ module Streamly.Internal.FileSystem.Event.Darwin
92
92
93 -- ** Default configuration
93 -- ** Default configuration
94 Config (..)
94 Config (..)
95− , Toggle (..)
95+ , Switch (..)
96 , defaultConfig
96 , defaultConfig
97
97
98 -- ** Watch Behavior
98 -- ** Watch Behavior
@@ -247,9 +247,9 @@ setEventBatching batchInfo cfg =
247--
247--
248-- /Pre-release/
248-- /Pre-release/
249--
249--
250−data Toggle = On | Off
250+data Switch = On | Off
251
251
252−setFlag :: Word32 -> Toggle -> Config -> Config
252+setFlag :: Word32 -> Switch -> Config -> Config
253setFlag mask status cfg@Config{..} =
253setFlag mask status cfg@Config{..} =
254 let flags =
254 let flags =
255 case status of
255 case status of
@@ -279,7 +279,7 @@ foreign import ccall safe
279--
279--
280-- /Pre-release/
280-- /Pre-release/
281--
281--
282−setRootPathEvents :: Toggle -> Config -> Config
282+setRootPathEvents :: Switch -> Config -> Config
283setRootPathEvents = setFlag kFSEventStreamCreateFlagWatchRoot
283setRootPathEvents = setFlag kFSEventStreamCreateFlagWatchRoot
284
284
285foreign import ccall safe
285foreign import ccall safe
@@ -304,7 +304,7 @@ foreign import ccall safe
304--
304--
305-- /Pre-release/
305-- /Pre-release/
306--
306--
307−setFileEvents :: Toggle -> Config -> Config
307+setFileEvents :: Switch -> Config -> Config
308setFileEvents = setFlag kFSEventStreamCreateFlagFileEvents
308setFileEvents = setFlag kFSEventStreamCreateFlagFileEvents
309
309
310foreign import ccall safe
310foreign import ccall safe
@@ -320,7 +320,7 @@ foreign import ccall safe
320--
320--
321-- /Pre-release/
321-- /Pre-release/
322--
322--
323−setIgnoreSelf :: Toggle -> Config -> Config
323+setIgnoreSelf :: Switch -> Config -> Config
324setIgnoreSelf = setFlag kFSEventStreamCreateFlagIgnoreSelf
324setIgnoreSelf = setFlag kFSEventStreamCreateFlagIgnoreSelf
325
325
326#if HAVE_DECL_KFSEVENTSTREAMCREATEFLAGFULLHISTORY
326#if HAVE_DECL_KFSEVENTSTREAMCREATEFLAGFULLHISTORY
@@ -336,7 +336,7 @@ foreign import ccall safe
336--
336--
337-- /Pre-release/
337-- /Pre-release/
338--
338--
339−setFullHistory :: Toggle -> Config -> Config
339+setFullHistory :: Switch -> Config -> Config
340setFullHistory = setFlag kFSEventStreamCreateFlagFullHistory
340setFullHistory = setFlag kFSEventStreamCreateFlagFullHistory
341#endif
341#endif
342
342
@@ -347,7 +347,7 @@ setFullHistory = setFlag kFSEventStreamCreateFlagFullHistory
347--
347--
348-- /Pre-release/
348-- /Pre-release/
349--
349--
350−setAllEvents :: Toggle -> Config -> Config
350+setAllEvents :: Switch -> Config -> Config
351setAllEvents s =
351setAllEvents s =
352 setRootPathEvents s
352 setRootPathEvents s
353 . setFileEvents s
353 . setFileEvents s
src/Streamly/Internal/FileSystem/Event/Linux.hs+23−25
@@ -64,7 +64,7 @@ module Streamly.Internal.FileSystem.Event.Linux
64
64
65 -- ** Default configuration
65 -- ** Default configuration
66 Config (..)
66 Config (..)
67− , Toggle (..)
67+ , Switch (..)
68 , defaultConfig
68 , defaultConfig
69
69
70 -- ** Watch Behavior
70 -- ** Watch Behavior
@@ -215,19 +215,17 @@ data Config = Config
215-- Boolean settings
215-- Boolean settings
216-------------------------------------------------------------------------------
216-------------------------------------------------------------------------------
217
217
218−-- XXX Change Toggle to "OnOff" or "Switch". The name Toggle may be confusing.
219−--
220-- | Whether a setting is 'On' or 'Off'.
218-- | Whether a setting is 'On' or 'Off'.
221--
219--
222-- /Pre-release/
220-- /Pre-release/
223--
221--
224−data Toggle = On | Off deriving (Show, Eq)
222+data Switch = On | Off deriving (Show, Eq)
225
223
226−toggle :: Toggle -> Toggle
224+toggle :: Switch -> Switch
227toggle On = Off
225toggle On = Off
228toggle Off = On
226toggle Off = On
229
227
230−setFlag :: Word32 -> Toggle -> Config -> Config
228+setFlag :: Word32 -> Switch -> Config -> Config
231setFlag mask status cfg@Config{..} =
229setFlag mask status cfg@Config{..} =
232 let flags =
230 let flags =
233 case status of
231 case status of
@@ -246,7 +244,7 @@ setFlag mask status cfg@Config{..} =
246--
244--
247-- /Pre-release/
245-- /Pre-release/
248--
246--
249−setRecursiveMode :: Toggle -> Config -> Config
247+setRecursiveMode :: Switch -> Config -> Config
250setRecursiveMode rec cfg@Config{} = cfg {watchRec = rec == On}
248setRecursiveMode rec cfg@Config{} = cfg {watchRec = rec == On}
251
249
252foreign import capi
250foreign import capi
@@ -262,7 +260,7 @@ foreign import capi
262--
260--
263-- /Pre-release/
261-- /Pre-release/
264--
262--
265−setFollowSymLinks :: Toggle -> Config -> Config
263+setFollowSymLinks :: Switch -> Config -> Config
266setFollowSymLinks s = setFlag iN_DONT_FOLLOW (toggle s)
264setFollowSymLinks s = setFlag iN_DONT_FOLLOW (toggle s)
267
265
268foreign import capi
266foreign import capi
@@ -275,7 +273,7 @@ foreign import capi
275--
273--
276-- /Pre-release/
274-- /Pre-release/
277--
275--
278−setUnwatchMoved :: Toggle -> Config -> Config
276+setUnwatchMoved :: Switch -> Config -> Config
279setUnwatchMoved = setFlag iN_EXCL_UNLINK
277setUnwatchMoved = setFlag iN_EXCL_UNLINK
280
278
281#if HAVE_DECL_IN_MASK_CREATE
279#if HAVE_DECL_IN_MASK_CREATE
@@ -323,7 +321,7 @@ foreign import capi
323--
321--
324-- /Pre-release/
322-- /Pre-release/
325--
323--
326−setOneShot :: Toggle -> Config -> Config
324+setOneShot :: Switch -> Config -> Config
327setOneShot = setFlag iN_ONESHOT
325setOneShot = setFlag iN_ONESHOT
328
326
329foreign import capi
327foreign import capi
@@ -336,7 +334,7 @@ foreign import capi
336--
334--
337-- /Pre-release/
335-- /Pre-release/
338--
336--
339−setOnlyDir :: Toggle -> Config -> Config
337+setOnlyDir :: Switch -> Config -> Config
340setOnlyDir = setFlag iN_ONLYDIR
338setOnlyDir = setFlag iN_ONLYDIR
341
339
342-------------------------------------------------------------------------------
340-------------------------------------------------------------------------------
@@ -352,7 +350,7 @@ foreign import capi
352--
350--
353-- /Pre-release/
351-- /Pre-release/
354--
352--
355−setRootDeleted :: Toggle -> Config -> Config
353+setRootDeleted :: Switch -> Config -> Config
356setRootDeleted = setFlag iN_DELETE_SELF
354setRootDeleted = setFlag iN_DELETE_SELF
357
355
358foreign import capi
356foreign import capi
@@ -364,7 +362,7 @@ foreign import capi
364--
362--
365-- /Pre-release/
363-- /Pre-release/
366--
364--
367−setRootMoved :: Toggle -> Config -> Config
365+setRootMoved :: Switch -> Config -> Config
368setRootMoved = setFlag iN_MOVE_SELF
366setRootMoved = setFlag iN_MOVE_SELF
369
367
370-- | Report when the watched root path itself gets deleted or renamed.
368-- | Report when the watched root path itself gets deleted or renamed.
@@ -373,7 +371,7 @@ setRootMoved = setFlag iN_MOVE_SELF
373--
371--
374-- /Pre-release/
372-- /Pre-release/
375--
373--
376−setRootPathEvents :: Toggle -> Config -> Config
374+setRootPathEvents :: Switch -> Config -> Config
377setRootPathEvents = setFlag (iN_DELETE_SELF .|. iN_MOVE_SELF)
375setRootPathEvents = setFlag (iN_DELETE_SELF .|. iN_MOVE_SELF)
378
376
379foreign import capi
377foreign import capi
@@ -386,7 +384,7 @@ foreign import capi
386--
384--
387-- /Pre-release/
385-- /Pre-release/
388--
386--
389−setAttrsModified :: Toggle -> Config -> Config
387+setAttrsModified :: Switch -> Config -> Config
390setAttrsModified = setFlag iN_ATTRIB
388setAttrsModified = setFlag iN_ATTRIB
391
389
392foreign import capi
390foreign import capi
@@ -398,7 +396,7 @@ foreign import capi
398--
396--
399-- /Pre-release/
397-- /Pre-release/
400--
398--
401−setAccessed :: Toggle -> Config -> Config
399+setAccessed :: Switch -> Config -> Config
402setAccessed = setFlag iN_ACCESS
400setAccessed = setFlag iN_ACCESS
403
401
404foreign import capi
402foreign import capi
@@ -410,7 +408,7 @@ foreign import capi
410--
408--
411-- /Pre-release/
409-- /Pre-release/
412--
410--
413−setOpened :: Toggle -> Config -> Config
411+setOpened :: Switch -> Config -> Config
414setOpened = setFlag iN_OPEN
412setOpened = setFlag iN_OPEN
415
413
416foreign import capi
414foreign import capi
@@ -422,7 +420,7 @@ foreign import capi
422--
420--
423-- /Pre-release/
421-- /Pre-release/
424--
422--
425−setWriteClosed :: Toggle -> Config -> Config
423+setWriteClosed :: Switch -> Config -> Config
426setWriteClosed = setFlag iN_CLOSE_WRITE
424setWriteClosed = setFlag iN_CLOSE_WRITE
427
425
428foreign import capi
426foreign import capi
@@ -434,7 +432,7 @@ foreign import capi
434--
432--
435-- /Pre-release/
433-- /Pre-release/
436--
434--
437−setNonWriteClosed :: Toggle -> Config -> Config
435+setNonWriteClosed :: Switch -> Config -> Config
438setNonWriteClosed = setFlag iN_CLOSE_NOWRITE
436setNonWriteClosed = setFlag iN_CLOSE_NOWRITE
439
437
440foreign import capi
438foreign import capi
@@ -446,7 +444,7 @@ foreign import capi
446--
444--
447-- /Pre-release/
445-- /Pre-release/
448--
446--
449−setCreated :: Toggle -> Config -> Config
447+setCreated :: Switch -> Config -> Config
450setCreated = setFlag iN_CREATE
448setCreated = setFlag iN_CREATE
451
449
452foreign import capi
450foreign import capi
@@ -458,7 +456,7 @@ foreign import capi
458--
456--
459-- /Pre-release/
457-- /Pre-release/
460--
458--
461−setDeleted :: Toggle -> Config -> Config
459+setDeleted :: Switch -> Config -> Config
462setDeleted = setFlag iN_DELETE
460setDeleted = setFlag iN_DELETE
463
461
464foreign import capi
462foreign import capi
@@ -470,7 +468,7 @@ foreign import capi
470--
468--
471-- /Pre-release/
469-- /Pre-release/
472--
470--
473−setMovedFrom :: Toggle -> Config -> Config
471+setMovedFrom :: Switch -> Config -> Config
474setMovedFrom = setFlag iN_MOVED_FROM
472setMovedFrom = setFlag iN_MOVED_FROM
475
473
476foreign import capi
474foreign import capi
@@ -482,7 +480,7 @@ foreign import capi
482--
480--
483-- /Pre-release/
481-- /Pre-release/
484--
482--
485−setMovedTo :: Toggle -> Config -> Config
483+setMovedTo :: Switch -> Config -> Config
486setMovedTo = setFlag iN_MOVED_TO
484setMovedTo = setFlag iN_MOVED_TO
487
485
488foreign import capi
486foreign import capi
@@ -494,7 +492,7 @@ foreign import capi
494--
492--
495-- /Pre-release/
493-- /Pre-release/
496--
494--
497−setModified :: Toggle -> Config -> Config
495+setModified :: Switch -> Config -> Config
498setModified = setFlag iN_MODIFY
496setModified = setFlag iN_MODIFY
499
497
500-- | Set all tunable events 'On' or 'Off'. Equivalent to setting:
498-- | Set all tunable events 'On' or 'Off'. Equivalent to setting:
@@ -514,7 +512,7 @@ setModified = setFlag iN_MODIFY
514--
512--
515-- /Pre-release/
513-- /Pre-release/
516--
514--
517−setAllEvents :: Toggle -> Config -> Config
515+setAllEvents :: Switch -> Config -> Config
518setAllEvents s =
516setAllEvents s =
519 setRootDeleted s
517 setRootDeleted s
520 . setRootMoved s
518 . setRootMoved s
src/Streamly/Internal/FileSystem/Event/Windows.hs+11−11
@@ -48,7 +48,7 @@ module Streamly.Internal.FileSystem.Event.Windows
48
48
49 -- ** Default configuration
49 -- ** Default configuration
50 Config
50 Config
51− , Toggle (..)
51+ , Switch (..)
52 , defaultConfig
52 , defaultConfig
53
53
54 -- ** Watch Behavior
54 -- ** Watch Behavior
@@ -143,9 +143,9 @@ data Config = Config
143--
143--
144-- /Pre-release/
144-- /Pre-release/
145--
145--
146−data Toggle = On | Off deriving (Show, Eq)
146+data Switch = On | Off deriving (Show, Eq)
147
147
148−setFlag :: DWORD -> Toggle -> Config -> Config
148+setFlag :: DWORD -> Switch -> Config -> Config
149setFlag mask status cfg@Config{..} =
149setFlag mask status cfg@Config{..} =
150 let flags =
150 let flags =
151 case status of
151 case status of
@@ -159,7 +159,7 @@ setFlag mask status cfg@Config{..} =
159--
159--
160-- /Pre-release/
160-- /Pre-release/
161--
161--
162−setRecursiveMode :: Toggle -> Config -> Config
162+setRecursiveMode :: Switch -> Config -> Config
163setRecursiveMode rec cfg@Config{} = cfg {watchRec = rec == On}
163setRecursiveMode rec cfg@Config{} = cfg {watchRec = rec == On}
164
164
165-- | Generate notify events on file create, rename or delete.
165-- | Generate notify events on file create, rename or delete.
@@ -172,7 +172,7 @@ setRecursiveMode rec cfg@Config{} = cfg {watchRec = rec == On}
172--
172--
173-- /Pre-release/
173-- /Pre-release/
174--
174--
175−setFileNameEvents :: Toggle -> Config -> Config
175+setFileNameEvents :: Switch -> Config -> Config
176setFileNameEvents = setFlag fILE_NOTIFY_CHANGE_FILE_NAME
176setFileNameEvents = setFlag fILE_NOTIFY_CHANGE_FILE_NAME
177
177
178-- | Generate notify events on directory create, rename or delete.
178-- | Generate notify events on directory create, rename or delete.
@@ -185,7 +185,7 @@ setFileNameEvents = setFlag fILE_NOTIFY_CHANGE_FILE_NAME
185--
185--
186-- /Pre-release/
186-- /Pre-release/
187--
187--
188−setDirNameEvents :: Toggle -> Config -> Config
188+setDirNameEvents :: Switch -> Config -> Config
189setDirNameEvents = setFlag fILE_NOTIFY_CHANGE_DIR_NAME
189setDirNameEvents = setFlag fILE_NOTIFY_CHANGE_DIR_NAME
190
190
191-- | Generate an 'isModified' event on any attribute change in the watched
191-- | Generate an 'isModified' event on any attribute change in the watched
@@ -195,7 +195,7 @@ setDirNameEvents = setFlag fILE_NOTIFY_CHANGE_DIR_NAME
195--
195--
196-- /Pre-release/
196-- /Pre-release/
197--
197--
198−setAttrsModified :: Toggle -> Config -> Config
198+setAttrsModified :: Switch -> Config -> Config
199setAttrsModified = setFlag fILE_NOTIFY_CHANGE_ATTRIBUTES
199setAttrsModified = setFlag fILE_NOTIFY_CHANGE_ATTRIBUTES
200
200
201-- | Generate an 'isModified' event when the file size is changed.
201-- | Generate an 'isModified' event when the file size is changed.
@@ -210,7 +210,7 @@ setAttrsModified = setFlag fILE_NOTIFY_CHANGE_ATTRIBUTES
210--
210--
211-- /Pre-release/
211-- /Pre-release/
212--
212--
213−setSizeModified :: Toggle -> Config -> Config
213+setSizeModified :: Switch -> Config -> Config
214setSizeModified = setFlag fILE_NOTIFY_CHANGE_SIZE
214setSizeModified = setFlag fILE_NOTIFY_CHANGE_SIZE
215
215
216-- | Generate an 'isModified' event when the last write timestamp of the file
216-- | Generate an 'isModified' event when the last write timestamp of the file
@@ -227,7 +227,7 @@ setSizeModified = setFlag fILE_NOTIFY_CHANGE_SIZE
227--
227--
228-- /Pre-release/
228-- /Pre-release/
229--
229--
230−setLastWriteTimeModified :: Toggle -> Config -> Config
230+setLastWriteTimeModified :: Switch -> Config -> Config
231setLastWriteTimeModified = setFlag fILE_NOTIFY_CHANGE_LAST_WRITE
231setLastWriteTimeModified = setFlag fILE_NOTIFY_CHANGE_LAST_WRITE
232
232
233-- | Generate an 'isModified' event when any security-descriptor change occurs
233-- | Generate an 'isModified' event when any security-descriptor change occurs
@@ -237,7 +237,7 @@ setLastWriteTimeModified = setFlag fILE_NOTIFY_CHANGE_LAST_WRITE
237--
237--
238-- /Pre-release/
238-- /Pre-release/
239--
239--
240−setSecurityModified :: Toggle -> Config -> Config
240+setSecurityModified :: Switch -> Config -> Config
241setSecurityModified = setFlag fILE_NOTIFY_CHANGE_SECURITY
241setSecurityModified = setFlag fILE_NOTIFY_CHANGE_SECURITY
242
242
243-- | Set all tunable events 'On' or 'Off'. Equivalent to setting:
243-- | Set all tunable events 'On' or 'Off'. Equivalent to setting:
@@ -251,7 +251,7 @@ setSecurityModified = setFlag fILE_NOTIFY_CHANGE_SECURITY
251--
251--
252-- /Pre-release/
252-- /Pre-release/
253--
253--
254−setAllEvents :: Toggle -> Config -> Config
254+setAllEvents :: Switch -> Config -> Config
255setAllEvents s =
255setAllEvents s =
256 setFileNameEvents s
256 setFileNameEvents s
257 . setDirNameEvents s
257 . setDirNameEvents s