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

fix 07-variable-or-variable.sh.

This commit is contained in:
Jan Nieuwenhuizen 2018-11-24 10:55:24 +01:00
parent b9013153f2
commit 43f79811aa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gash/environment.scm
View File

@ -77,12 +77,12 @@
#f)
default)))))
(define (variable-or name default)
(variable name default))
(define (variable-or name . default)
(variable name (apply string-append default)))
(define (variable-and name default)
(define (variable-and name . default)
(let ((value (variable name #f)))
(if value default "")))
(if value (apply string-append default) "")))
(define (set-shell-opt! name set?)
(let* ((shell-opts (variable "SHELLOPTS"))

4
gash/grammar.scm
View File

@ -137,8 +137,8 @@
variable <-- dollar ('*' / '@' / [0-9] / name /
lbrace name (variable-literal / &rbrace) rbrace)
variable-subst <- dollar lbrace (variable-or / variable-and / variable-regex) rbrace
variable-or <-- name min variable-word
variable-and <-- name plus variable-word
variable-or <-- name min variable-word variable-word*
variable-and <-- name plus variable-word variable-word*
variable-word <- variable-regex / substitution / variable-subst / variable / variable-literal !slash / variable-string
variable-regex <-- name &slash regex-sep variable-literal '/' variable-string &rbrace /
name regex-sep variable-string