Mercurial > hg > xemacs-beta
annotate src/casefiddle.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 6bc1f3f6cf0d |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* XEmacs case conversion functions. |
| 2 Copyright (C) 1985, 1992, 1993, 1994, 1997, 1998 Free Software Foundation, Inc. | |
| 826 | 3 Copyright (C) 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: FSF 19.34, but substantially rewritten by Martin. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 | |
| 27 #include "buffer.h" | |
| 28 #include "insdel.h" | |
| 29 #include "syntax.h" | |
| 30 | |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
31 enum case_action {CASE_UP, CASE_DOWN, CASE_CAPITALIZE, CASE_CAPITALIZE_UP, |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
32 CASE_CANONICALIZE}; |
| 428 | 33 |
| 34 static Lisp_Object | |
| 444 | 35 casify_object (enum case_action flag, Lisp_Object string_or_char, |
| 36 Lisp_Object buffer) | |
| 428 | 37 { |
| 38 struct buffer *buf = decode_buffer (buffer, 0); | |
| 39 | |
| 40 retry: | |
| 41 | |
| 444 | 42 if (CHAR_OR_CHAR_INTP (string_or_char)) |
| 428 | 43 { |
| 867 | 44 Ichar c; |
| 444 | 45 CHECK_CHAR_COERCE_INT (string_or_char); |
| 46 c = XCHAR (string_or_char); | |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
47 if (flag == CASE_DOWN) |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
48 { |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
49 c = DOWNCASE (buf, c); |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
50 } |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
51 else if (flag == CASE_UP) |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
52 { |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
53 c = UPCASE (buf, c); |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
54 } |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
55 else |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
56 { |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
57 c = CANONCASE (buf, c); |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
58 } |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
59 |
| 428 | 60 return make_char (c); |
| 61 } | |
| 62 | |
| 444 | 63 if (STRINGP (string_or_char)) |
| 428 | 64 { |
| 826 | 65 Lisp_Object syntax_table = buf->mirror_syntax_table; |
| 867 | 66 Ibyte *storage = |
| 2367 | 67 alloca_ibytes (XSTRING_LENGTH (string_or_char) * MAX_ICHAR_LEN); |
| 867 | 68 Ibyte *newp = storage; |
| 69 Ibyte *oldp = XSTRING_DATA (string_or_char); | |
| 70 Ibyte *endp = oldp + XSTRING_LENGTH (string_or_char); | |
| 428 | 71 int wordp = 0, wordp_prev; |
| 72 | |
| 771 | 73 while (oldp < endp) |
| 428 | 74 { |
| 867 | 75 Ichar c = itext_ichar (oldp); |
| 428 | 76 switch (flag) |
| 77 { | |
| 78 case CASE_UP: | |
| 79 c = UPCASE (buf, c); | |
| 80 break; | |
| 81 case CASE_DOWN: | |
| 82 c = DOWNCASE (buf, c); | |
| 83 break; | |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
84 case CASE_CANONICALIZE: |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
85 c = CANONCASE (buf, c); |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
86 break; |
| 428 | 87 case CASE_CAPITALIZE: |
| 88 case CASE_CAPITALIZE_UP: | |
| 89 wordp_prev = wordp; | |
| 90 wordp = WORD_SYNTAX_P (syntax_table, c); | |
| 91 if (!wordp) break; | |
| 92 if (wordp_prev) | |
| 93 { | |
| 94 if (flag == CASE_CAPITALIZE) | |
| 95 c = DOWNCASE (buf, c); | |
| 96 } | |
| 97 else | |
| 98 c = UPCASE (buf, c); | |
| 99 break; | |
| 100 } | |
| 101 | |
| 867 | 102 newp += set_itext_ichar (newp, c); |
| 103 INC_IBYTEPTR (oldp); | |
| 428 | 104 } |
| 105 | |
| 106 return make_string (storage, newp - storage); | |
| 107 } | |
| 108 | |
| 444 | 109 string_or_char = wrong_type_argument (Qchar_or_string_p, string_or_char); |
| 428 | 110 goto retry; |
| 111 } | |
| 112 | |
| 113 DEFUN ("upcase", Fupcase, 1, 2, 0, /* | |
| 444 | 114 Convert STRING-OR-CHAR to upper case and return that. |
| 115 STRING-OR-CHAR may be a character or string. The result has the same type. | |
| 116 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 117 See also `capitalize', `downcase' and `upcase-initials'. |
| 118 Optional second arg BUFFER specifies which buffer's case tables to use, | |
| 119 and defaults to the current buffer. | |
| 120 */ | |
| 444 | 121 (string_or_char, buffer)) |
| 428 | 122 { |
| 444 | 123 return casify_object (CASE_UP, string_or_char, buffer); |
| 428 | 124 } |
| 125 | |
| 126 DEFUN ("downcase", Fdowncase, 1, 2, 0, /* | |
| 444 | 127 Convert STRING-OR-CHAR to lower case and return that. |
| 128 STRING-OR-CHAR may be a character or string. The result has the same type. | |
| 129 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 130 Optional second arg BUFFER specifies which buffer's case tables to use, |
| 131 and defaults to the current buffer. | |
| 132 */ | |
| 444 | 133 (string_or_char, buffer)) |
| 428 | 134 { |
| 444 | 135 return casify_object (CASE_DOWN, string_or_char, buffer); |
| 428 | 136 } |
| 137 | |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
138 DEFUN ("canoncase", Fcanoncase, 1, 2, 0, /* |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
139 Convert STRING-OR-CHAR to its canonical lowercase form and return that. |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
140 |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
141 STRING-OR-CHAR may be a character or string. The result has the same type. |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
142 STRING-OR-CHAR is not altered--the value is a copy. |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
143 |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
144 Optional second arg BUFFER specifies which buffer's case tables to use, |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
145 and defaults to the current buffer. |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
146 |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
147 For any N characters that are equivalent in case-insensitive searching, |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
148 their canonical lowercase character will be the same. |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
149 */ |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
150 (string_or_char, buffer)) |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
151 { |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
152 return casify_object (CASE_CANONICALIZE, string_or_char, buffer); |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
153 } |
|
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
154 |
| 428 | 155 DEFUN ("capitalize", Fcapitalize, 1, 2, 0, /* |
| 444 | 156 Convert STRING-OR-CHAR to capitalized form and return that. |
| 428 | 157 This means that each word's first character is upper case |
| 158 and the rest is lower case. | |
| 444 | 159 STRING-OR-CHAR may be a character or string. The result has the same type. |
| 160 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 161 Optional second arg BUFFER specifies which buffer's case tables to use, |
| 162 and defaults to the current buffer. | |
| 163 */ | |
| 444 | 164 (string_or_char, buffer)) |
| 428 | 165 { |
| 444 | 166 return casify_object (CASE_CAPITALIZE, string_or_char, buffer); |
| 428 | 167 } |
| 168 | |
| 169 /* Like Fcapitalize but change only the initial characters. */ | |
| 170 | |
| 171 DEFUN ("upcase-initials", Fupcase_initials, 1, 2, 0, /* | |
| 444 | 172 Convert the initial of each word in STRING-OR-CHAR to upper case. |
| 428 | 173 Do not change the other letters of each word. |
| 444 | 174 STRING-OR-CHAR may be a character or string. The result has the same type. |
| 175 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 176 Optional second arg BUFFER specifies which buffer's case tables to use, |
| 177 and defaults to the current buffer. | |
| 178 */ | |
| 444 | 179 (string_or_char, buffer)) |
| 428 | 180 { |
| 444 | 181 return casify_object (CASE_CAPITALIZE_UP, string_or_char, buffer); |
| 428 | 182 } |
| 183 | |
| 184 /* flag is CASE_UP, CASE_DOWN or CASE_CAPITALIZE or CASE_CAPITALIZE_UP. | |
| 444 | 185 START and END specify range of buffer to operate on. */ |
| 428 | 186 |
| 187 static void | |
| 444 | 188 casify_region_internal (enum case_action flag, Lisp_Object start, |
| 189 Lisp_Object end, struct buffer *buf) | |
| 428 | 190 { |
| 191 /* This function can GC */ | |
| 665 | 192 Charbpos pos, s, e; |
| 826 | 193 Lisp_Object syntax_table = buf->mirror_syntax_table; |
| 428 | 194 int mccount; |
| 195 int wordp = 0, wordp_prev; | |
| 196 | |
| 444 | 197 if (EQ (start, end)) |
| 428 | 198 /* Not modifying because nothing marked */ |
| 199 return; | |
| 200 | |
| 444 | 201 get_buffer_range_char (buf, start, end, &s, &e, 0); |
| 202 | |
| 203 mccount = begin_multiple_change (buf, s, e); | |
| 204 record_change (buf, s, e - s); | |
| 428 | 205 |
| 444 | 206 for (pos = s; pos < e; pos++) |
| 428 | 207 { |
| 867 | 208 Ichar oldc = BUF_FETCH_CHAR (buf, pos); |
| 209 Ichar c = oldc; | |
| 428 | 210 |
| 211 switch (flag) | |
| 212 { | |
| 213 case CASE_UP: | |
| 214 c = UPCASE (buf, oldc); | |
| 215 break; | |
| 216 case CASE_DOWN: | |
| 217 c = DOWNCASE (buf, oldc); | |
| 218 break; | |
| 219 case CASE_CAPITALIZE: | |
| 220 case CASE_CAPITALIZE_UP: | |
| 221 /* !!#### need to revalidate the start and end pointers in case | |
| 222 the buffer was changed */ | |
| 223 wordp_prev = wordp; | |
| 224 wordp = WORD_SYNTAX_P (syntax_table, c); | |
| 225 if (!wordp) continue; | |
| 226 if (wordp_prev) | |
| 227 { | |
| 228 if (flag == CASE_CAPITALIZE) | |
| 229 c = DOWNCASE (buf, c); | |
| 230 } | |
| 231 else | |
| 232 c = UPCASE (buf, c); | |
| 233 break; | |
| 234 } | |
| 235 | |
| 236 if (oldc == c) continue; | |
| 444 | 237 buffer_replace_char (buf, pos, c, 1, (pos == s)); |
| 428 | 238 BUF_MODIFF (buf)++; |
| 239 } | |
| 240 | |
| 241 end_multiple_change (buf, mccount); | |
| 242 } | |
| 243 | |
| 244 static Lisp_Object | |
| 444 | 245 casify_region (enum case_action flag, Lisp_Object start, Lisp_Object end, |
| 428 | 246 Lisp_Object buffer) |
| 247 { | |
| 444 | 248 casify_region_internal (flag, start, end, decode_buffer (buffer, 1)); |
| 428 | 249 return Qnil; |
| 250 } | |
| 251 | |
| 252 DEFUN ("upcase-region", Fupcase_region, 2, 3, "r", /* | |
| 253 Convert the region to upper case. In programs, wants two arguments. | |
| 254 These arguments specify the starting and ending character numbers of | |
| 255 the region to operate on. When used as a command, the text between | |
| 256 point and the mark is operated on. | |
| 257 See also `capitalize-region'. | |
| 258 Optional third arg BUFFER defaults to the current buffer. | |
| 259 */ | |
| 444 | 260 (start, end, buffer)) |
| 428 | 261 { |
| 262 /* This function can GC */ | |
| 444 | 263 return casify_region (CASE_UP, start, end, buffer); |
| 428 | 264 } |
| 265 | |
| 266 DEFUN ("downcase-region", Fdowncase_region, 2, 3, "r", /* | |
| 267 Convert the region to lower case. In programs, wants two arguments. | |
| 268 These arguments specify the starting and ending character numbers of | |
| 269 the region to operate on. When used as a command, the text between | |
| 270 point and the mark is operated on. | |
| 271 Optional third arg BUFFER defaults to the current buffer. | |
| 272 */ | |
| 444 | 273 (start, end, buffer)) |
| 428 | 274 { |
| 275 /* This function can GC */ | |
| 444 | 276 return casify_region (CASE_DOWN, start, end, buffer); |
| 428 | 277 } |
| 278 | |
| 279 DEFUN ("capitalize-region", Fcapitalize_region, 2, 3, "r", /* | |
| 280 Convert the region to capitalized form. | |
| 281 Capitalized form means each word's first character is upper case | |
| 282 and the rest of it is lower case. | |
| 283 In programs, give two arguments, the starting and ending | |
| 284 character positions to operate on. | |
| 285 Optional third arg BUFFER defaults to the current buffer. | |
| 286 */ | |
| 444 | 287 (start, end, buffer)) |
| 428 | 288 { |
| 289 /* This function can GC */ | |
| 444 | 290 return casify_region (CASE_CAPITALIZE, start, end, buffer); |
| 428 | 291 } |
| 292 | |
| 293 /* Like Fcapitalize_region but change only the initials. */ | |
| 294 | |
| 295 DEFUN ("upcase-initials-region", Fupcase_initials_region, 2, 3, "r", /* | |
| 296 Upcase the initial of each word in the region. | |
| 297 Subsequent letters of each word are not changed. | |
| 298 In programs, give two arguments, the starting and ending | |
| 299 character positions to operate on. | |
| 300 Optional third arg BUFFER defaults to the current buffer. | |
| 301 */ | |
| 444 | 302 (start, end, buffer)) |
| 428 | 303 { |
| 444 | 304 return casify_region (CASE_CAPITALIZE_UP, start, end, buffer); |
| 428 | 305 } |
| 306 | |
| 307 | |
| 308 static Lisp_Object | |
| 309 casify_word (enum case_action flag, Lisp_Object arg, Lisp_Object buffer) | |
| 310 { | |
| 665 | 311 Charbpos farend; |
| 428 | 312 struct buffer *buf = decode_buffer (buffer, 1); |
| 313 | |
| 314 CHECK_INT (arg); | |
| 315 | |
| 316 farend = scan_words (buf, BUF_PT (buf), XINT (arg)); | |
| 317 if (!farend) | |
| 318 farend = XINT (arg) > 0 ? BUF_ZV (buf) : BUF_BEGV (buf); | |
| 319 | |
| 320 casify_region_internal (flag, make_int (BUF_PT (buf)), make_int (farend), buf); | |
| 321 BUF_SET_PT (buf, max (BUF_PT (buf), farend)); | |
| 322 return Qnil; | |
| 323 } | |
| 324 | |
| 325 DEFUN ("upcase-word", Fupcase_word, 1, 2, "p", /* | |
| 444 | 326 Convert following word (or COUNT words) to upper case, moving over. |
| 428 | 327 With negative argument, convert previous words but do not move. |
| 328 See also `capitalize-word'. | |
| 329 Optional second arg BUFFER defaults to the current buffer. | |
| 330 */ | |
| 444 | 331 (count, buffer)) |
| 428 | 332 { |
| 333 /* This function can GC */ | |
| 444 | 334 return casify_word (CASE_UP, count, buffer); |
| 428 | 335 } |
| 336 | |
| 337 DEFUN ("downcase-word", Fdowncase_word, 1, 2, "p", /* | |
| 444 | 338 Convert following word (or COUNT words) to lower case, moving over. |
| 428 | 339 With negative argument, convert previous words but do not move. |
| 340 Optional second arg BUFFER defaults to the current buffer. | |
| 341 */ | |
| 444 | 342 (count, buffer)) |
| 428 | 343 { |
| 344 /* This function can GC */ | |
| 444 | 345 return casify_word (CASE_DOWN, count, buffer); |
| 428 | 346 } |
| 347 | |
| 348 DEFUN ("capitalize-word", Fcapitalize_word, 1, 2, "p", /* | |
| 444 | 349 Capitalize the following word (or COUNT words), moving over. |
| 428 | 350 This gives the word(s) a first character in upper case |
| 351 and the rest lower case. | |
| 352 With negative argument, capitalize previous words but do not move. | |
| 353 Optional second arg BUFFER defaults to the current buffer. | |
| 354 */ | |
| 444 | 355 (count, buffer)) |
| 428 | 356 { |
| 357 /* This function can GC */ | |
| 444 | 358 return casify_word (CASE_CAPITALIZE, count, buffer); |
| 428 | 359 } |
| 360 | |
| 361 | |
| 362 void | |
| 363 syms_of_casefiddle (void) | |
| 364 { | |
| 365 DEFSUBR (Fupcase); | |
| 366 DEFSUBR (Fdowncase); | |
|
4910
6bc1f3f6cf0d
Make canoncase visible to Lisp; use it with chars in internal_equalp.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2367
diff
changeset
|
367 DEFSUBR (Fcanoncase); |
| 428 | 368 DEFSUBR (Fcapitalize); |
| 369 DEFSUBR (Fupcase_initials); | |
| 370 DEFSUBR (Fupcase_region); | |
| 371 DEFSUBR (Fdowncase_region); | |
| 372 DEFSUBR (Fcapitalize_region); | |
| 373 DEFSUBR (Fupcase_initials_region); | |
| 374 DEFSUBR (Fupcase_word); | |
| 375 DEFSUBR (Fdowncase_word); | |
| 376 DEFSUBR (Fcapitalize_word); | |
| 377 } |