comparison lisp/files.el @ 5882:bbe4146603db

Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp lisp/ChangeLog addition: 2015-04-01 Aidan Kehoe <kehoea@parhasard.net> When calling #'string-match with a REGEXP without regular expression special characters, call #'search, #'mismatch, #'find, etc. instead, making our code less likely to side-effect other functions' match data and a little faster. * apropos.el (apropos-command): * apropos.el (apropos): Call (position ?\n ...) rather than (string-match "\n" ...) here. * buff-menu.el: * buff-menu.el (buffers-menu-omit-invisible-buffers): Don't fire up the regexp engine just to check if a string starts with a space. * buff-menu.el (select-buffers-tab-buffers-by-mode): Don't fire up the regexp engine just to compare mode basenames. * buff-menu.el (format-buffers-tab-line): * buff-menu.el (build-buffers-tab-internal): Moved to being a label within the following. * buff-menu.el (buffers-tab-items): Use the label. * bytecomp.el (byte-compile-log-1): Don't fire up the regexp engine just to look for a newline. * cus-edit.el (get): Ditto. * cus-edit.el (custom-variable-value-create): Ditto, but for a colon. * descr-text.el (describe-text-sexp): Ditto. * descr-text.el (describe-char-unicode-data): Use #'split-string-by-char given that we're just looking for a semicolon. * descr-text.el (describe-char): Don't fire up the regexp engine just to look for a newline. * disass.el (disassemble-internal): Ditto. * files.el (file-name-sans-extension): Implement this using #'position. * files.el (file-name-extension): Correct this function's docstring, implement it in terms of #'position. * files.el (insert-directory): Don't fire up the regexp engine to split a string by space; don't reverse the list of switches, this is actually a longstand bug as far as I can see. * gnuserv.el (gnuserv-process-filter): Use #'position here, instead of consing inside #'split-string needlessly. * gtk-file-dialog.el (gtk-file-dialog-update-dropdown): Use #'split-string-by-char here, don't fire up #'split-string for directory-sep-char. * gtk-font-menu.el (hack-font-truename): Implement this more cheaply in terms of #'find, #'split-string-by-char, #'equal, rather than #'string-match, #'split-string, #'string-equal. * hyper-apropos.el (hyper-apropos-grok-functions): * hyper-apropos.el (hyper-apropos-grok-variables): Look for a newline using #'position rather than #'string-match in these functions. * info.el (Info-insert-dir): * info.el (Info-insert-file-contents): * info.el (Info-follow-reference): * info.el (Info-extract-menu-node-name): * info.el (Info-menu): Look for fixed strings using #'position or #'search as appropriate in this file. * ldap.el (ldap-decode-string): * ldap.el (ldap-encode-string): #'encode-coding-string, #'decode-coding-string are always available, don't check if they're fboundp. * ldap.el (ldap-decode-address): * ldap.el (ldap-encode-address): Use #'split-string-by-char in these functions. * lisp-mnt.el (lm-creation-date): * lisp-mnt.el (lm-last-modified-date): Don't fire up the regexp engine just to look for spaces in this file. * menubar-items.el (default-menubar): Use (not (mismatch ...)) rather than #'string-match here, for simple regexp. Use (search "beta" ...) rather than (string-match "beta" ...) * menubar-items.el (sort-buffers-menu-alphabetically): * menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically): * menubar-items.el (group-buffers-menu-by-mode-then-alphabetically): Don't fire up the regexp engine to check if a string starts with a space or an asterisk. Use the more fine-grained results of #'compare-strings; compare case-insensitively for the buffer menu. * menubar-items.el (list-all-buffers): * menubar-items.el (tutorials-menu-filter): Use #'equal rather than #'string-equal, which, in this context, has the drawback of not having a bytecode, and no redeeming features. * minibuf.el: * minibuf.el (un-substitute-in-file-name): Use #'count, rather than counting the occurences of $ using the regexp engine. * minibuf.el (read-file-name-internal-1): Don't fire up the regexp engine to search for ?=. * mouse.el (mouse-eval-sexp): Check for newline with #'find. * msw-font-menu.el (mswindows-reset-device-font-menus): Split a string by newline with #'split-string-by-char. * mule/japanese.el: * mule/japanese.el ("Japanese"): Use #'search rather than #'string-match; canoncase before comparing; fix a bug I had introduced where I had been making case insensitive comparisons where the case mattered. * mule/korea-util.el (default-korean-keyboard): Look for ?3 using #'find, not #'string-march. * mule/korea-util.el (quail-hangul-switch-hanja): Search for a fixed string using #'search. * mule/mule-cmds.el (set-locale-for-language-environment): #'position, #'substitute rather than #'string-match, #'replace-in-string. * newcomment.el (comment-make-extra-lines): Use #'search rather than #'string-match for a simple string. * package-get.el (package-get-remote-filename): Use #'position when looking for ?@ * process.el (setenv): * process.el (read-envvar-name): Use #'position when looking for ?=. * replace.el (map-query-replace-regexp): Use #'split-string-by-char instead of using an inline implementation of it. * select.el (select-convert-from-cf-text): * select.el (select-convert-from-cf-unicodetext): Use #'position rather than #'string-match in these functions. * setup-paths.el (paths-emacs-data-root-p): Use #'search when looking for simple string. * sound.el (load-sound-file): Use #'split-string-by-char rather than an inline reimplementation of same. * startup.el (splash-screen-window-body): * startup.el (splash-screen-tty-body): Search for simple strings using #'search. * version.el (emacs-version): Ditto. * x-font-menu.el (hack-font-truename): Implement this more cheaply in terms of #'find, #'split-string-by-char, #'equal, rather than #'string-match, #'split-string, #'string-equal. * x-font-menu.el (x-reset-device-font-menus-core): Use #'split-string-by-char here. * x-init.el (x-initialize-keyboard): Search for a simple string using #'search.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 01 Apr 2015 14:28:20 +0100
parents 182d01410b8d
children
comparison
equal deleted inserted replaced
5881:31dd275fa683 5882:bbe4146603db
2485 (= (nth 2 attributes) (user-uid))))))) 2485 (= (nth 2 attributes) (user-uid)))))))
2486 2486
2487 (defun file-name-sans-extension (filename) 2487 (defun file-name-sans-extension (filename)
2488 "Return FILENAME sans final \"extension\". 2488 "Return FILENAME sans final \"extension\".
2489 The extension, in a file name, is the part that follows the last `.'." 2489 The extension, in a file name, is the part that follows the last `.'."
2490 (save-match-data 2490 (let* ((file (file-name-sans-versions (file-name-nondirectory filename)))
2491 (let ((file (file-name-sans-versions (file-name-nondirectory filename))) 2491 (position (position ?. file :from-end t))
2492 directory) 2492 (directory (and position (file-name-directory filename))))
2493 (if (string-match "\\.[^.]*\\'" file) 2493 (if position
2494 (if (setq directory (file-name-directory filename)) 2494 (if directory
2495 (expand-file-name (substring file 0 (match-beginning 0)) 2495 (expand-file-name (subseq file 0 position) directory)
2496 directory) 2496 (subseq file 0 position))
2497 (substring file 0 (match-beginning 0))) 2497 filename)))
2498 filename))))
2499 2498
2500 (defun file-name-extension (filename &optional period) 2499 (defun file-name-extension (filename &optional period)
2501 "Return FILENAME's final \"extension\". 2500 "Return FILENAME's final \"extension\".
2502 The extension, in a file name, is the part that follows the last `.'. 2501 The extension, in a file name, is the part that follows the last `.'.
2503 Return nil for extensionless file names such as `foo'. 2502 Return nil for extensionless file names such as `foo'.
2504 Return the empty string for file names such as `foo'. 2503 Return the empty string for file names such as `foo.'
2505 2504
2506 If PERIOD is non-nil, then the returned value includes the period 2505 If PERIOD is non-nil, then the returned value includes the period
2507 that delimits the extension, and if FILENAME has no extension, 2506 that delimits the extension, and if FILENAME has no extension,
2508 the value is \"\"." 2507 the value is \"\"."
2509 (save-match-data 2508 (let* ((file (file-name-sans-versions (file-name-nondirectory filename)))
2510 (let ((file (file-name-sans-versions (file-name-nondirectory filename)))) 2509 (position (position ?. file :from-end t)))
2511 (if (string-match "\\.[^.]*\\'" file) 2510 (if (and position (not (eql position 0)))
2512 (substring file (+ (match-beginning 0) (if period 0 1))) 2511 (subseq file (+ position (if period 0 1)))
2513 (if period 2512 (if period ""))))
2514 "")))))
2515 2513
2516 (defcustom make-backup-file-name-function nil 2514 (defcustom make-backup-file-name-function nil
2517 "A function to use instead of the default `make-backup-file-name'. 2515 "A function to use instead of the default `make-backup-file-name'.
2518 A value of nil gives the default `make-backup-file-name' behaviour. 2516 A value of nil gives the default `make-backup-file-name' behaviour.
2519 2517
4245 pattern))) 4243 pattern)))
4246 ;; SunOS 4.1.3, SVr4 and others need the "." to list the 4244 ;; SunOS 4.1.3, SVr4 and others need the "." to list the
4247 ;; directory if FILE is a symbolic link. 4245 ;; directory if FILE is a symbolic link.
4248 (apply 'call-process 4246 (apply 'call-process
4249 insert-directory-program nil t nil 4247 insert-directory-program nil t nil
4250 (let (list) 4248 (append (if (listp switches)
4251 (if (listp switches) 4249 switches
4252 (setq list switches) 4250 (split-string-by-char switches ?\ ))
4253 (if (not (equal switches "")) 4251 (list
4254 (let ((switches switches)) 4252 (if full-directory-p
4255 ;; Split the switches at any spaces 4253 (concat (file-name-as-directory file) ".")
4256 ;; so we can pass separate options as separate args. 4254 file)))))))
4257 (while (string-match " " switches)
4258 (setq list (cons (substring switches 0 (match-beginning 0))
4259 list)
4260 switches (substring switches (match-end 0))))
4261 (setq list (cons switches list)))))
4262 (append list
4263 (list
4264 (if full-directory-p
4265 (concat (file-name-as-directory file)
4266 ;;#### Unix-specific
4267 ".")
4268 file))))))))
4269 4255
4270 ;; If we got "//DIRED//" in the output, it means we got a real 4256 ;; If we got "//DIRED//" in the output, it means we got a real
4271 ;; directory listing, even if `ls' returned nonzero. 4257 ;; directory listing, even if `ls' returned nonzero.
4272 ;; So ignore any errors. 4258 ;; So ignore any errors.
4273 (when (if (stringp switches) 4259 (when (if (stringp switches)
4292 (with-temp-buffer 4278 (with-temp-buffer
4293 (call-process "ls" nil t nil "--version") 4279 (call-process "ls" nil t nil "--version")
4294 (buffer-string)))) 4280 (buffer-string))))
4295 (if (string-match "ls (.*utils) \\([0-9.]*\\)$" version-out) 4281 (if (string-match "ls (.*utils) \\([0-9.]*\\)$" version-out)
4296 (let* ((version (match-string 1 version-out)) 4282 (let* ((version (match-string 1 version-out))
4297 (split (split-string version "[.]")) 4283 (split (split-string-by-char version ?.))
4298 (numbers (mapcar 'string-to-int split)) 4284 (numbers (mapcar 'string-to-int split))
4299 (min '(5 2 1)) 4285 (min '(5 2 1))
4300 comparison) 4286 comparison)
4301 (while (and (not comparison) (or numbers min)) 4287 (while (and (not comparison) (or numbers min))
4302 (cond ((null min) 4288 (cond ((null min)