Add an 'expand-qword' procedure.

* gash/word.scm (expand-qword): New procedure.
(expand-word): Rewrite in terms of 'expand-qword'.

1 files changed, 10 insertions, 7 deletions

diff --git a/gash/word.scm b/gash/word.scm
index 894bc15..2bac8d5 100644
--- a/gash/word.scm
+++ b/gash/word.scm
@@ -24,6 +24,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:export (eval-cmd-sub
+            expand-qword
             expand-word))
 
 ;;; Commentary:
@@ -336,13 +337,10 @@ and arithmetic substitions."
      (number->string (string-length (parameter-ref name ""))))
     (_ (map word->qword word))))
 
-(define* (expand-word word #:key (output 'fields) (rhs-tildes? #f))
-  "Expand @var{word} into a list of fields."
-  ;; The value of '$IFS' may depend on side-effects performed during
-  ;; 'word->qword', so use 'let*' here.
-  (let* ((qword (word->qword word))
-         (ifs (getvar "IFS" (string #\space #\tab #\newline)))
-         (pwd (getvar "PWD")))
+(define* (expand-qword qword #:key (output 'fields) (rhs-tildes? #f))
+  "Expand @var{qword} into a list of fields."
+  (let ((ifs (getvar "IFS" (string #\space #\tab #\newline)))
+        (pwd (getvar "PWD")))
     (match output
       ('fields (if pwd
                    (append-map (cut expand-pathnames <> pwd ifs)
@@ -351,3 +349,8 @@ and arithmetic substitions."
                         (split-fields qword ifs))))
       ('string (remove-quotes qword ifs))
       ('pattern (qword->pattern qword ifs)))))
+
+(define* (expand-word word #:key (output 'fields) (rhs-tildes? #f))
+  "Expand @var{word} into a list of fields."
+  (let ((qword (word->qword word)))
+    (expand-qword qword #:output output #:rhs-tildes? rhs-tildes?)))