Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement std/wrapnils without using experimental:dotOperators #16996

Merged
merged 1 commit into from
Feb 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ with other backends. see #9125. Use `-d:nimLegacyJsRound` for previous behavior.

- Added experimental `linenoise.readLineStatus` to get line and status (e.g. ctrl-D or ctrl-C).

- `std/wrapnils` doesn't use `experimental:dotOperators` anymore, avoiding
issues like https://github.com/nim-lang/Nim/issues/13063 (which affected error messages)
for modules importing `std/wrapnils`.

## Language changes

- `nimscript` now handles `except Exception as e`.
Expand Down
21 changes: 9 additions & 12 deletions lib/std/wrapnils.nim
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
## This simplifies code by reducing need for if-else branches around intermediate values
## that maybe be nil.
##
## Note: experimental module and relies on {.experimental: "dotOperators".}
## Unstable API.
## Note: experimental module, unstable API.

runnableExamples:
type Foo = ref object
Expand Down Expand Up @@ -39,9 +38,7 @@ template unwrap(a: Wrapnil): untyped =
## See top-level example.
a.valueImpl

{.push experimental: "dotOperators".}

template `.`*(a: Wrapnil, b): untyped =
template fakeDot*(a: Wrapnil, b): untyped =
## See top-level example.
let a1 = a # to avoid double evaluations
let a2 = a1.valueImpl
Expand All @@ -58,8 +55,6 @@ template `.`*(a: Wrapnil, b): untyped =
# nil is "sticky"; this is needed, see tests
default(T)

{.pop.}

proc isValid(a: Wrapnil): bool =
## Returns true if `a` didn't contain intermediate `nil` values (note that
## `a.valueImpl` itself can be nil even in that case)
Expand Down Expand Up @@ -90,16 +85,18 @@ template `[]`*(a: Wrapnil): untyped =
import std/macros

proc replace(n: NimNode): NimNode =
if n.kind == nnkPar:
if n.kind == nnkDotExpr:
result = newCall(bindSym"fakeDot", replace(n[0]), n[1])
elif n.kind == nnkPar:
doAssert n.len == 1
newCall(bindSym"wrapnil", n[0])
result = newCall(bindSym"wrapnil", n[0])
elif n.kind in {nnkCall, nnkObjConstr}:
newCall(bindSym"wrapnil", n)
result = newCall(bindSym"wrapnil", n)
elif n.len == 0:
newCall(bindSym"wrapnil", n)
result = newCall(bindSym"wrapnil", n)
else:
n[0] = replace(n[0])
n
result = n

macro `?.`*(a: untyped): untyped =
## Transforms `a` into an expression that can be safely evaluated even in
Expand Down