annotate lib-src/config.values.sh @ 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 b9167d522a9a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
1 : #-*- Perl -*-
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
2 eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
3 if 0;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
4
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 # config.values.sh --- create config.values.in from ../configure
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6
5290
e6508b64ee08 More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents: 2651
diff changeset
7 # Copyright (C) 1997, 1999 Martin Buchholz
e6508b64ee08 More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents: 2651
diff changeset
8
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 # Author: Martin Buchholz
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 # Maintainer: Martin Buchholz
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 # Keywords: configure elisp report-xemacs-bugs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 # This file is part of XEmacs.
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
14 #
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
15 # XEmacs is free software: you can redistribute it and/or modify it
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
16 # under the terms of the GNU General Public License as published by the
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
17 # Free Software Foundation, either version 3 of the License, or (at your
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
18 # option) any later version.
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
19 #
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
20 # XEmacs is distributed in the hope that it will be useful, but WITHOUT
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
21 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
22 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
23 # for more details.
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
24 #
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 # You should have received a copy of the GNU General Public License
5402
308d34e9f07d Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents: 2651
diff changeset
26 # along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 ### Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ## Extract all the @foo@ configuration symbols from ../configure
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 ## to make them available to elisp later (see util/config.el)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ## Primarily useful for creating ridiculously verbose bug reports.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 ##
543
7e84f0c36c66 [xemacs-hg @ 2001-05-17 13:44:34 by stephent]
stephent
parents: 434
diff changeset
34 ## See lisp/config.el, ../configure.in,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 ## and the Autoconf documentation on AC_OUTPUT, for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 ##
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 ## This script needs only to be run occasionally (before a Net release)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 ## by an XEmacs Maintainer (consider yourself so blessed, if you are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 ## actually reading this commentary).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 ##
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
41
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
42 if (! -r "./configure") {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
43 chdir ".." or die "Can't chdir: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
44 if (! -r "./configure") {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
45 die "Can't find configure!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
46 }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
47 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
49 sub FileContents {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
50 local $/ = undef; # Slurp mode
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
51 open (FILE, "< $_[0]") or die "$_[0]: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
52 my $contents = <FILE>;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
53 close FILE or die "$_[0]: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
54 return $contents;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
55 }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
56
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
57 my $configure_contents = FileContents "./configure";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
58 my $cvi_contents = FileContents "lib-src/config.values.in";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
59
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
60 my $new_cvi_contents =
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
61 ";;; Do not edit this file!
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 ;;; This file was automatically generated, by the config.values.sh script,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 ;;; from configure, which was itself automatically generated from configure.in.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 ;;;
543
7e84f0c36c66 [xemacs-hg @ 2001-05-17 13:44:34 by stephent]
stephent
parents: 434
diff changeset
65 ;;; See lisp/config.el for details on how this file is used.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 ;;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 ;;; You are trapped in a twisty maze of strange-looking files, all autogenerated...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 ;;; configure is created, from configure.in, by autoconf
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 ;;; config.values.in is created, from configure, by config.values.sh
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 ;;; config.values is created, from config.values.in, by configure
543
7e84f0c36c66 [xemacs-hg @ 2001-05-17 13:44:34 by stephent]
stephent
parents: 434
diff changeset
72 ;;; config.values is read by lisp/config.el,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 ;;; to create the (Lisp object) config-value-hash-table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 ;;; Variables defined in configure by AC_SUBST follow:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 ;;; (These are used in Makefiles)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
78 ";
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
80 my %done;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
81 for my $var (sort { $a cmp $b }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
82 $configure_contents =~
2651
3580ae2ce979 [xemacs-hg @ 2005-03-11 11:18:44 by malcolmp]
malcolmp
parents: 543
diff changeset
83 /^s\,\@([A-Za-z0-9_]+)\@\,\$[A-Za-z0-9_]+\,;t t/mg) {
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
84 $new_cvi_contents .= "$var \"\@$var\@\"\n" unless exists $done{$var};
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
85 $done{$var} = 1;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
86 }
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
87
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
88 $new_cvi_contents .= "
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 ;;; (These are used in C code)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
92 ";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
93
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
94 if ($cvi_contents ne $new_cvi_contents) {
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
95 unlink "lib-src/config.values.in";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
96 open (CVI, "> lib-src/config.values.in")
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
97 or die "lib-src/config.values.in: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
98 print CVI $new_cvi_contents;
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
99 close CVI
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
100 or die "lib-src/config.values.in: $!";
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
101 }