mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-25 07:28:20 +00:00
Eshell variable expansion should always return strings inside quotes
This is closer in behavior to regular shells, and gives Eshell users
greater flexibility in how variables are expanded.
* lisp/eshell/esh-util.el (eshell-convert): Add TO-STRING argument.
* lisp/eshell/esh-var.el (eshell-parse-variable-ref): Add MODIFIER-P
argument and adjust how 'eshell-convert' and 'eshell-apply-indices'
are called.
(eshell-get-variable, eshell-apply-indices): Add QUOTED argument.
* test/lisp/eshell/esh-var-tests.el (eshell-test-value): New defvar.
(esh-var-test/interp-convert-var-number)
(esh-var-test/interp-convert-var-split-indices)
(esh-var-test/interp-convert-quoted-var-number)
(esh-var-test/interp-convert-quoted-var-split-indices)
(esh-var-test/interp-convert-cmd-string-newline)
(esh-var-test/interp-convert-cmd-multiline)
(esh-var-test/interp-convert-cmd-number)
(esh-var-test/interp-convert-cmd-split-indices)
(esh-var-test/quoted-interp-convert-var-number)
(esh-var-test/quoted-interp-convert-var-split-indices)
(esh-var-test/quoted-interp-convert-quoted-var-number)
(esh-var-test/quoted-interp-convert-quoted-var-split-indices)
(esh-var-test/quoted-interp-convert-cmd-string-newline)
(esh-var-test/quoted-interp-convert-cmd-multiline)
(esh-var-test/quoted-interp-convert-cmd-number)
(esh-var-test/quoted-interp-convert-cmd-split-indices): New tests.
* doc/misc/eshell.texi (Arguments): Expand this section, and document
the new behavior.
(Dollars Expansion): Provide more detail about '$(lisp)' and
'${command}' forms.
* etc/NEWS (Eshell): Announce this change (bug#55236).
This commit is contained in:
Jim Porter
Lars Ingebrigtsen
parent
316c082d58
commit
f7a82699d6
@ -228,15 +228,39 @@ other background process in Emacs.
|
||||
|
||||
@node Arguments
|
||||
@section Arguments
|
||||
Command arguments are passed to the functions as either strings or
|
||||
numbers, depending on what the parser thinks they look like. If you
|
||||
need to use a function that takes some other data type, you will need to
|
||||
call it in an Elisp expression (which can also be used with
|
||||
@ref{Expansion, expansions}). As with other shells, you can
|
||||
escape special characters and spaces with the backslash (@code{\}) and
|
||||
apostrophes (@code{''}) and double quotes (@code{""}). This is needed
|
||||
especially for file names with special characters like pipe
|
||||
(@code{|}), which could be part of remote file names.
|
||||
Ordinarily, command arguments are parsed by Eshell as either strings
|
||||
or numbers, depending on what the parser thinks they look like. To
|
||||
specify an argument of some other data type, you can use an
|
||||
@ref{Dollars Expansion, Elisp expression}:
|
||||
|
||||
@example
|
||||
~ $ echo (list 1 2 3)
|
||||
(1 2 3)
|
||||
@end example
|
||||
|
||||
Additionally, many @ref{Built-ins, Eshell commands} will flatten the
|
||||
arguments they receive, so passing a list as an argument will
|
||||
``spread'' the elements into multiple arguments:
|
||||
|
||||
@example
|
||||
~ $ printnl (list 1 2) 3
|
||||
1
|
||||
2
|
||||
3
|
||||
@end example
|
||||
|
||||
@subsection Quoting and escaping
|
||||
|
||||
As with other shells, you can escape special characters and spaces
|
||||
with by prefixing the character with a backslash (@code{\}), or by
|
||||
surrounding the string with apostrophes (@code{''}) or double quotes
|
||||
(@code{""}). This is needed especially for file names with special
|
||||
characters like pipe (@code{|}), which could be part of remote file
|
||||
names.
|
||||
|
||||
When using @ref{Expansion, expansions} in an Eshell command, the
|
||||
result may potentially be of any data type. To ensure that the result
|
||||
is always a string, the expansion can be surrounded by double quotes.
|
||||
|
||||
@node Built-ins
|
||||
@section Built-in commands
|
||||
@ -1026,11 +1050,20 @@ value, such as @samp{$"@var{var}"-suffix}.
|
||||
@item $(@var{lisp})
|
||||
Expands to the result of evaluating the S-expression @code{(@var{lisp})}. On
|
||||
its own, this is identical to just @code{(@var{lisp})}, but with the @code{$},
|
||||
it can be used in a string, such as @samp{/some/path/$(@var{lisp}).txt}.
|
||||
it can be used inside double quotes or within a longer string, such as
|
||||
@samp{/some/path/$(@var{lisp}).txt}.
|
||||
|
||||
@item $@{@var{command}@}
|
||||
Returns the output of @command{@var{command}}, which can be any valid Eshell
|
||||
command invocation, and may even contain expansions.
|
||||
Returns the output of @command{@var{command}}, which can be any valid
|
||||
Eshell command invocation, and may even contain expansions. Similar
|
||||
to @code{$(@var{lisp})}, this is identical to @code{@{@var{command}@}}
|
||||
when on its own, but the @code{$} allows it to be used inside double
|
||||
quotes or as part of a string.
|
||||
|
||||
Normally, the output is split line-by-line, returning a list (or the
|
||||
first element if there's only one line of output). However, when this
|
||||
expansion is surrounded by double quotes, it returns the output as a
|
||||
single string instead.
|
||||
|
||||
@item $<@var{command}>
|
||||
As with @samp{$@{@var{command}@}}, evaluates the Eshell command invocation
|
||||
|
||||
6
etc/NEWS
6
etc/NEWS
@ -1390,6 +1390,12 @@ Lisp function. This frees you from having to keep track of whether
|
||||
commands are Lisp function or external when supplying absolute file
|
||||
name arguments. See "Electric forward slash" in the Eshell manual.
|
||||
|
||||
+++
|
||||
*** Double-quoting an Eshell expansion now treats the result as a single string.
|
||||
If an Eshell expansion like '$FOO' is surrounded by double quotes, the
|
||||
result will always be a single string, no matter the type that would
|
||||
otherwise be returned.
|
||||
|
||||
---
|
||||
*** Built-in Eshell commands now follow POSIX/GNU argument syntax conventions.
|
||||
Built-in commands in Eshell now accept command-line options with
|
||||
|
||||
@ -198,23 +198,37 @@ doubling it up."
|
||||
(when (= depth 0)
|
||||
(if reverse-p (point) (1- (point)))))))
|
||||
|
||||
(defun eshell-convert (string)
|
||||
"Convert STRING into a more native looking Lisp object."
|
||||
(if (not (stringp string))
|
||||
string
|
||||
(let ((len (length string)))
|
||||
(if (= len 0)
|
||||
string
|
||||
(if (eq (aref string (1- len)) ?\n)
|
||||
(defun eshell-convert (string &optional to-string)
|
||||
"Convert STRING into a more-native Lisp object.
|
||||
If TO-STRING is non-nil, always return a single string with
|
||||
trailing newlines removed. Otherwise, this behaves as follows:
|
||||
|
||||
* Return non-strings as-is.
|
||||
|
||||
* Split multiline strings by line.
|
||||
|
||||
* If `eshell-convert-numeric-aguments' is non-nil, convert
|
||||
numeric strings to numbers."
|
||||
(cond
|
||||
((not (stringp string))
|
||||
(if to-string
|
||||
(eshell-stringify string)
|
||||
string))
|
||||
(to-string (string-trim-right string "\n+"))
|
||||
(t (let ((len (length string)))
|
||||
(if (= len 0)
|
||||
string
|
||||
(when (eq (aref string (1- len)) ?\n)
|
||||
(setq string (substring string 0 (1- len))))
|
||||
(if (string-search "\n" string)
|
||||
(split-string string "\n")
|
||||
(if (and eshell-convert-numeric-arguments
|
||||
(string-match
|
||||
(concat "\\`\\s-*" eshell-number-regexp
|
||||
"\\s-*\\'") string))
|
||||
(string-to-number string)
|
||||
string))))))
|
||||
(cond
|
||||
((string-search "\n" string)
|
||||
(split-string string "\n"))
|
||||
((and eshell-convert-numeric-arguments
|
||||
(string-match
|
||||
(concat "\\`\\s-*" eshell-number-regexp "\\s-*\\'")
|
||||
string))
|
||||
(string-to-number string))
|
||||
(t string)))))))
|
||||
|
||||
(defvar-local eshell-path-env (getenv "PATH")
|
||||
"Content of $PATH.
|
||||
|
||||
@ -402,23 +402,30 @@ process any indices that come after the variable reference."
|
||||
(let* ((get-len (when (eq (char-after) ?#)
|
||||
(forward-char) t))
|
||||
value indices)
|
||||
(setq value (eshell-parse-variable-ref)
|
||||
(setq value (eshell-parse-variable-ref get-len)
|
||||
indices (and (not (eobp))
|
||||
(eq (char-after) ?\[)
|
||||
(eshell-parse-indices))
|
||||
;; This is an expression that will be evaluated by `eshell-do-eval',
|
||||
;; which only support let-binding of dynamically-scoped vars
|
||||
value `(let ((indices (eshell-eval-indices ',indices))) ,value))
|
||||
(if get-len
|
||||
`(length ,value)
|
||||
value)))
|
||||
(when get-len
|
||||
(setq value `(length ,value)))
|
||||
(when eshell-current-quoted
|
||||
(setq value `(eshell-stringify ,value)))
|
||||
value))
|
||||
|
||||
(defun eshell-parse-variable-ref ()
|
||||
(defun eshell-parse-variable-ref (&optional modifier-p)
|
||||
"Eval a variable reference.
|
||||
Returns a Lisp form which, if evaluated, will return the value of the
|
||||
variable.
|
||||
|
||||
Possible options are:
|
||||
If MODIFIER-P is non-nil, the value of the variable will be
|
||||
modified by some function. If MODIFIER-P is nil, the value will be
|
||||
used as-is; this allows optimization of some kinds of variable
|
||||
references.
|
||||
|
||||
Possible variable references are:
|
||||
|
||||
NAME an environment or Lisp variable value
|
||||
\"LONG-NAME\" disambiguates the length of the name
|
||||
@ -441,8 +448,16 @@ Possible options are:
|
||||
,(let ((subcmd (or (eshell-unescape-inner-double-quote end)
|
||||
(cons (point) end)))
|
||||
(eshell-current-quoted nil))
|
||||
(eshell-parse-command subcmd)))))
|
||||
indices)
|
||||
(eshell-parse-command subcmd))))
|
||||
;; If this is a simple double-quoted form like
|
||||
;; "${COMMAND}" (i.e. no indices after the subcommand
|
||||
;; and no `#' modifier before), ensure we convert to a
|
||||
;; single string. This avoids unnecessary work
|
||||
;; (e.g. splitting the output by lines) when it would
|
||||
;; just be joined back together afterwards.
|
||||
,(when (and (not modifier-p) eshell-current-quoted)
|
||||
'(not indices)))
|
||||
indices ,eshell-current-quoted)
|
||||
(goto-char (1+ end))))))
|
||||
((eq (char-after) ?\<)
|
||||
(let ((end (eshell-find-delimiter ?\< ?\>)))
|
||||
@ -466,7 +481,7 @@ Possible options are:
|
||||
;; properly. See bug#54190.
|
||||
(list (function (lambda ()
|
||||
(delete-file ,temp))))))
|
||||
(eshell-apply-indices ,temp indices)))
|
||||
(eshell-apply-indices ,temp indices ,eshell-current-quoted)))
|
||||
(goto-char (1+ end)))))))
|
||||
((eq (char-after) ?\()
|
||||
(condition-case nil
|
||||
@ -475,7 +490,7 @@ Possible options are:
|
||||
(eshell-lisp-command
|
||||
',(read (or (eshell-unescape-inner-double-quote (point-max))
|
||||
(current-buffer)))))
|
||||
indices)
|
||||
indices ,eshell-current-quoted)
|
||||
(end-of-file
|
||||
(throw 'eshell-incomplete ?\())))
|
||||
((looking-at (rx-to-string
|
||||
@ -487,14 +502,15 @@ Possible options are:
|
||||
(eshell-parse-literal-quote)
|
||||
(eshell-parse-double-quote))))
|
||||
(when name
|
||||
`(eshell-get-variable ,(eval name) indices)))))
|
||||
`(eshell-get-variable ,(eval name) indices ,eshell-current-quoted)))))
|
||||
((assoc (char-to-string (char-after))
|
||||
eshell-variable-aliases-list)
|
||||
(forward-char)
|
||||
`(eshell-get-variable ,(char-to-string (char-before)) indices))
|
||||
`(eshell-get-variable ,(char-to-string (char-before)) indices
|
||||
,eshell-current-quoted))
|
||||
((looking-at eshell-variable-name-regexp)
|
||||
(prog1
|
||||
`(eshell-get-variable ,(match-string 0) indices)
|
||||
`(eshell-get-variable ,(match-string 0) indices ,eshell-current-quoted)
|
||||
(goto-char (match-end 0))))
|
||||
(t
|
||||
(error "Invalid variable reference"))))
|
||||
@ -525,8 +541,10 @@ For example, \"[0 1][2]\" becomes:
|
||||
"Evaluate INDICES, a list of index-lists generated by `eshell-parse-indices'."
|
||||
(mapcar (lambda (i) (mapcar #'eval i)) indices))
|
||||
|
||||
(defun eshell-get-variable (name &optional indices)
|
||||
"Get the value for the variable NAME."
|
||||
(defun eshell-get-variable (name &optional indices quoted)
|
||||
"Get the value for the variable NAME.
|
||||
INDICES is a list of index-lists (see `eshell-parse-indices').
|
||||
If QUOTED is non-nil, this was invoked inside double-quotes."
|
||||
(let* ((alias (assoc name eshell-variable-aliases-list))
|
||||
(var (if alias
|
||||
(cadr alias)
|
||||
@ -547,9 +565,9 @@ For example, \"[0 1][2]\" becomes:
|
||||
(symbol-value var))
|
||||
(t
|
||||
(error "Unknown variable `%s'" (eshell-stringify var))))
|
||||
indices))))
|
||||
indices quoted))))
|
||||
|
||||
(defun eshell-apply-indices (value indices)
|
||||
(defun eshell-apply-indices (value indices &optional quoted)
|
||||
"Apply to VALUE all of the given INDICES, returning the sub-result.
|
||||
The format of INDICES is:
|
||||
|
||||
@ -558,12 +576,17 @@ The format of INDICES is:
|
||||
|
||||
Each member of INDICES represents a level of nesting. If the first
|
||||
member of a sublist is not an integer or name, and the value it's
|
||||
reference is a string, that will be used as the regexp with which is
|
||||
to divide the string into sub-parts. The default is whitespace.
|
||||
referencing is a string, that will be used as the regexp with which
|
||||
is to divide the string into sub-parts. The default is whitespace.
|
||||
Otherwise, each INT-OR-NAME refers to an element of the list value.
|
||||
Integers imply a direct index, and names, an associate lookup using
|
||||
`assoc'.
|
||||
|
||||
If QUOTED is non-nil, this was invoked inside double-quotes. This
|
||||
affects the behavior of splitting strings: without quoting, the
|
||||
split values are converted to Lisp forms via `eshell-convert'; with
|
||||
quoting, they're left as strings.
|
||||
|
||||
For example, to retrieve the second element of a user's record in
|
||||
'/etc/passwd', the variable reference would look like:
|
||||
|
||||
@ -577,7 +600,7 @@ For example, to retrieve the second element of a user's record in
|
||||
(setq separator index
|
||||
refs (cdr refs)))
|
||||
(setq value
|
||||
(mapcar #'eshell-convert
|
||||
(mapcar (lambda (i) (eshell-convert i quoted))
|
||||
(split-string value separator)))))
|
||||
(cond
|
||||
((< (length refs) 0)
|
||||
|
||||
@ -210,12 +210,17 @@
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0]\"")
|
||||
"zero"))
|
||||
;; FIXME: These tests would use the 0th index like the other tests
|
||||
;; here, but evaluating the command just above adds an `escaped'
|
||||
;; property to the string "zero". This results in the output
|
||||
;; printing the string properties, which is probably the wrong
|
||||
;; behavior. See bug#54486.
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0 2]\"")
|
||||
'("zero" "two")))
|
||||
"echo \"$eshell-test-value[1 2]\"")
|
||||
"(\"one\" \"two\")"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0 2 4]\"")
|
||||
'("zero" "two" "four")))))
|
||||
"echo \"$eshell-test-value[1 2 4]\"")
|
||||
"(\"one\" \"two\" \"four\")"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-var-split-indices ()
|
||||
"Interpolate string variable with indices inside double-quotes"
|
||||
@ -225,7 +230,7 @@
|
||||
"zero"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0 2]\"")
|
||||
'("zero" "two")))))
|
||||
"(\"zero\" \"two\")"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-var-string-split-indices ()
|
||||
"Interpolate string variable with string splitter and indices
|
||||
@ -236,14 +241,14 @@ inside double-quotes"
|
||||
"zero"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[: 0 2]\"")
|
||||
'("zero" "two"))))
|
||||
"(\"zero\" \"two\")")))
|
||||
(let ((eshell-test-value "zeroXoneXtwoXthreeXfour"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[X 0]\"")
|
||||
"zero"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[X 0 2]\"")
|
||||
'("zero" "two")))))
|
||||
"(\"zero\" \"two\")"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-var-regexp-split-indices ()
|
||||
"Interpolate string variable with regexp splitter and indices"
|
||||
@ -253,43 +258,47 @@ inside double-quotes"
|
||||
"zero"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value['[:!]' 0 2]\"")
|
||||
'("zero" "two")))
|
||||
"(\"zero\" \"two\")"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[\\\"[:!]\\\" 0]\"")
|
||||
"zero"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[\\\"[:!]\\\" 0 2]\"")
|
||||
'("zero" "two")))))
|
||||
"(\"zero\" \"two\")"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-var-assoc ()
|
||||
"Interpolate alist variable with index inside double-quotes"
|
||||
(let ((eshell-test-value '(("foo" . 1))))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[foo]\"")
|
||||
1))))
|
||||
"1"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-var-length-list ()
|
||||
"Interpolate length of list variable inside double-quotes"
|
||||
(let ((eshell-test-value '((1 2) (3) (5 (6 7 8 9)))))
|
||||
(should (eq (eshell-test-command-result "echo \"$#eshell-test-value\"") 3))
|
||||
(should (eq (eshell-test-command-result "echo \"$#eshell-test-value[1]\"")
|
||||
1))
|
||||
(should (eq (eshell-test-command-result
|
||||
"echo \"$#eshell-test-value[2][1]\"")
|
||||
4))))
|
||||
(should (equal (eshell-test-command-result "echo \"$#eshell-test-value\"")
|
||||
"3"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$#eshell-test-value[1]\"")
|
||||
"1"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$#eshell-test-value[2][1]\"")
|
||||
"4"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-var-length-string ()
|
||||
"Interpolate length of string variable inside double-quotes"
|
||||
(let ((eshell-test-value "foobar"))
|
||||
(should (eq (eshell-test-command-result "echo \"$#eshell-test-value\"")
|
||||
6))))
|
||||
(should (equal (eshell-test-command-result "echo \"$#eshell-test-value\"")
|
||||
"6"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-var-length-alist ()
|
||||
"Interpolate length of alist variable inside double-quotes"
|
||||
(let ((eshell-test-value '(("foo" . (1 2 3)))))
|
||||
(should (eq (eshell-test-command-result "echo \"$#eshell-test-value\"") 1))
|
||||
(should (eq (eshell-test-command-result "echo \"$#eshell-test-value[foo]\"")
|
||||
3))))
|
||||
(should (equal (eshell-test-command-result "echo \"$#eshell-test-value\"")
|
||||
"1"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$#eshell-test-value[foo]\"")
|
||||
"3"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-lisp ()
|
||||
"Interpolate Lisp form evaluation inside double-quotes"
|
||||
@ -299,7 +308,8 @@ inside double-quotes"
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-lisp-indices ()
|
||||
"Interpolate Lisp form evaluation with index"
|
||||
(should (equal (eshell-test-command-result "+ \"$(list 1 2)[1]\" 3") 5)))
|
||||
(should (equal (eshell-test-command-result "concat \"$(list 1 2)[1]\" cool")
|
||||
"2cool")))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-cmd ()
|
||||
"Interpolate command result inside double-quotes"
|
||||
@ -309,12 +319,127 @@ inside double-quotes"
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-cmd-indices ()
|
||||
"Interpolate command result with index inside double-quotes"
|
||||
(should (equal (eshell-test-command-result "+ \"${list 1 2}[1]\" 3") 5)))
|
||||
(should (equal (eshell-test-command-result "concat \"${list 1 2}[1]\" cool")
|
||||
"2cool")))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-temp-cmd ()
|
||||
"Interpolate command result redirected to temp file inside double-quotes"
|
||||
(should (equal (eshell-test-command-result "cat \"$<echo hi>\"") "hi")))
|
||||
|
||||
|
||||
;; Interpolated variable conversion
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-var-number ()
|
||||
"Interpolate numeric variable"
|
||||
(let ((eshell-test-value 123))
|
||||
(should (equal (eshell-test-command-result "type-of $eshell-test-value")
|
||||
'integer))))
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-var-split-indices ()
|
||||
"Interpolate and convert string variable with indices"
|
||||
(let ((eshell-test-value "000 010 020 030 040"))
|
||||
(should (equal (eshell-test-command-result "echo $eshell-test-value[0]")
|
||||
0))
|
||||
(should (equal (eshell-test-command-result "echo $eshell-test-value[0 2]")
|
||||
'(0 20)))))
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-quoted-var-number ()
|
||||
"Interpolate numeric quoted numeric variable"
|
||||
(let ((eshell-test-value 123))
|
||||
(should (equal (eshell-test-command-result "type-of $'eshell-test-value'")
|
||||
'integer))
|
||||
(should (equal (eshell-test-command-result "type-of $\"eshell-test-value\"")
|
||||
'integer))))
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-quoted-var-split-indices ()
|
||||
"Interpolate and convert quoted string variable with indices"
|
||||
(let ((eshell-test-value "000 010 020 030 040"))
|
||||
(should (equal (eshell-test-command-result "echo $'eshell-test-value'[0]")
|
||||
0))
|
||||
(should (equal (eshell-test-command-result "echo $'eshell-test-value'[0 2]")
|
||||
'(0 20)))))
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-cmd-string-newline ()
|
||||
"Interpolate trailing-newline command result"
|
||||
(should (equal (eshell-test-command-result "echo ${echo \"foo\n\"}") "foo")))
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-cmd-multiline ()
|
||||
"Interpolate multi-line command result"
|
||||
(should (equal (eshell-test-command-result "echo ${echo \"foo\nbar\"}")
|
||||
'("foo" "bar"))))
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-cmd-number ()
|
||||
"Interpolate numeric command result"
|
||||
(should (equal (eshell-test-command-result "echo ${echo \"1\"}") 1)))
|
||||
|
||||
(ert-deftest esh-var-test/interp-convert-cmd-split-indices ()
|
||||
"Interpolate command result with indices"
|
||||
(should (equal (eshell-test-command-result "echo ${echo \"000 010 020\"}[0]")
|
||||
0))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo ${echo \"000 010 020\"}[0 2]")
|
||||
'(0 20))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-var-number ()
|
||||
"Interpolate numeric variable inside double-quotes"
|
||||
(let ((eshell-test-value 123))
|
||||
(should (equal (eshell-test-command-result "type-of \"$eshell-test-value\"")
|
||||
'string))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-var-split-indices ()
|
||||
"Interpolate string variable with indices inside double-quotes"
|
||||
(let ((eshell-test-value "000 010 020 030 040"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0]\"")
|
||||
"000"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0 2]\"")
|
||||
"(\"000\" \"020\")"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-quoted-var-number ()
|
||||
"Interpolate numeric quoted variable inside double-quotes"
|
||||
(let ((eshell-test-value 123))
|
||||
(should (equal (eshell-test-command-result
|
||||
"type-of \"$'eshell-test-value'\"")
|
||||
'string))
|
||||
(should (equal (eshell-test-command-result
|
||||
"type-of \"$\\\"eshell-test-value\\\"\"")
|
||||
'string))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-quoted-var-split-indices ()
|
||||
"Interpolate quoted string variable with indices inside double-quotes"
|
||||
(let ((eshell-test-value "000 010 020 030 040"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0]\"")
|
||||
"000"))
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"$eshell-test-value[0 2]\"")
|
||||
"(\"000\" \"020\")"))))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-cmd-string-newline ()
|
||||
"Interpolate trailing-newline command result inside double-quotes"
|
||||
(should (equal (eshell-test-command-result "echo \"${echo \\\"foo\n\\\"}\"")
|
||||
"foo"))
|
||||
(should (equal (eshell-test-command-result "echo \"${echo \\\"foo\n\n\\\"}\"")
|
||||
"foo")))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-cmd-multiline ()
|
||||
"Interpolate multi-line command result inside double-quotes"
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"${echo \\\"foo\nbar\\\"}\"")
|
||||
"foo\nbar")))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-cmd-number ()
|
||||
"Interpolate numeric command result inside double-quotes"
|
||||
(should (equal (eshell-test-command-result "echo \"${echo \\\"1\\\"}\"")
|
||||
"1")))
|
||||
|
||||
(ert-deftest esh-var-test/quoted-interp-convert-cmd-split-indices ()
|
||||
"Interpolate command result with indices inside double-quotes"
|
||||
(should (equal (eshell-test-command-result
|
||||
"echo \"${echo \\\"000 010 020\\\"}[0]\"")
|
||||
"000")))
|
||||
|
||||
|
||||
;; Built-in variables
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user