-;;; em-pred.el --- argument predicates and modifiers (ala zsh)
+;;; em-pred.el --- argument predicates and modifiers (ala zsh) -*- lexical-binding:t -*-
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;;; Code:
+(require 'esh-util)
+(require 'esh-arg)
(eval-when-compile (require 'eshell))
;;;###autoload
-(eshell-defgroup eshell-pred nil
+(progn
+(defgroup eshell-pred nil
"This module allows for predicates to be applied to globbing
patterns (similar to zsh), in addition to string modifiers which can
be applied either to globbing results, variable references, or just
ordinary strings."
:tag "Value modifiers and predicates"
- :group 'eshell-module)
+ :group 'eshell-module))
;;; User Variables:
-(defcustom eshell-pred-load-hook '(eshell-pred-initialize)
+(defcustom eshell-pred-load-hook nil
"A list of functions to run when `eshell-pred' is loaded."
+ :version "24.1" ; removed eshell-pred-initialize
:type 'hook
:group 'eshell-pred)
(?s . (eshell-pred-file-mode 4000)) ; setuid
(?S . (eshell-pred-file-mode 2000)) ; setgid
(?t . (eshell-pred-file-mode 1000)) ; sticky bit
- (?U . '(lambda (file) ; owned by effective uid
- (if (file-exists-p file)
- (= (nth 2 (file-attributes file)) (user-uid)))))
-;;; (?G . '(lambda (file) ; owned by effective gid
-;;; (if (file-exists-p file)
-;;; (= (nth 2 (file-attributes file)) (user-uid)))))
- (?* . '(lambda (file)
- (and (file-regular-p file)
- (not (file-symlink-p file))
- (file-executable-p file))))
+ (?U . #'(lambda (file) ; owned by effective uid
+ (if (file-exists-p file)
+ (= (nth 2 (file-attributes file)) (user-uid)))))
+ ;; (?G . #'(lambda (file) ; owned by effective gid
+ ;; (if (file-exists-p file)
+ ;; (= (nth 2 (file-attributes file)) (user-uid)))))
+ (?* . #'(lambda (file)
+ (and (file-regular-p file)
+ (not (file-symlink-p file))
+ (file-executable-p file))))
(?l . (eshell-pred-file-links))
(?u . (eshell-pred-user-or-group ?u "user" 2 'eshell-user-id))
(?g . (eshell-pred-user-or-group ?g "group" 3 'eshell-group-id))
(put 'eshell-predicate-alist 'risky-local-variable t)
(defcustom eshell-modifier-alist
- '((?E . '(lambda (lst)
- (mapcar
- (function
- (lambda (str)
- (eshell-stringify
- (car (eshell-parse-argument str))))) lst)))
- (?L . '(lambda (lst)
- (mapcar 'downcase lst)))
- (?U . '(lambda (lst)
- (mapcar 'upcase lst)))
- (?C . '(lambda (lst)
- (mapcar 'capitalize lst)))
- (?h . '(lambda (lst)
- (mapcar 'file-name-directory lst)))
+ '((?E . #'(lambda (lst)
+ (mapcar
+ (function
+ (lambda (str)
+ (eshell-stringify
+ (car (eshell-parse-argument str)))))
+ lst)))
+ (?L . #'(lambda (lst) (mapcar 'downcase lst)))
+ (?U . #'(lambda (lst) (mapcar 'upcase lst)))
+ (?C . #'(lambda (lst) (mapcar 'capitalize lst)))
+ (?h . #'(lambda (lst) (mapcar 'file-name-directory lst)))
(?i . (eshell-include-members))
(?x . (eshell-include-members t))
- (?r . '(lambda (lst)
- (mapcar 'file-name-sans-extension lst)))
- (?e . '(lambda (lst)
- (mapcar 'file-name-extension lst)))
- (?t . '(lambda (lst)
- (mapcar 'file-name-nondirectory lst)))
- (?q . '(lambda (lst)
- (mapcar 'eshell-escape-arg lst)))
- (?u . '(lambda (lst)
- (eshell-uniqify-list lst)))
- (?o . '(lambda (lst)
- (sort lst 'string-lessp)))
- (?O . '(lambda (lst)
- (nreverse (sort lst 'string-lessp))))
+ (?r . #'(lambda (lst) (mapcar 'file-name-sans-extension lst)))
+ (?e . #'(lambda (lst) (mapcar 'file-name-extension lst)))
+ (?t . #'(lambda (lst) (mapcar 'file-name-nondirectory lst)))
+ (?q . #'(lambda (lst) (mapcar 'eshell-escape-arg lst)))
+ (?u . #'(lambda (lst) (eshell-uniqify-list lst)))
+ (?o . #'(lambda (lst) (sort lst 'string-lessp)))
+ (?O . #'(lambda (lst) (nreverse (sort lst 'string-lessp))))
(?j . (eshell-join-members))
(?S . (eshell-split-members))
(?R . 'reverse)
OWNERSHIP:
U owned by effective uid
- u(UID|'user') owned by UID/user
- g(GID|'group') owned by GID/group
+ u(UID|\\='user\\=') owned by UID/user
+ g(GID|\\='group\\=') owned by GID/group
FILE ATTRIBUTES:
l[+-]N +/-/= N links
- a[Mwhms][+-](N|'FILE') access time +/-/= N mnths/weeks/hours/mins/secs
+ a[Mwhms][+-](N|\\='FILE\\=') access time +/-/= N months/weeks/hours/mins/secs
(days if unspecified) if FILE specified,
- use as comparison basis; so a+'file.c'
+ use as comparison basis; so a+\\='file.c\\='
shows files accessed before file.c was
last accessed
- m[Mwhms][+-](N|'FILE') modification time...
- c[Mwhms][+-](N|'FILE') change time...
+ m[Mwhms][+-](N|\\='FILE\\=') modification time...
+ c[Mwhms][+-](N|\\='FILE\\=') change time...
L[kmp][+-]N file size +/-/= N Kb/Mb/blocks
EXAMPLES:
***/*~f*(-/) recursively (though not traversing symlinks),
find all directories (or symlinks referring to
directories) whose names do not begin with f.
- e*(*Lk+50) executables 50k or larger beginning with 'e'")
+ e*(*Lk+50) executables 50k or larger beginning with `e'")
(defvar eshell-modifier-help-string
"Eshell modifier quick reference:
(defun eshell-parse-modifiers ()
"Parse value modifiers and predicates at point.
-If ALLOW-PREDS is non-nil, predicates will be parsed as well.
Return a cons cell of the form
(PRED-FUNC-LIST . MOD-FUNC-LIST)
-NEW-STRING is STRING minus any modifiers. PRED-FUNC-LIST is a list of
-predicate functions. MOD-FUNC-LIST is a list of result modifier
-functions. PRED-FUNCS take a filename and return t if the test
-succeeds; MOD-FUNCS take any string and preform a modification,
-returning the resultant string."
- (let (result negate follow preds mods)
- (condition-case err
+PRED-FUNC-LIST is a list of predicate functions. MOD-FUNC-LIST
+is a list of result modifier functions. PRED-FUNCS take a
+filename and return t if the test succeeds; MOD-FUNCS take any
+list of strings and perform a modification, returning the
+resultant list of strings."
+ (let (negate follow preds mods)
+ (condition-case nil
(while (not (eobp))
(let ((char (char-after)))
(cond
(if (and func (functionp func))
(setq preds (eshell-add-pred-func func preds
negate follow))
- (error "Invalid function predicate '%s'"
+ (error "Invalid function predicate `%s'"
(eshell-stringify func))))
(error "Invalid function predicate")))
((eq char ?^)
(cons `(lambda (lst)
(mapcar (function ,func) lst))
mods))
- (error "Invalid function modifier '%s'"
+ (error "Invalid function modifier `%s'"
(eshell-stringify func))))
(error "Invalid function modifier")))
((eq char ?:)
(forward-char)
(let ((mod (assq (char-after) eshell-modifier-alist)))
(if (not mod)
- (error "Unknown modifier character '%c'" (char-after))
+ (error "Unknown modifier character `%c'" (char-after))
(forward-char)
(setq mods (cons (eval (cdr mod)) mods)))))
(t
(let ((pred (assq char eshell-predicate-alist)))
(if (not pred)
- (error "Unknown predicate character '%c'" char)
+ (error "Unknown predicate character `%c'" char)
(forward-char)
(setq preds
(eshell-add-pred-func (eval (cdr pred)) preds
(defun eshell-pred-file-time (mod-char mod-type attr-index)
"Return a predicate to test whether a file matches a certain time."
(let* ((quantum 86400)
- qual amount when open close end)
+ qual when open close end)
(when (memq (char-after) '(?M ?w ?h ?m ?s))
(setq quantum (char-after))
(cond
(defun eshell-pred-file-type (type)
"Return a test which tests that the file is of a certain TYPE.
TYPE must be a character, and should be one of the possible options
-that 'ls -l' will show in the first column of its display. "
+that `ls -l' will show in the first column of its display. "
(when (eq type ?%)
(setq type (char-after))
(if (memq type '(?b ?c))