comparison lisp/apropos.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 308d34e9f07d
children
comparison
equal deleted inserted replaced
5881:31dd275fa683 5882:bbe4146603db
175 (or (function-obsoleteness-doc symbol) 175 (or (function-obsoleteness-doc symbol)
176 (condition-case nil 176 (condition-case nil
177 (documentation symbol t) 177 (documentation symbol t)
178 (void-function "(aliased to undefined function)") 178 (void-function "(aliased to undefined function)")
179 (error "(unexpected error from `documention')")))) 179 (error "(unexpected error from `documention')"))))
180 (substring doc 0 (string-match "\n" doc)) 180 (subseq doc 0 (position ?\n doc))
181 "(not documented)")) 181 "(not documented)"))
182 (and do-all 182 (and do-all
183 (user-variable-p symbol) 183 (user-variable-p symbol)
184 (if (setq doc 184 (if (setq doc
185 (or 185 (or
186 ;; XEmacs change: if obsolete, 186 ;; XEmacs change: if obsolete,
187 ;; only mention that. 187 ;; only mention that.
188 (variable-obsoleteness-doc symbol) 188 (variable-obsoleteness-doc symbol)
189 (documentation-property 189 (documentation-property
190 symbol 'variable-documentation t))) 190 symbol 'variable-documentation t)))
191 (substring doc 0 191 (subseq doc 0 (position ?\n doc))))))
192 (string-match "\n" doc))))))
193 (setq p (cdr p))))) 192 (setq p (cdr p)))))
194 nil)) 193 nil))
195 194
196 195
197 ;;;###autoload 196 ;;;###autoload
228 (or (function-obsoleteness-doc symbol) 227 (or (function-obsoleteness-doc symbol)
229 (condition-case nil 228 (condition-case nil
230 (documentation symbol t) 229 (documentation symbol t)
231 (void-function "(aliased to undefined function)") 230 (void-function "(aliased to undefined function)")
232 (error "(unexpected error from `documention')")))) 231 (error "(unexpected error from `documention')"))))
233 (substring doc 0 (string-match "\n" doc)) 232 (subseq doc 0 (position ?\n doc))
234 "(not documented)")) 233 "(not documented)"))
235 (if (boundp symbol) 234 (if (boundp symbol)
236 (if (setq doc 235 (if (setq doc
237 (or 236 (or
238 ;; XEmacs change: if obsolete, 237 ;; XEmacs change: if obsolete,
239 ;; only mention that. 238 ;; only mention that.
240 (variable-obsoleteness-doc symbol) 239 (variable-obsoleteness-doc symbol)
241 (documentation-property 240 (documentation-property
242 symbol 'variable-documentation t))) 241 symbol 'variable-documentation t)))
243 (substring doc 0 242 (subseq doc 0 (position ?\n doc))
244 (string-match "\n" doc))
245 "(not documented)")) 243 "(not documented)"))
246 (if (setq doc (symbol-plist symbol)) 244 (if (setq doc (symbol-plist symbol))
247 (if (eq (/ (length doc) 2) 1) 245 (if (eq (/ (length doc) 2) 1)
248 (format "1 property (%s)" (car doc)) 246 (format "1 property (%s)" (car doc))
249 (format "%d properties" (/ (length doc) 2)))) 247 (format "%d properties" (/ (length doc) 2))))
250 (if (get symbol 'widget-type) 248 (if (get symbol 'widget-type)
251 (if (setq doc (documentation-property 249 (if (setq doc (documentation-property
252 symbol 'widget-documentation t)) 250 symbol 'widget-documentation t))
253 (substring doc 0 251 (subseq doc 0 (position ?\n doc))
254 (string-match "\n" doc))
255 "(not documented)")) 252 "(not documented)"))
256 (if (find-face symbol) 253 (if (find-face symbol)
257 (if (setq doc (face-doc-string symbol)) 254 (if (setq doc (face-doc-string symbol))
258 (substring doc 0 255 (subseq doc 0 (position ?\n doc))
259 (string-match "\n" doc))
260 "(not documented)")) 256 "(not documented)"))
261 (when (get symbol 'custom-group) 257 (when (get symbol 'custom-group)
262 (if (setq doc (documentation-property 258 (if (setq doc (documentation-property
263 symbol 'group-documentation t)) 259 symbol 'group-documentation t))
264 (substring doc 0 260 (subseq doc 0 (position ?\n doc))
265 (string-match "\n" doc))
266 "(not documented)")))) 261 "(not documented)"))))
267 (setq p (cdr p))))) 262 (setq p (cdr p)))))
268 nil)) 263 nil))
269 264
270 265