summary refs log tree commit diff stats
path: root/lib/pure
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pure')
-rw-r--r--lib/pure/options.nim81
1 files changed, 57 insertions, 24 deletions
diff --git a/lib/pure/options.nim b/lib/pure/options.nim
index 2abb80016..ad63bbcb6 100644
--- a/lib/pure/options.nim
+++ b/lib/pure/options.nim
@@ -15,7 +15,7 @@
 ## A value of type ``Option[T]`` either contains a value `x` (represented as
 ## ``some(x)``) or is empty (``none(T)``).
 ##
-## This can be useful when you have a value that can be present or not.  The
+## This can be useful when you have a value that can be present or not. The
 ## absence of a value is often represented by ``nil``, but it is not always
 ## available, nor is it always a good solution.
 ##
@@ -67,10 +67,8 @@
 ##     assert(false)  # This will not be reached
 ##   except UnpackError:  # Because an exception is raised
 ##     discard
-
 import typetraits
 
-
 type
   Option*[T] = object
     ## An optional type that stores its value and state separately in a boolean.
@@ -78,7 +76,6 @@ type
     has: bool
   UnpackError* = ref object of ValueError
 
-
 proc some*[T](val: T): Option[T] =
   ## Returns a ``Option`` that has this value.
   result.has = true
@@ -88,14 +85,12 @@ proc none*(T: typedesc): Option[T] =
   ## Returns a ``Option`` for this type that has no value.
   result.has = false
 
-
 proc isSome*[T](self: Option[T]): bool =
   self.has
 
 proc isNone*[T](self: Option[T]): bool =
   not self.has
 
-
 proc unsafeGet*[T](self: Option[T]): T =
   ## Returns the value of a ``some``. Behavior is undefined for ``none``.
   assert self.isSome
@@ -110,12 +105,11 @@ proc get*[T](self: Option[T]): T =
 
 proc get*[T](self: Option[T], otherwise: T): T =
   ## Returns the contents of this option or `otherwise` if the option is none.
-  if self.isSome:
+  if self.has:
     self.val
   else:
     otherwise
 
-
 proc map*[T](self: Option[T], callback: proc (input: T)) =
   ## Applies a callback to the value in this Option
   if self.has:
@@ -123,12 +117,27 @@ proc map*[T](self: Option[T], callback: proc (input: T)) =
 
 proc map*[T, R](self: Option[T], callback: proc (input: T): R): Option[R] =
   ## Applies a callback to the value in this Option and returns an option
-  ## containing the new value. If this option is None, None will be returned
+  ## containing the new value. If this option is None, None will be returned.
   if self.has:
-    some[R]( callback(self.val) )
+    some[R](callback(self.val))
   else:
     none(R)
 
+proc flatten*[A](self: Option[Option[A]]): Option[A] =
+  ## Remove one level of structure in a nested Option.
+  if self.has:
+    self.val
+  else:
+    none(A)
+
+proc flatMap*[A, B](self: Option[A], callback: proc (input: A): Option[B]): Option[B] =
+  ## Applies a callback to the value in this Option and returns an
+  ## option containing the new value. If this option is None, None will be
+  ## returned. Similar to ``map``, with the difference that the callback
+  ## returns an Option, not a raw value. This allows multiple procs with a
+  ## signature of ``A -> Option[B]`` (including A = B) to be chained together.
+  map(self, callback).flatten()
+
 proc filter*[T](self: Option[T], callback: proc (input: T): bool): Option[T] =
   ## Applies a callback to the value in this Option. If the callback returns
   ## `true`, the option is returned as a Some. If it returns false, it is
@@ -138,21 +147,18 @@ proc filter*[T](self: Option[T], callback: proc (input: T): bool): Option[T] =
   else:
     self
 
-
 proc `==`*(a, b: Option): bool =
   ## Returns ``true`` if both ``Option``s are ``none``,
   ## or if they have equal values
   (a.has and b.has and a.val == b.val) or (not a.has and not b.has)
 
-
-proc `$`*[T]( self: Option[T] ): string =
+proc `$`*[T](self: Option[T]): string =
   ## Returns the contents of this option or `otherwise` if the option is none.
   if self.has:
     "Some(" & $self.val & ")"
   else:
     "None[" & T.name & "]"
 
-
 when isMainModule:
   import unittest, sequtils
 
@@ -198,12 +204,12 @@ when isMainModule:
         check false
 
     test "get with a default value":
-      check( some("Correct").get("Wrong") == "Correct" )
-      check( stringNone.get("Correct") == "Correct" )
+      check(some("Correct").get("Wrong") == "Correct")
+      check(stringNone.get("Correct") == "Correct")
 
     test "$":
-      check( $(some("Correct")) == "Some(Correct)" )
-      check( $(stringNone) == "None[string]" )
+      check($(some("Correct")) == "Some(Correct)")
+      check($(stringNone) == "None[string]")
 
     test "map with a void result":
       var procRan = 0
@@ -212,11 +218,38 @@ when isMainModule:
       intNone.map(proc (v: int) = check false)
 
     test "map":
-      check( some(123).map(proc (v: int): int = v * 2) == some(246) )
-      check( intNone.map(proc (v: int): int = v * 2).isNone )
+      check(some(123).map(proc (v: int): int = v * 2) == some(246))
+      check(intNone.map(proc (v: int): int = v * 2).isNone)
 
     test "filter":
-      check( some(123).filter(proc (v: int): bool = v == 123) == some(123) )
-      check( some(456).filter(proc (v: int): bool = v == 123).isNone )
-      check( intNone.filter(proc (v: int): bool = check false).isNone )
-
+      check(some(123).filter(proc (v: int): bool = v == 123) == some(123))
+      check(some(456).filter(proc (v: int): bool = v == 123).isNone)
+      check(intNone.filter(proc (v: int): bool = check false).isNone)
+
+    test "flatMap":
+      proc addOneIfNotZero(v: int): Option[int] =
+        if v != 0:
+          result = some(v + 1)
+        else:
+          result = none(int)
+
+      check(some(1).flatMap(addOneIfNotZero) == some(2))
+      check(some(0).flatMap(addOneIfNotZero) == none(int))
+      check(some(1).flatMap(addOneIfNotZero).flatMap(addOneIfNotZero) == some(3))
+
+      proc maybeToString(v: int): Option[string] =
+        if v != 0:
+          result = some($v)
+        else:
+          result = none(string)
+
+      check(some(1).flatMap(maybeToString) == some("1"))
+
+      proc maybeExclaim(v: string): Option[string] =
+        if v != "":
+          result = some v & "!"
+        else:
+          result = none(string)
+
+      check(some(1).flatMap(maybeToString).flatMap(maybeExclaim) == some("1!"))
+      check(some(0).flatMap(maybeToString).flatMap(maybeExclaim) == none(string))
h=devel&id=623fd8a8abcc0e192cd5e5dd4e1e54b57c39ccf1'>623fd8a8a ^
b9079b871 ^
5d63ecb3a ^

e6f3f46cd ^


eebee0eff ^
5d63ecb3a ^
49471440e ^

e01e0a4b4 ^
e52044660 ^
eebee0eff ^
3d1c6de63 ^
78f371c03 ^




e25474154 ^

72651de71 ^
3d1c6de63 ^


72651de71 ^
93fa75bb0 ^
72651de71 ^

2df9b442c ^
5d63ecb3a ^
594674797 ^
e25474154 ^
2df9b442c ^


c921f30b1 ^
5b2f54ffa ^
2df9b442c ^
72651de71 ^
1786e3099 ^
e25474154 ^
043921c7a ^

72651de71 ^
8d99753d6 ^
eebee0eff ^
7a4894271 ^
edab4aaad ^
3051c52f5 ^
8d99753d6 ^
121519301 ^

42d0911d6 ^
9dd753f21 ^
a158053ae ^

594674797 ^
804e2ac89 ^
a0a8934a4 ^
594674797 ^
c7158af75 ^
55f8ed245 ^

9de3bc8ef ^
40baebebf ^
78f371c03 ^

1afdefcbe ^
38dee2095 ^
5d63ecb3a ^
e6f3f46cd ^



36e25a684 ^



36e25a684 ^
7063670a2 ^
e25474154 ^

e25474154 ^


e25474154 ^

72651de71 ^
14b5d5f26 ^



7063670a2 ^
e25474154 ^
2df9b442c ^

e25474154 ^

1c6f14dee ^
e25474154 ^
5d63ecb3a ^
e25474154 ^






5d63ecb3a ^
7063670a2 ^
e25474154 ^
5d63ecb3a ^
7063670a2 ^
92b8fac94 ^
2df9b442c ^
e25474154 ^
5d63ecb3a ^
e25474154 ^

623fd8a8a ^
e25474154 ^
5d63ecb3a ^
e25474154 ^





36e25a684 ^
e25474154 ^
b731e6ef1 ^
e25474154 ^



93fa75bb0 ^
5b28d0820 ^
1786e3099 ^
ade67f1ab ^
804e2ac89 ^
55f8ed245 ^
b731e6ef1 ^
38dee2095 ^

e25474154 ^
1786e3099 ^

5d63ecb3a ^

92b8fac94 ^
1786e3099 ^






e25474154 ^
5d63ecb3a ^
e25474154 ^

5d63ecb3a ^
43de61f37 ^


e25474154 ^

5d63ecb3a ^
e25474154 ^
438703f59 ^
e25474154 ^
bcd8053b2 ^





22dc76a36 ^


438703f59 ^
e25474154 ^
6378fbd66 ^




789ba107c ^

247af96b0 ^
789ba107c ^

1ffae7cba ^









1d02f2ea5 ^


72291875b ^

71695ab79 ^
e55f5d1fd ^
1d02f2ea5 ^



72291875b ^

71695ab79 ^
e55f5d1fd ^
1d02f2ea5 ^



72291875b ^
71695ab79 ^
e55f5d1fd ^
1d02f2ea5 ^
4b7655fd1 ^






c58ec376b ^
4b7655fd1 ^







b21b72dc1 ^
4b7655fd1 ^



72291875b ^
e25474154 ^

b595fc834 ^

79aaf213d ^
b595fc834 ^
c7158af75 ^



5d63ecb3a ^
e25474154 ^



92b8fac94 ^
8682ed9bd ^
7063670a2 ^
8682ed9bd ^

e25474154 ^

8682ed9bd ^
d10b524c9 ^
c7158af75 ^
c1627354d ^
4fbba0a65 ^


03764f0ab ^
2df9b442c ^
5b28d0820 ^
fe30ec83e ^


5d63ecb3a ^
5b28d0820 ^
5d63ecb3a ^

5b28d0820 ^
9fb36bd20 ^
5d63ecb3a ^
4b7de4dc5 ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332