comparison lisp/mule/japanese.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 ac37a5f7e5be
children
comparison
equal deleted inserted replaced
5881:31dd275fa683 5882:bbe4146603db
442 ;; little helps there.) 442 ;; little helps there.)
443 (set-language-info "Japanese" 443 (set-language-info "Japanese"
444 'native-coding-system 444 'native-coding-system
445 ;; first, see if an explicit encoding was given. 445 ;; first, see if an explicit encoding was given.
446 (lambda (locale) 446 (lambda (locale)
447 (let ((case-fold-search t)) 447 (or
448 (cond 448 (let ((locale (canoncase locale)))
449 ;; many unix versions 449 (cond
450 ((string-match "\\.euc" locale) 'euc-jp) 450 ;; many unix versions
451 ((string-match "\\.sjis" locale) 'shift-jis) 451 ((search ".euc" locale) 'euc-jp)
452 452 ((search ".sjis" locale) 'shift-jis)
453 ;; X11R6 (CJKV p. 471) 453
454 ((string-match "\\.jis7" locale) 'jis7) 454 ;; X11R6 (CJKV p. 471)
455 ((string-match "\\.jis8" locale) 'jis8) 455 ((search ".jis7" locale) 'jis7)
456 ((string-match "\\.mscode" locale) 'shift-jis) 456 ((search ".jis8" locale) 'jis8)
457 ((string-match "\\.pjis" locale) 'iso-2022-jp) 457 ((search ".mscode" locale) 'shift-jis)
458 ((string-match "\\.ujis" locale) 'euc-jp) 458 ((search ".pjis" locale) 'iso-2022-jp)
459 459 ((search ".ujis" locale) 'euc-jp)
460 ;; other names in X11R6 locale.alias 460
461 ((string-match "\\.ajec" locale) 'euc-jp) 461 ;; other names in X11R6 locale.alias
462 ((string-match "-euc" locale) 'euc-jp) 462 ((search ".ajec" locale) 'euc-jp)
463 ((string-match "\\.iso-2022-jp" locale) 'iso-2022-jp) 463 ((search "-euc" locale) 'euc-jp)
464 ((string-match "\\.jis" locale) 'jis7) ;; or just jis? 464 ((search ".iso-2022-jp" locale) 'iso-2022-jp)
465 465 ((search ".jis" locale) 'jis7))) ;; or just jis?
466 ;; aix (CJKV p. 465) 466 ;; aix (CJKV p. 465)
467 ((and (eq system-type 'aix) 467 (when (eq system-type 'aix)
468 (string-match "^Ja_JP" locale)) 'shift-jis) 468 (cond
469 ((and (eq system-type 'aix) 469 ;; Case sensitive!
470 (string-match "^ja_JP" locale)) 'euc-jp) 470 ((not (mismatch "Ja_JP" locale
471 471 :end2 (length "Ja_JP")))
472 ;; other X11R6 locale.alias 472 'shift-jis)
473 ((string-match "^Jp_JP" locale) 'euc-jp) 473 ((not (mismatch "ja_JP" locale
474 ((and (eq system-type 'hpux) (eq locale "japanese")) 474 :end2 (length "ja_JP")))
475 'shift-jis) 475 'euc-jp)))
476 ;; fallback 476 (cond
477 (t 'euc-jp))))) 477 ;; other X11R6 locale.alias
478 ((not (mismatch "Jp_JP" locale :end2 (length "Jp_JP")))
479 'euc-jp)
480 ((and (eq system-type 'hpux)
481 (equalp locale "japanese"))
482 'shift-jis)
483 ;; fallback
484 (t 'euc-jp)))))
478 485
479 ;;; japanese.el ends here 486 ;;; japanese.el ends here