diff options
| author | Paul A. Patience <paul@apatience.com> | 2022-02-02 19:34:22 -0500 |
|---|---|---|
| committer | Kaz Kylheku <kaz@kylheku.com> | 2022-02-02 17:29:08 -0800 |
| commit | ae57a36b49557f8f5b55df22b308ed1ce4de2385 (patch) | |
| tree | 51176b5eb151b87b696da97e2cec9c5827ea7151 /stdlib | |
| parent | 8a9036307cdbe56a1b1d9382702726e4a52f22c7 (diff) | |
| download | txr-ae57a36b49557f8f5b55df22b308ed1ce4de2385.tar.gz txr-ae57a36b49557f8f5b55df22b308ed1ce4de2385.tar.bz2 txr-ae57a36b49557f8f5b55df22b308ed1ce4de2385.zip | |
getopts: fix ignored stream parameter in opthelp.
* stdlib/getopts.tl (opthelp): Actually use the function's stream
parameter in the put-line calls.
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/getopts.tl | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/stdlib/getopts.tl b/stdlib/getopts.tl index 7a6e1f58..1d714126 100644 --- a/stdlib/getopts.tl +++ b/stdlib/getopts.tl @@ -274,7 +274,7 @@ opt-desc-list)) : (do if @1.long @1.long @1.short)]) (undocumented (keep-if (op null @1.helptext) opt-desc-list))) - (put-line "\nOptions:\n") + (put-line "\nOptions:\n" stream) (each ((od sorted)) (let* ((type (if (and (consp od.type) (eq (car od.type) 'cumul)) (cadr od.type) @@ -294,19 +294,19 @@ (long long) (short `@{"" 21} @short`))) (lines (if od.helptext (sys:wdwrap od.helptext 43)))) - (put-line ` @{ls 34}@(pop lines)`) + (put-line ` @{ls 34}@(pop lines)` stream) (while lines - (put-line ` @{"" 34}@(pop lines)`)))) - (put-line) + (put-line ` @{"" 34}@(pop lines)` stream)))) + (put-line : stream) (when undocumented - (put-line "Undocumented options:\n") + (put-line "Undocumented options:\n" stream) (let* ((undoc-str `@{[mapcar sys:opt-dash (flatten (mappend (op list @1.short @1.long) undocumented))] ", "}`)) (each ((line (sys:wdwrap undoc-str 75))) - (put-line ` @line`))) - (put-line)) - (put-line "Notes:\n") + (put-line ` @line` stream))) + (put-line : stream)) + (put-line "Notes:\n" stream) (let* ((have-short (some sorted (usl short))) (have-long (some sorted (usl long))) (have-arg-p (some sorted (usl arg-p))) @@ -349,12 +349,12 @@ may appear. It means \"end of options\": the\ \ arguments which follow are not treated as options\ \ even if they look like options."))) - (mapdo (do put-line ` @1`) + (mapdo (do put-line ` @1` stream) (sys:wdwrap `@{(flatten texts)}` 77))) - (put-line) + (put-line : stream) (whenlet ((types (keep-if [andf keywordp (op neq :bool)] (uniq (mapcar (usl type) sorted))))) - (put-line "Type legend:\n") + (put-line "Type legend:\n" stream) (each ((ty types)) (iflet ((ln (caseql ty (:dec " DEC - Decimal integer: -123, 0, 5, +73") @@ -369,9 +369,8 @@ \ as TXR Lisp string literals\n\ \ syntax: foo, foo\\tbar, abc\\nxyz") (:text " TEXT - Unprocessed text")))) - (put-line ln))) - (put-line)))) - + (put-line ln stream))) + (put-line : stream)))) (defstruct sys:option-base nil in-args |