Mercurial > hg > xemacs-beta
view src/intl.c @ 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 |
line wrap: on
line source
/* Various functions for internationalizing XEmacs. Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 2000, 2001, 2002 Ben Wing. This file is part of XEmacs. XEmacs 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. XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11_XLOCALE_H) #include <X11/Xlocale.h> #else #ifdef HAVE_LOCALE_H #include <locale.h> #endif #endif #ifdef HAVE_X_WINDOWS int init_x_locale (Lisp_Object locale); #endif DEFUN ("current-locale", Fcurrent_locale, 0, 0, 0, /* Return the current locale. This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, or .ENCODING. Unfortunately, the meanings of these three values are system-dependent, and there is no universal agreement. */ ()) { Extbyte *loc; loc = setlocale (LC_CTYPE, NULL); if (!loc) return Qnil; return build_extstring (loc, Qctext); } DEFUN ("set-current-locale", Fset_current_locale, 1, 1, 0, /* Set the user's current locale. Takes a string, the value passed to setlocale(). This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, or .ENCODING. Unfortunately, the meanings of these three values are system-dependent, and there is no universal agreement. This function is meant to be called only from `set-language-environment', which keeps tables to figure out the values to use for particular systems. If the empty string is passed in, the locale is initialized from environment variables. Returns nil if the call failed (typically, an invalid locale was given). Otherwise, returns the locale, or possibly a more-specified version. */ (locale)) { Extbyte *loc; Lisp_Object str; CHECK_STRING (locale); /* RedHat 6.2 contains a locale called "Francais" with the C-cedilla encoded in ISO2022! */ loc = LISP_STRING_TO_EXTERNAL (locale, Qctext); loc = setlocale (LC_ALL, loc); if (!loc) return Qnil; loc = xstrdup (loc); setlocale (LC_NUMERIC, "C"); #ifdef HAVE_X_WINDOWS if (!init_x_locale (locale)) { /* Locale not supported under X. Put it back. */ setlocale (LC_ALL, loc); setlocale (LC_NUMERIC, "C"); free (loc); return Qnil; } #endif str = build_extstring (loc, Qctext); xfree (loc); return str; } #if 0 /* #### some old code that I really want to nuke, but I'm not completely sure what it did, so I'll leave it until we get around to implementing message-translation and decide whether the functionality that this is trying to support makes any sense. --ben */ Lisp_Object Qdefer_gettext; DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* If OBJECT is of the form (defer-gettext "string"), return the string. The purpose of the defer-gettext symbol is to identify strings which are translated when they are referenced instead of when they are defined. */ (object)) { if (CONSP (object) && SYMBOLP (Fcar (object)) && EQ (Fcar (object), Qdefer_gettext)) return Fcar (Fcdr (object)); else return object; } #endif /* 0 */ DEFUN ("gettext", Fgettext, 1, 1, 0, /* Look up STRING in the default message domain and return its translation. This function does nothing if I18N3 was not enabled when Emacs was compiled. */ (string)) { #ifdef I18N3 /* #### What should happen here is: 1) If the string has no `string-translatable' property or its value is nil, no translation takes place. The `string-translatable' property only gets added when a constant string is read in from a .el or .elc file, to avoid excessive translation. (The user can also explicitly add this property to a string.) 2) If the string's `string-translatable' property is a string, that string should be returned. `format' add this property. This allows translation to take place at the proper time but avoids excessive translation if the string is not destined for a translating stream. (See print_internal().) 3) If gettext() returns the same string, then Fgettext() should return the same object, minus the 'string-translatable' property. */ #endif return string; } #ifdef I18N3 /* #### add the function `force-gettext', perhaps in Lisp. This ignores the `string-translatable' property and simply calls gettext() on the string. Add the functions `set-string-translatable' and `set-stream-translating'. */ #endif /************************************************************************/ /* initialization */ /************************************************************************/ void init_intl (void) { /* This function cannot GC, because it explicitly prevents it. */ if (initialized) { int count = begin_gc_forbidden (); Lisp_Object args[2]; specbind (Qinhibit_quit, Qt); args[0] = Qreally_early_error_handler; args[1] = intern ("init-locale-at-early-startup"); Fcall_with_condition_handler (2, args); /* Should be calling this here, but problems with `data-directory' and locating the files. See comment in mule-cmds.el:`init-mule-at-startup'. args[1] = intern ("init-unicode-at-early-startup"); Fcall_with_condition_handler (2, args); */ unbind_to (count); } } void syms_of_intl (void) { DEFSUBR (Fgettext); DEFSUBR (Fset_current_locale); DEFSUBR (Fcurrent_locale); } void vars_of_intl (void) { #ifdef I18N3 Fprovide (intern ("i18n3")); #endif #ifdef MULE Fprovide (intern ("mule")); #endif /* MULE */ }