Skip to content

nim secret: support linenoise when available #13328

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 5, 2020
Merged

nim secret: support linenoise when available #13328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions compiler/llstream.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
import
pathutils

# support '-d:useGnuReadline' for backwards compatibility:
when not defined(windows) and (defined(useGnuReadline) or defined(useLinenoise)):
import rdstdin
template imp(x) = import x
const hasRstdin = compiles(imp(rdstdin))
Copy link
Contributor

@Clyybber Clyybber Feb 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why so hacky?

Copy link
Member Author

@timotheecour timotheecour Feb 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it avoids duplicating whatever logic is in rstdin to tell whether readLineFromStdin is available, eg linenoise being available or not; it is future proof

Copy link
Contributor

@Clyybber Clyybber Feb 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes nightlies fail...

when hasRstdin: import rdstdin

type
TLLRepl* = proc (s: PLLStream, buf: pointer, bufLen: int): int
Expand Down Expand Up @@ -67,7 +67,7 @@ proc llStreamClose*(s: PLLStream) =
of llsFile:
close(s.f)

when not declared(readLineFromStdin):
when not hasRstdin:
# fallback implementation:
proc readLineFromStdin(prompt: string, line: var string): bool =
stderr.write(prompt)
Expand Down