Skip to content

Commit

Permalink
Consider proc as a pointer type in options (#13460)
Browse files Browse the repository at this point in the history
* Consider proc as a pointer type in options

* Add version annotation for SomePointer having proc in options

* Log procs as pointers for options in changelog
  • Loading branch information
metagn authored Feb 21, 2020
1 parent 0d219d2 commit 1276e38
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
2 changes: 2 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
It didn't work well together with the existing inplace version of the same proc
(`tables.merge(var CountTable, CountTable)`).
It was an oversight to be included in v1.0.
- `options` now treats `proc` like other pointer types, meaning `nil` proc variables
are converted to `None`.


### Breaking changes in the compiler
Expand Down
15 changes: 12 additions & 3 deletions lib/pure/options.nim
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@

import typetraits

type
SomePointer = ref | ptr | pointer
when (NimMajor, NimMinor) >= (1, 1):
type
SomePointer = ref | ptr | pointer | proc
else:
type
SomePointer = ref | ptr | pointer

type
Option*[T] = object
Expand All @@ -74,7 +78,7 @@ type


proc option*[T](val: T): Option[T] =
## Can be used to convert a pointer type (`ptr` or `ref`) to an option type.
## Can be used to convert a pointer type (`ptr` or `ref` or `proc`) to an option type.
## It converts `nil` to `None`.
##
## See also:
Expand Down Expand Up @@ -482,6 +486,11 @@ when isMainModule:

let tmp = option(intref)
check(sizeof(tmp) == sizeof(ptr int))

var prc = proc (x: int): int = x + 1
check(option(prc).isSome)
prc = nil
check(option(prc).isNone)

test "none[T]":
check(none[int]().isNone)
Expand Down

0 comments on commit 1276e38

Please sign in to comment.