andrius
/
gash
mirror of https://git.savannah.gnu.org/git/gash.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Elide unquoted empty and unset variables 

* geesh/word.scm (split-fields): Make an empty string yield zero
fields (an empty list).
* tests/word.scm: Update tests and add tests to make sure that quoted
empty strings are preserved.
This commit is contained in:
Timothy Sample 2018-11-10 10:02:22 -05:00
parent f84b6235db
commit 765e91eb88
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geesh/word.scm
View File

@ -87,7 +87,7 @@ in the string @var{ifs}."
(match qword-part
(('<sh-quote> quote) (wedge-apart-quote quote))
(('<sh-at> vals) (apply append (infix '(wedge) (map wedge-apart vals))))
("" '(""))
("" '())
(str (let ((str-parts (string-split str ifs?)))
(if (every string-null? str-parts)
'(wedge)

41
tests/word.scm
View File

@ -137,11 +137,26 @@ the `set' built-in for details on these options.)"
(expand-word (make-test-env '(("x" . "foo bar")))
'(<sh-quote> (<sh-ref> "x"))))
(test-equal "Treats unset variables as blank"
'("")
(test-equal "Treats empty variables as nothing"
'()
(expand-word (make-test-env '(("x" . "")))
'(<sh-ref> "x")))
(test-equal "Treats unset variables as nothing"
'()
(expand-word (make-test-env '())
'(<sh-ref> "x")))
(test-equal "Preserves empty variables when quoted"
'("")
(expand-word (make-test-env '(("x" . "")))
'(<sh-quote> (<sh-ref> "x"))))
(test-equal "Preserves unset variables when quoted"
'("")
(expand-word (make-test-env '())
'(<sh-quote> (<sh-ref> "x"))))
;;; Parameter operations.
@ -153,7 +168,7 @@ the `set' built-in for details on these options.)"
'(<sh-ref-or> "x" "bar")))
(test-equal "Handles 'or' when parameter is set and empty"
'("")
'()
(expand-word (make-test-env '(("x" . "")))
'(<sh-ref-or> "x" "bar")))
@ -163,7 +178,7 @@ the `set' built-in for details on these options.)"
'(<sh-ref-or> "x" "bar")))
(test-equal "Handles 'or' fall-through without default"
'("")
'()
(expand-word (make-test-env '())
'(<sh-ref-or> "x" #f)))
@ -185,7 +200,7 @@ the `set' built-in for details on these options.)"
'(<sh-ref-or*> "x" "bar")))
(test-equal "Handles 'or*' fall-through without default"
'("")
'()
(expand-word (make-test-env '())
'(<sh-ref-or*> "x" #f)))
@ -198,7 +213,7 @@ the `set' built-in for details on these options.)"
(var-ref env "x"))))
(test-equal "Handles 'or!' when parameter is set and empty"
'(("") "")
'(() "")
(let ((env (make-test-env '(("x" . "")))))
(list (expand-word env '(<sh-ref-or!> "x" "bar"))
(var-ref env "x"))))
@ -210,7 +225,7 @@ the `set' built-in for details on these options.)"
(var-ref env "x"))))
(test-equal "Handles 'or!' fall-through without default"
'(("") "")
'(() "")
(let ((env (make-test-env '())))
(list (expand-word env '(<sh-ref-or!> "x" #f))
(var-ref env "x"))))
@ -236,7 +251,7 @@ the `set' built-in for details on these options.)"
(var-ref env "x"))))
(test-equal "Handles 'or!*' fall-through without default"
'(("") "")
'(() "")
(let ((env (make-test-env '())))
(list (expand-word env '(<sh-ref-or!*> "x" #f))
(var-ref env "x"))))
@ -257,17 +272,17 @@ the `set' built-in for details on these options.)"
'(<sh-ref-and> "x" "bar")))
(test-equal "Handles 'and' when parameter is set and empty"
'("")
'()
(expand-word (make-test-env '(("x" . "")))
'(<sh-ref-and> "x" "bar")))
(test-equal "Handles 'and' when parameter is unset"
'("")
'()
(expand-word (make-test-env '())
'(<sh-ref-and> "x" "bar")))
(test-equal "Handles 'and' fall-through without default"
'("")
'()
(expand-word (make-test-env '(("x" . "foo")))
'(<sh-ref-and> "x" #f)))
@ -284,12 +299,12 @@ the `set' built-in for details on these options.)"
'(<sh-ref-and*> "x" "bar")))
(test-equal "Handles 'and*' when parameter is unset"
'("")
'()
(expand-word (make-test-env '())
'(<sh-ref-and*> "x" "bar")))
(test-equal "Handles 'and*' fall-through without default"
'("")
'()
(expand-word (make-test-env '(("x" . "foo")))
'(<sh-ref-and*> "x" #f)))