2018-07-12 03:05:15 +01:00
|
|
|
;;; The Geesh Shell Interpreter
|
|
|
|
;;; Copyright 2018 Timothy Sample <samplet@ngyro.com>
|
|
|
|
;;;
|
|
|
|
;;; This file is part of Geesh.
|
|
|
|
;;;
|
|
|
|
;;; Geesh is free software: you can redistribute it and/or modify
|
|
|
|
;;; it under the terms of the GNU General Public License as published by
|
|
|
|
;;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;;; (at your option) any later version.
|
|
|
|
;;;
|
|
|
|
;;; Geesh is distributed in the hope that it will be useful,
|
|
|
|
;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
;;;
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
;;; along with Geesh. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
(define-module (geesh word)
|
|
|
|
#:use-module (geesh environment)
|
2018-11-20 20:02:09 +00:00
|
|
|
#:use-module (geesh pattern)
|
|
|
|
#:use-module (ice-9 ftw)
|
2018-07-12 03:05:15 +01:00
|
|
|
#:use-module (ice-9 match)
|
|
|
|
#:use-module (srfi srfi-1)
|
|
|
|
#:use-module (srfi srfi-26)
|
|
|
|
#:export (eval-cmd-sub
|
|
|
|
expand-word))
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
;;;
|
|
|
|
;;; This module contains functions for manipulating shell words. This
|
|
|
|
;;; includes tilde expansion, parameter expansions, field splitting,
|
|
|
|
;;; globbing, etc.
|
|
|
|
;;;
|
|
|
|
;;; In the code below, the term "qword" is used to refer to words that
|
|
|
|
;;; only contain quotations (i.e., no substitutions).
|
|
|
|
;;;
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(define (normalize-word word)
|
|
|
|
"Normalize @var{word} (which may be a word or a qword) so that it is
|
|
|
|
guaranteed to be a list."
|
|
|
|
(match word
|
|
|
|
((? string?) (list word))
|
|
|
|
(((? symbol?) _) (list word))
|
|
|
|
(_ word)))
|
|
|
|
|
|
|
|
(define (infix x xs)
|
|
|
|
"Place @var{x} between each element of the list @var{xs}."
|
|
|
|
(if (null? xs)
|
|
|
|
xs
|
|
|
|
(let loop ((xs (cdr xs)) (acc (list (car xs))))
|
|
|
|
(if (null? xs)
|
|
|
|
(reverse acc)
|
|
|
|
(loop (cdr xs) (cons* (car xs) x acc))))))
|
|
|
|
|
|
|
|
(define (list-split xs sym)
|
|
|
|
"Split the list @var{xs} into sublists delimited by the symbol
|
|
|
|
@var{sym}."
|
|
|
|
(let loop ((xs xs) (small-acc '()) (big-acc '()))
|
|
|
|
(cond
|
|
|
|
((null? xs)
|
|
|
|
(reverse (cons (reverse small-acc) big-acc)))
|
|
|
|
((eq? (car xs) sym)
|
|
|
|
(loop (cdr xs) '() (cons (reverse small-acc) big-acc)))
|
|
|
|
(else
|
|
|
|
(loop (cdr xs) (cons (car xs) small-acc) big-acc)))))
|
|
|
|
|
2018-11-11 02:12:45 +00:00
|
|
|
(define (string-tokenize* s token-set)
|
|
|
|
"Split the string @var{s} into a list of substrings, where each
|
|
|
|
substring is a maximal non-empty contiguous sequence of characters
|
|
|
|
from the character set @var{token-set} or its compliment."
|
|
|
|
|
|
|
|
(define token-set-complement
|
|
|
|
(let ((token-set* (char-set-complement token-set)))
|
|
|
|
(lambda (cs)
|
|
|
|
(if (eq? cs token-set) token-set* token-set))))
|
|
|
|
|
|
|
|
(let loop ((index 0) (start 0) (cs token-set) (acc '()))
|
|
|
|
(cond
|
|
|
|
((>= index (string-length s))
|
|
|
|
(reverse! (if (> index start)
|
|
|
|
(cons (substring s start index) acc)
|
|
|
|
acc)))
|
|
|
|
((char-set-contains? cs (string-ref s index))
|
|
|
|
(loop (1+ index) start cs acc))
|
|
|
|
(else
|
|
|
|
(loop index index
|
|
|
|
(token-set-complement cs)
|
|
|
|
(if (> index start)
|
|
|
|
(cons (substring s start index) acc)
|
|
|
|
acc))))))
|
|
|
|
|
2018-07-12 03:05:15 +01:00
|
|
|
(define (split-fields qword ifs)
|
2018-11-09 21:35:06 +00:00
|
|
|
"Split @var{qword} into a list of qwords delimited by any character
|
|
|
|
in the string @var{ifs}."
|
2018-07-12 03:05:15 +01:00
|
|
|
|
2018-11-11 02:12:45 +00:00
|
|
|
(define char-set:ifs
|
|
|
|
(string->char-set ifs))
|
|
|
|
|
|
|
|
(define char-set:ifs/nw
|
|
|
|
(char-set-difference char-set:ifs char-set:whitespace))
|
2018-11-09 21:35:06 +00:00
|
|
|
|
2018-11-09 03:23:17 +00:00
|
|
|
(define (wedge-apart-quote qword)
|
|
|
|
(let loop ((qword (normalize-word qword)) (acc '()))
|
|
|
|
(match qword
|
|
|
|
(() (reverse! acc))
|
|
|
|
((('<sh-quote> qword*) . t)
|
|
|
|
(loop t (append-reverse (wedge-apart-quote qword*) acc)))
|
|
|
|
((('<sh-at> vals) . t)
|
|
|
|
(loop t (append-reverse (infix 'wedge (map (cut list '<sh-quote> <>)
|
|
|
|
vals))
|
|
|
|
acc)))
|
|
|
|
(((? string? h) . t)
|
|
|
|
(loop t (cons `(<sh-quote> ,h) acc))))))
|
|
|
|
|
2018-11-10 22:35:41 +00:00
|
|
|
(define (wedge-apart qword)
|
|
|
|
(match qword
|
2018-11-09 03:23:17 +00:00
|
|
|
(('<sh-quote> quote) (wedge-apart-quote quote))
|
|
|
|
(('<sh-at> vals) (apply append (infix '(wedge) (map wedge-apart vals))))
|
2018-11-10 22:35:41 +00:00
|
|
|
((? string? str)
|
2018-11-11 02:12:45 +00:00
|
|
|
(let ((tokens (string-tokenize* str char-set:ifs)))
|
|
|
|
(append-map (lambda (token)
|
|
|
|
(if (string-any char-set:ifs token)
|
|
|
|
;; Every occurrence of a non-whitespace
|
|
|
|
;; separator must delimit a field. This
|
|
|
|
;; means that we have to add a blank field
|
|
|
|
;; for every non-whitespace separator in
|
|
|
|
;; 'token' beyond the first.
|
|
|
|
(let ((count (string-count token char-set:ifs/nw)))
|
|
|
|
(cons 'wedge
|
|
|
|
(append-map (const '("" wedge))
|
|
|
|
(iota (max 0 (- count 1))))))
|
|
|
|
(list token)))
|
|
|
|
;; When a word starts with a non-whitespace
|
|
|
|
;; separator, it still delimits two fields, the
|
|
|
|
;; one on the left being empty.
|
|
|
|
(match tokens
|
|
|
|
(((? (cut string-any char-set:ifs/nw <>)) . rest)
|
|
|
|
(cons "" tokens))
|
|
|
|
(_ tokens)))))
|
2018-11-10 22:35:41 +00:00
|
|
|
(_ (append-map wedge-apart qword))))
|
2018-07-12 03:05:15 +01:00
|
|
|
|
2018-11-10 22:35:41 +00:00
|
|
|
(let ((wedged (wedge-apart qword)))
|
2018-07-18 07:33:08 +01:00
|
|
|
(filter pair? (list-split wedged 'wedge))))
|
2018-07-12 03:05:15 +01:00
|
|
|
|
2018-11-09 03:23:17 +00:00
|
|
|
(define (argument-separator ifs)
|
|
|
|
"Find the argument separator string by taking the first character of
|
|
|
|
the string @var{ifs}. If @var{ifs} is @code{#f} the separator will be
|
|
|
|
a space (@code{\" \"}), and if @var{ifs} is null (@code{\"\"}) the
|
|
|
|
separator will be null as well."
|
|
|
|
(let ((ifs (or ifs " ")))
|
|
|
|
(if (string-null? ifs)
|
|
|
|
""
|
|
|
|
(string (string-ref ifs 0)))))
|
|
|
|
|
|
|
|
(define (remove-quotes qword ifs)
|
|
|
|
"Remove quote forms from @var{qword} and concatenate the result into
|
|
|
|
a single field (string). When converting an argument list to a
|
|
|
|
string, the separator is derived from @var{ifs} using
|
|
|
|
@code{argument-separator}."
|
2018-07-12 03:05:15 +01:00
|
|
|
(let loop ((qword (normalize-word qword)) (acc '()))
|
|
|
|
(match qword
|
|
|
|
(() (string-concatenate-reverse acc))
|
2018-11-09 03:23:17 +00:00
|
|
|
((('<sh-quote> qword*) . t)
|
|
|
|
(loop t (cons (remove-quotes qword* ifs) acc)))
|
|
|
|
((('<sh-at> vals) . t)
|
|
|
|
(let ((sep (argument-separator ifs)))
|
|
|
|
(loop t (cons (string-join vals sep) acc))))
|
|
|
|
(((? string? h) . t)
|
|
|
|
(loop t (cons h acc))))))
|
2018-07-12 03:05:15 +01:00
|
|
|
|
2018-11-20 20:02:09 +00:00
|
|
|
(define (qword->pattern qword ifs)
|
|
|
|
(let loop ((qword (normalize-word qword)) (acc '()))
|
|
|
|
(match qword
|
|
|
|
(() (parse-pattern (string-concatenate-reverse acc)))
|
|
|
|
((('<sh-quote> qword*) . t)
|
|
|
|
(loop t (cons (pattern-quote (remove-quotes qword* ifs)) acc)))
|
|
|
|
(((? string? h) . t)
|
|
|
|
(loop t (cons h acc))))))
|
|
|
|
|
|
|
|
(define (expand-pathnames qword pwd ifs)
|
|
|
|
|
|
|
|
(define (list-matches patterns)
|
|
|
|
(let loop ((stack `(("" ,@patterns))) (acc '()))
|
|
|
|
(match stack
|
|
|
|
(() (reverse! acc))
|
|
|
|
(((path) . stack-tail)
|
|
|
|
(loop stack-tail (cons path acc)))
|
|
|
|
(((path pattern . next-patterns) . stack-tail)
|
|
|
|
(match (scandir (string-append pwd "/" path)
|
|
|
|
(cut pattern-match? pattern <>
|
|
|
|
#:explicit-initial-period? #t))
|
|
|
|
(#f (loop stack-tail acc))
|
|
|
|
(files (loop (append (map (lambda (file)
|
|
|
|
(if (string-null? path)
|
|
|
|
(cons file next-patterns)
|
|
|
|
(cons (string-append path "/" file)
|
|
|
|
next-patterns)))
|
|
|
|
files)
|
|
|
|
stack-tail)
|
|
|
|
acc)))))))
|
|
|
|
|
|
|
|
(let ((patterns (map (cut qword->pattern <> ifs)
|
|
|
|
(split-fields qword "/"))))
|
|
|
|
(if (every pattern-plain? patterns)
|
|
|
|
`(,(remove-quotes qword ifs))
|
|
|
|
(match (list-matches patterns)
|
|
|
|
(() `(,(remove-quotes qword ifs)))
|
|
|
|
(matches matches)))))
|
|
|
|
|
2018-07-12 03:05:15 +01:00
|
|
|
(define eval-cmd-sub
|
|
|
|
;; A procedure for evaluating (expanding) a command substitution.
|
|
|
|
;; This is parameterized to avoid a circular dependency.
|
|
|
|
(make-parameter (lambda (exps) (throw 'eval-cmd-sub-unset))))
|
|
|
|
|
|
|
|
(define (string-not-null? str)
|
|
|
|
"Check if @var{str} is a non-null string."
|
|
|
|
(and (string? str) (not (string-null? str))))
|
|
|
|
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(define (parameter-ref env name)
|
|
|
|
"Get the value of the variable or special parameter @var{name} in
|
|
|
|
@var{env}. If @var{name} is unset, return @code{#f}."
|
|
|
|
(match name
|
2018-11-09 03:36:11 +00:00
|
|
|
("@" `(<sh-at> ,(environment-arguments env)))
|
|
|
|
("*" (let* ((ifs (or (var-ref env "IFS")
|
|
|
|
(string #\space #\tab #\newline)))
|
|
|
|
(sep (argument-separator ifs)))
|
|
|
|
(string-join (environment-arguments env) sep)))
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
("?" (number->string (environment-status env)))
|
|
|
|
(_ (var-ref env name))))
|
|
|
|
|
|
|
|
(define (parameter-ref* env name)
|
|
|
|
"Get the value of the variable or special parameter @var{name} in
|
|
|
|
@var{env}. If @var{name} is unset, return @code{\"\"}."
|
|
|
|
(or (parameter-ref env name) ""))
|
|
|
|
|
2018-07-12 03:05:15 +01:00
|
|
|
(define (word->qword env word)
|
|
|
|
"Convert @var{word} into a qword by resolving all parameter, command,
|
|
|
|
and arithmetic substitions using the environment @var{env}."
|
|
|
|
(match word
|
|
|
|
((? string?)
|
|
|
|
word)
|
|
|
|
(('<sh-quote> quoted-word)
|
|
|
|
`(<sh-quote> ,(word->qword env quoted-word)))
|
|
|
|
(('<sh-cmd-sub> . exps)
|
|
|
|
((eval-cmd-sub) exps))
|
|
|
|
(('<sh-ref> name)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(parameter-ref* env name))
|
2018-07-12 03:05:15 +01:00
|
|
|
(('<sh-ref-or> name default)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(or (parameter-ref env name)
|
2018-07-12 03:05:15 +01:00
|
|
|
(word->qword env (or default ""))))
|
|
|
|
(('<sh-ref-or*> name default)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(let ((value (parameter-ref env name)))
|
2018-07-12 03:05:15 +01:00
|
|
|
(if (string-not-null? value)
|
|
|
|
value
|
|
|
|
(word->qword env (or default "")))))
|
|
|
|
(('<sh-ref-or!> name default)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(or (parameter-ref env name)
|
2018-07-12 03:05:15 +01:00
|
|
|
(let ((new-value (expand-word env (or default "")
|
|
|
|
#:split? #f #:rhs-tildes? #t)))
|
|
|
|
(set-var! env name new-value)
|
|
|
|
new-value)))
|
|
|
|
(('<sh-ref-or!*> name default)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(let ((value (parameter-ref env name)))
|
2018-07-12 03:05:15 +01:00
|
|
|
(if (string-not-null? value)
|
|
|
|
value
|
|
|
|
(let ((new-value (expand-word env (or default "")
|
|
|
|
#:split? #f #:rhs-tildes? #t)))
|
|
|
|
(set-var! env name new-value)
|
|
|
|
new-value))))
|
|
|
|
(('<sh-ref-assert> name message) (error "Not implemented"))
|
|
|
|
(('<sh-ref-assert*> name message) (error "Not implemented"))
|
|
|
|
(('<sh-ref-and> name value)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(if (string-not-null? (parameter-ref env name))
|
2018-07-12 03:05:15 +01:00
|
|
|
(word->qword env (or value ""))
|
|
|
|
""))
|
|
|
|
(('<sh-ref-and*> name value)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(or (and (parameter-ref env name)
|
2018-07-12 03:05:15 +01:00
|
|
|
(word->qword env (or value "")))
|
|
|
|
""))
|
|
|
|
(('<sh-ref-except-min> name pattern) (error "Not implemented"))
|
|
|
|
(('<sh-ref-except-max> name pattern) (error "Not implemented"))
|
|
|
|
(('<sh-ref-skip-min> name pattern) (error "Not implemented"))
|
|
|
|
(('<sh-ref-skip-max> name pattern) (error "Not implemented"))
|
|
|
|
(('<sh-ref-length> name)
|
Add 'status' field to environment
Instead of using an environment variable named '?', we will use a
special environment field called 'status'. This lets us get rid of a
lot of number-string conversions (since an environment variable has to
have a string value).
* geesh/environment.scm (<environment>): Add a 'status' field.
(make-environment): Set it to 0 by default.
* geesh/repl.scm (run-repl): Use new field in place of '?' variable.
* geesh/shell.scm (exec-utility, sh:and, sh:exec-let, sh:for, sh:not,
sh:or, sh:pipeline, sh:subshell, sh:substitute-command): Ditto.
* geesh/word.scm (parameter-ref): New function that handles both
special parameters (e.g., '?') and variables.
(parameter-ref*): Like 'var-ref*', but for 'parameter-ref'.
(word->qword): Replace 'var-ref' and 'var-ref*' with 'parameter-ref'
and 'parameter-ref*' respectively.
2018-11-09 02:29:19 +00:00
|
|
|
(number->string (string-length (parameter-ref* env name))))
|
2018-07-12 03:05:15 +01:00
|
|
|
(_ (map (cut word->qword env <>) word))))
|
|
|
|
|
|
|
|
(define* (expand-word env word #:key (split? #t) (rhs-tildes? #f))
|
|
|
|
"Expand @var{word} into a list of fields using the environment
|
|
|
|
@var{env}."
|
2018-11-09 21:35:06 +00:00
|
|
|
;; The value of '$IFS' may depend on side-effects performed during
|
|
|
|
;; 'word->qword', so use 'let*' here.
|
|
|
|
(let* ((qword (word->qword env word))
|
|
|
|
(ifs (or (and env (var-ref env "IFS"))
|
2018-11-20 20:02:09 +00:00
|
|
|
(string #\space #\tab #\newline)))
|
|
|
|
(pwd (and env (var-ref env "PWD"))))
|
2018-07-12 03:05:15 +01:00
|
|
|
(if split?
|
2018-11-20 20:02:09 +00:00
|
|
|
(if pwd
|
|
|
|
(append-map (cut expand-pathnames <> pwd ifs)
|
|
|
|
(split-fields qword ifs))
|
|
|
|
(map (cut remove-quotes <> ifs)
|
|
|
|
(split-fields qword ifs)))
|
2018-11-09 03:23:17 +00:00
|
|
|
(remove-quotes qword ifs))))
|