Mercurial > hg > xemacs-beta
annotate src/cm.h @ 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 |
rev | line source |
---|---|
428 | 1 /* Cursor motion calculation definitions for XEmacs |
2 Copyright (C) 1985, 1989, 1992, 1993 Free Software Foundation, Inc. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
442
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
428 | 7 under the terms of the GNU General Public License as published by the |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
442
diff
changeset
|
8 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:
442
diff
changeset
|
9 option) any later version. |
428 | 10 |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 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:
442
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
428 | 18 |
19 /* Synched up with: FSF 19.30. */ | |
20 | |
21 /* #### Chuck -- This file should be deleted. I'm not deleting it yet | |
22 because there might be something you want out of it. */ | |
23 | |
440 | 24 #ifndef INCLUDED_cm_h_ |
25 #define INCLUDED_cm_h_ | |
428 | 26 |
27 /* Holds the minimum and maximum costs for the parametrized capabilities. */ | |
28 struct parmcap | |
29 { | |
30 int mincost, maxcost; | |
31 }; | |
32 | |
33 /* This structure holds everything needed to do cursor motion except the pad | |
34 character (PC) and the output speed of the terminal (ospeed), which | |
35 termcap wants in global variables. */ | |
36 | |
37 struct cm | |
38 { | |
39 #if 0 | |
40 /* Cursor position. -1 in *both* variables means the cursor | |
41 position is unknown, in order to force absolute cursor motion. */ | |
42 | |
43 int cm_curY; /* Current row */ | |
44 int cm_curX; /* Current column */ | |
45 | |
46 /* Capabilities from termcap */ | |
442 | 47 const char *cm_up; /* up (up) */ |
48 const char *cm_down; /* down (do) */ | |
49 const char *cm_left; /* left (le) */ | |
50 const char *cm_right; /* right (nd) */ | |
51 const char *cm_home; /* home (ho) */ | |
52 const char *cm_cr; /* carriage return (cr) */ | |
53 const char *cm_ll; /* last line (ll) */ | |
428 | 54 #endif /* 0 */ |
442 | 55 const char *cm_tab; /* tab (ta) */ |
56 const char *cm_backtab; /* backtab (bt) */ | |
428 | 57 #if 0 |
442 | 58 const char *cm_abs; /* absolute (cm) */ |
59 const char *cm_habs; /* horizontal absolute (ch) */ | |
60 const char *cm_vabs; /* vertical absolute (cv) */ | |
61 const char *cm_ds; /* "don't send" string (ds) */ | |
62 const char *cm_multiup; /* multiple up (UP) */ | |
63 const char *cm_multidown; /* multiple down (DO) */ | |
64 const char *cm_multileft; /* multiple left (LE) */ | |
65 const char *cm_multiright; /* multiple right (RI) */ | |
428 | 66 int cm_cols; /* number of cols on frame (co) */ |
67 int cm_rows; /* number of rows on frame (li) */ | |
68 int cm_tabwidth; /* tab width (it) */ | |
69 unsigned int cm_autowrap:1; /* autowrap flag (am) */ | |
70 unsigned int cm_magicwrap:1; /* VT-100: cursor stays in last col but | |
71 will cm_wrap if next char is | |
72 printing (xn) */ | |
73 unsigned int cm_usetabs:1; /* if set, use tabs */ | |
74 unsigned int cm_losewrap:1; /* if reach right margin, forget cursor | |
75 location */ | |
76 unsigned int cm_autolf:1; /* \r performs a \r\n (rn) */ | |
77 #endif | |
78 | |
79 /* Parametrized capabilities. This needs to be a struct since | |
80 the costs are accessed through pointers. */ | |
81 | |
82 #if 0 | |
83 struct parmcap cc_abs; /* absolute (cm) */ | |
84 struct parmcap cc_habs; /* horizontal absolute (ch) */ | |
85 struct parmcap cc_vabs; /* vertical absolute (cv) */ | |
86 struct parmcap cc_multiup; /* multiple up (UP) */ | |
87 struct parmcap cc_multidown; /* multiple down (DO) */ | |
88 struct parmcap cc_multileft; /* multiple left (LE) */ | |
89 struct parmcap cc_multiright; /* multiple right (RI) */ | |
90 #endif | |
91 | |
92 #if 0 | |
93 /* Costs for the non-parametrized capabilities */ | |
94 int cc_up; /* cost for up */ | |
95 int cc_down; /* etc. */ | |
96 int cc_left; | |
97 int cc_right; | |
98 int cc_home; | |
99 int cc_cr; | |
100 int cc_ll; | |
101 int cc_tab; | |
102 int cc_backtab; | |
103 /* These are temporary, until the code is installed to use the | |
104 struct parmcap fields above. */ | |
105 int cc_abs; | |
106 int cc_habs; | |
107 int cc_vabs; | |
108 #endif | |
109 }; | |
110 | |
111 #if 0 | |
112 extern struct cm Wcm; /* Terminal capabilities */ | |
113 extern char PC; /* Pad character */ | |
114 | |
115 /* Shorthand */ | |
116 #ifndef NoCMShortHand | |
117 #define curY Wcm.cm_curY | |
118 #define curX Wcm.cm_curX | |
119 #define Up Wcm.cm_up | |
120 #define Down Wcm.cm_down | |
121 #define Left Wcm.cm_left | |
122 #define Right Wcm.cm_right | |
123 #define Tab Wcm.cm_tab | |
124 #define BackTab Wcm.cm_backtab | |
125 #define TabWidth Wcm.cm_tabwidth | |
126 #define CR Wcm.cm_cr | |
127 #define Home Wcm.cm_home | |
128 #define LastLine Wcm.cm_ll | |
129 #define AbsPosition Wcm.cm_abs | |
130 #define ColPosition Wcm.cm_habs | |
131 #define RowPosition Wcm.cm_vabs | |
132 #define MultiUp Wcm.cm_multiup | |
133 #define MultiDown Wcm.cm_multidown | |
134 #define MultiLeft Wcm.cm_multileft | |
135 #define MultiRight Wcm.cm_multiright | |
136 #define AutoWrap Wcm.cm_autowrap | |
137 #define MagicWrap Wcm.cm_magicwrap | |
138 #define UseTabs Wcm.cm_usetabs | |
139 #define FrameRows Wcm.cm_rows | |
140 #define FrameCols Wcm.cm_cols | |
141 | |
142 #define UpCost Wcm.cc_up | |
143 #define DownCost Wcm.cc_down | |
144 #define LeftCost Wcm.cc_left | |
145 #define RightCost Wcm.cc_right | |
146 #define HomeCost Wcm.cc_home | |
147 #define CRCost Wcm.cc_cr | |
148 #define LastLineCost Wcm.cc_ll | |
149 #define TabCost Wcm.cc_tab | |
150 #define BackTabCost Wcm.cc_backtab | |
151 #define AbsPositionCost Wcm.cc_abs | |
152 #define ColPositionCost Wcm.cc_habs | |
153 #define RowPositionCost Wcm.cc_vabs | |
154 #define MultiUpCost Wcm.cc_multiup | |
155 #define MultiDownCost Wcm.cc_multidown | |
156 #define MultiLeftCost Wcm.cc_multileft | |
157 #define MultiRightCost Wcm.cc_multiright | |
158 #endif | |
159 #endif /* 0 */ | |
160 | |
161 #define cmat(row,col) (curY = (row), curX = (col)) | |
162 #define cmplus(n) \ | |
163 { \ | |
164 if ((curX += (n)) >= FrameCols && !MagicWrap) \ | |
165 { \ | |
166 if (Wcm.cm_losewrap) losecursor (); \ | |
167 else if (AutoWrap) curX = 0, curY++; \ | |
168 else curX--; \ | |
169 } \ | |
170 } | |
171 | |
172 #define losecursor() (curX = -1, curY = -1) | |
173 | |
174 extern int cost; | |
175 void cmputc (int c); | |
176 void cmcheckmagic (void); | |
177 void cm_cost_init (struct console *c); | |
178 void cmgoto (int, int); | |
179 void Wcm_clear (void); | |
180 int Wcm_init (void); | |
181 | |
440 | 182 #endif /* INCLUDED_cm_h_ */ |