Mercurial > hg > xemacs-beta
view src/casetab.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 | 5ddbab03b0e6 |
children | 308d34e9f07d |
line wrap: on
line source
/* XEmacs routines to deal with case tables. Copyright (C) 1987, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2002, 2010 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.28. Between FSF 19.28 and 19.30, casetab.c was rewritten to use junky FSF char tables. Meanwhile I rewrote it to use more logical char tables. --ben */ /* Written by Howard Gayle. */ /* Modified for Mule by Ben Wing. */ /* The four tables in a case table are downcase, upcase, canon, and eqv. Each is a char-table. Their workings are rather non-obvious. (1) `downcase' is the only obvious table: Map a character to its lowercase equivalent. (2) `upcase' does *NOT* map a character to its uppercase equivalent, despite its name. Rather, it maps lowercase characters to their uppercase equivalent, and uppercase characters to *ANYTHING BUT* their uppercase equivalent (currently, their lowercase equivalent), and characters without case to themselves. It is used to determine if a character "has no case" (no uppercase or lowercase mapping). #### This is way bogus. Just use the obvious implementation of uppercase mapping and of NOCASE_P. (3) `canon' maps each character to a "canonical" lowercase, such that if two different uppercase characters map to the same lowercase character, or vice versa, both characters will have the same entry in the canon table. (4) `eqv' lists the "equivalence classes" defined by `canon'. Imagine that all characters are divided into groups having the same `canon' entry; these groups are called "equivalence classes" and `eqv' lists them by linking the characters in each equivalence class together in a circular list. That is, to find out all all the members of a given char's equivalence class, you need something like the following code: (let* ((char ?i) (original-char char) (standard-case-eqv (case-table-eqv (standard-case-table)))) (loop with res = (list char) until (eq (setq char (get-char-table char standard-case-eqv)) original-char) do (push char res) finally return res)) (Where #'case-table-eqv doesn't yet exist, and probably never will, given that the C code needs to keep it in a consistent state so Lisp can't mess around with it.) `canon' is used when doing case-insensitive comparisons. `eqv' is used in the Boyer-Moore search code. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "opaque.h" #include "chartab.h" #include "casetab.h" Lisp_Object Qcase_tablep, Qdowncase, Qupcase; Lisp_Object Vstandard_case_table; Lisp_Object case_table_char (Lisp_Object ch, Lisp_Object table); #define STRING256_P(obj) ((STRINGP (obj) && string_char_length (obj) == 256)) static Lisp_Object mark_case_table (Lisp_Object obj) { Lisp_Case_Table *ct = XCASE_TABLE (obj); mark_object (CASE_TABLE_DOWNCASE (ct)); mark_object (CASE_TABLE_UPCASE (ct)); mark_object (CASE_TABLE_CANON (ct)); mark_object (CASE_TABLE_EQV (ct)); return Qnil; } static void print_case_table (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Case_Table *ct = XCASE_TABLE (obj); if (print_readably) printing_unreadable_lisp_object (obj, 0); write_fmt_string_lisp (printcharfun, "#<case-table downcase=%s upcase=%s canon=%s eqv=%s ", 4, CASE_TABLE_DOWNCASE (ct), CASE_TABLE_UPCASE (ct), CASE_TABLE_CANON (ct), CASE_TABLE_EQV (ct)); write_fmt_string (printcharfun, "0x%x>", LISP_OBJECT_UID (obj)); } static const struct memory_description case_table_description [] = { { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, downcase_table) }, { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, upcase_table) }, { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, case_canon_table) }, { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, case_eqv_table) }, { XD_END } }; DEFINE_DUMPABLE_LISP_OBJECT ("case-table", case_table, mark_case_table, print_case_table, 0, 0, 0, case_table_description, Lisp_Case_Table); static Lisp_Object allocate_case_table (int init_tables) { Lisp_Object obj = ALLOC_NORMAL_LISP_OBJECT (case_table); Lisp_Case_Table *ct = XCASE_TABLE (obj); if (init_tables) { SET_CASE_TABLE_DOWNCASE (ct, MAKE_TRT_TABLE ()); SET_CASE_TABLE_UPCASE (ct, MAKE_TRT_TABLE ()); SET_CASE_TABLE_CANON (ct, MAKE_TRT_TABLE ()); SET_CASE_TABLE_EQV (ct, MAKE_TRT_TABLE ()); } else { SET_CASE_TABLE_DOWNCASE (ct, Qnil); SET_CASE_TABLE_UPCASE (ct, Qnil); SET_CASE_TABLE_CANON (ct, Qnil); SET_CASE_TABLE_EQV (ct, Qnil); } return obj; } DEFUN ("make-case-table", Fmake_case_table, 0, 0, 0, /* Create a new, empty case table. */ ()) { return allocate_case_table (1); } DEFUN ("case-table-p", Fcase_table_p, 1, 1, 0, /* Return t if OBJECT is a case table. See `set-case-table' for more information on these data structures. */ (object)) { if (CASE_TABLEP (object)) return Qt; else { Lisp_Object down, up, canon, eqv; if (!CONSP (object)) return Qnil; down = XCAR (object); object = XCDR (object); if (!CONSP (object)) return Qnil; up = XCAR (object); object = XCDR (object); if (!CONSP (object)) return Qnil; canon = XCAR (object); object = XCDR (object); if (!CONSP (object)) return Qnil; eqv = XCAR (object); return ((STRING256_P (down) && (NILP (up) || STRING256_P (up)) && ((NILP (canon) && NILP (eqv)) || STRING256_P (canon)) && (NILP (eqv) || STRING256_P (eqv))) ? Qt : Qnil); } } static Lisp_Object check_case_table (Lisp_Object object) { /* This function can GC */ while (NILP (Fcase_table_p (object))) object = wrong_type_argument (Qcase_tablep, object); return object; } Lisp_Object case_table_char (Lisp_Object ch, Lisp_Object table) { Lisp_Object ct_char; ct_char = get_char_table (XCHAR (ch), table); if (NILP (ct_char)) return ch; else return ct_char; } DEFUN ("get-case-table", Fget_case_table, 3, 3, 0, /* Return CHAR-CASE version of CHARACTER in CASE-TABLE. CHAR-CASE is either `downcase' or `upcase'. */ (char_case, character, case_table)) { CHECK_CHAR (character); CHECK_CASE_TABLE (case_table); if (EQ (char_case, Qdowncase)) return case_table_char (character, XCASE_TABLE_DOWNCASE (case_table)); else if (EQ (char_case, Qupcase)) return case_table_char (character, XCASE_TABLE_UPCASE (case_table)); else invalid_constant ("Char case must be downcase or upcase", char_case); return Qnil; /* Not reached. */ } DEFUN ("put-case-table", Fput_case_table, 4, 4, 0, /* Set CHAR-CASE version of CHARACTER to be VALUE in CASE-TABLE. CHAR-CASE is either `downcase' or `upcase'. See also `put-case-table-pair'. */ (char_case, character, value, case_table)) { CHECK_CHAR (character); CHECK_CHAR (value); if (EQ (char_case, Qdowncase)) { Fput_char_table (character, value, XCASE_TABLE_DOWNCASE (case_table)); /* This one is not at all intuitive. See comment at top of file. */ Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table)); } else if (EQ (char_case, Qupcase)) { Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table)); Fput_char_table (character, character, XCASE_TABLE_DOWNCASE (case_table)); } else invalid_constant ("CHAR-CASE must be downcase or upcase", char_case); XCASE_TABLE (case_table)->dirty = 1; return Qnil; } DEFUN ("put-case-table-pair", Fput_case_table_pair, 3, 3, 0, /* Make UC and LC a pair of inter-case-converting letters in CASE-TABLE. UC is an uppercase character and LC is a downcase character. */ (uc, lc, case_table)) { CHECK_CHAR (uc); CHECK_CHAR (lc); CHECK_CASE_TABLE (case_table); Fput_char_table (lc, lc, XCASE_TABLE_DOWNCASE (case_table)); Fput_char_table (uc, lc, XCASE_TABLE_UPCASE (case_table)); Fput_char_table (uc, lc, XCASE_TABLE_DOWNCASE (case_table)); Fput_char_table (lc, uc, XCASE_TABLE_UPCASE (case_table)); XCASE_TABLE (case_table)->dirty = 1; return Qnil; } DEFUN ("copy-case-table", Fcopy_case_table, 1, 1, 0, /* Return a new case table which is a copy of CASE-TABLE */ (case_table)) { Lisp_Object new_obj; CHECK_CASE_TABLE (case_table); new_obj = allocate_case_table (0); XSET_CASE_TABLE_DOWNCASE (new_obj, Fcopy_char_table (XCASE_TABLE_DOWNCASE (case_table))); XSET_CASE_TABLE_UPCASE (new_obj, Fcopy_char_table (XCASE_TABLE_UPCASE (case_table))); XSET_CASE_TABLE_CANON (new_obj, Fcopy_char_table (XCASE_TABLE_CANON (case_table))); XSET_CASE_TABLE_EQV (new_obj, Fcopy_char_table (XCASE_TABLE_EQV (case_table))); return new_obj; } static int compute_canon_mapper (struct chartab_range *range, Lisp_Object UNUSED (table), Lisp_Object val, void *arg) { Lisp_Object casetab = GET_LISP_FROM_VOID (arg); if (range->type == CHARTAB_RANGE_CHAR) SET_TRT_TABLE_OF (XCASE_TABLE_CANON (casetab), range->ch, TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (casetab), TRT_TABLE_OF (XCASE_TABLE_UPCASE (casetab), XCHAR (val)))); return 0; } static int initialize_identity_mapper (struct chartab_range *range, Lisp_Object UNUSED (table), Lisp_Object UNUSED (val), void *arg) { Lisp_Object trt = GET_LISP_FROM_VOID (arg); if (range->type == CHARTAB_RANGE_CHAR) SET_TRT_TABLE_OF (trt, range->ch, range->ch); return 0; } static int compute_up_or_eqv_mapper (struct chartab_range *range, Lisp_Object UNUSED (table), Lisp_Object val, void *arg) { Lisp_Object inverse = GET_LISP_FROM_VOID (arg); Ichar toch = XCHAR (val); if (range->type == CHARTAB_RANGE_CHAR && range->ch != toch) { Ichar c = TRT_TABLE_OF (inverse, toch); SET_TRT_TABLE_OF (inverse, toch, range->ch); SET_TRT_TABLE_OF (inverse, range->ch, c); } return 0; } /* Recomputing the canonical and equivalency tables from scratch is a lengthy process, and doing them incrementally is extremely difficult or perhaps impossible -- and certainly not worth it. To avoid lots of excessive recomputation when lots of stuff is incrementally added, we just store a dirty flag and then recompute when a value from the canon or eqv tables is actually needed. */ void recompute_case_table (Lisp_Object casetab) { struct chartab_range range; range.type = CHARTAB_RANGE_ALL; /* Turn off dirty flag first so we don't get infinite recursion when retrieving the values below! */ XCASE_TABLE (casetab)->dirty = 0; map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, compute_canon_mapper, STORE_LISP_IN_VOID (casetab)); map_char_table (XCASE_TABLE_CANON (casetab), &range, initialize_identity_mapper, STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); map_char_table (XCASE_TABLE_CANON (casetab), &range, compute_up_or_eqv_mapper, STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); } DEFUN ("current-case-table", Fcurrent_case_table, 0, 1, 0, /* Return the case table of BUFFER, which defaults to the current buffer. */ (buffer)) { struct buffer *buf = decode_buffer (buffer, 0); return buf->case_table; } DEFUN ("standard-case-table", Fstandard_case_table, 0, 0, 0, /* Return the standard case table. This is the one used for new buffers. */ ()) { return Vstandard_case_table; } static void convert_old_style_syntax_string (Lisp_Object table, Lisp_Object string) { Ichar i; for (i = 0; i < 256; i++) SET_TRT_TABLE_OF (table, i, string_ichar (string, i)); } static Lisp_Object set_case_table (Lisp_Object table, int standard) { /* This function can GC */ struct buffer *buf = standard ? XBUFFER (Vbuffer_defaults) : current_buffer; Lisp_Object casetab; check_case_table (table); if (CASE_TABLEP (table)) casetab = table; else { /* For backward compatibility. */ Lisp_Object down, up, canon, eqv, tail = table; struct chartab_range range; casetab = Fmake_case_table (); range.type = CHARTAB_RANGE_ALL; Freset_char_table (XCASE_TABLE_DOWNCASE (casetab)); Freset_char_table (XCASE_TABLE_UPCASE (casetab)); Freset_char_table (XCASE_TABLE_CANON (casetab)); Freset_char_table (XCASE_TABLE_EQV (casetab)); down = XCAR (tail); tail = XCDR (tail); up = XCAR (tail); tail = XCDR (tail); canon = XCAR (tail); tail = XCDR (tail); eqv = XCAR (tail); convert_old_style_syntax_string (XCASE_TABLE_DOWNCASE (casetab), down); if (NILP (up)) { map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, initialize_identity_mapper, STORE_LISP_IN_VOID (XCASE_TABLE_UPCASE (casetab))); map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, compute_up_or_eqv_mapper, STORE_LISP_IN_VOID (XCASE_TABLE_UPCASE (casetab))); } else convert_old_style_syntax_string (XCASE_TABLE_UPCASE (casetab), up); if (NILP (canon)) map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, compute_canon_mapper, STORE_LISP_IN_VOID (casetab)); else convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), canon); if (NILP (eqv)) { map_char_table (XCASE_TABLE_CANON (casetab), &range, initialize_identity_mapper, STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); map_char_table (XCASE_TABLE_CANON (casetab), &range, compute_up_or_eqv_mapper, STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); } else convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), eqv); } if (standard) Vstandard_case_table = casetab; buf->case_table = casetab; return buf->case_table; } DEFUN ("set-case-table", Fset_case_table, 1, 1, 0, /* Select CASE-TABLE as the new case table for the current buffer. A case table is a case-table object or list (DOWNCASE UPCASE CANONICALIZE EQUIVALENCES) where each element is either nil or a string of length 256. The latter is provided for backward-compatibility. DOWNCASE maps each character to its lower-case equivalent. UPCASE maps each character to its upper-case equivalent; if lower and upper case characters are in 1-1 correspondence, you may use nil and the upcase table will be deduced from DOWNCASE. CANONICALIZE maps each character to a canonical equivalent; any two characters that are related by case-conversion have the same canonical equivalent character; it may be nil, in which case it is deduced from DOWNCASE and UPCASE. EQUIVALENCES is a map that cyclicly permutes each equivalence class (of characters with the same canonical equivalent); it may be nil, in which case it is deduced from CANONICALIZE. See also `get-case-table', `put-case-table' and `put-case-table-pair'. */ (case_table)) { /* This function can GC */ return set_case_table (case_table, 0); } DEFUN ("set-standard-case-table", Fset_standard_case_table, 1, 1, 0, /* Select CASE-TABLE as the new standard case table for new buffers. See `set-case-table' for more info on case tables. */ (case_table)) { /* This function can GC */ return set_case_table (case_table, 1); } #ifdef MEMORY_USAGE_STATS struct case_table_stats { struct usage_stats u; /* Ancillary Lisp */ Bytecount downcase, upcase, case_canon, case_eqv; }; static void case_table_memory_usage (Lisp_Object casetab, struct generic_usage_stats *gustats) { struct case_table_stats *stats = (struct case_table_stats *) gustats; stats->downcase = lisp_object_memory_usage (XCASE_TABLE_DOWNCASE (casetab)); stats->upcase = lisp_object_memory_usage (XCASE_TABLE_UPCASE (casetab)); stats->case_canon = lisp_object_memory_usage (XCASE_TABLE_CANON (casetab)); stats->case_eqv = lisp_object_memory_usage (XCASE_TABLE_EQV (casetab)); } #endif /* MEMORY_USAGE_STATS */ void casetab_objects_create (void) { #ifdef MEMORY_USAGE_STATS OBJECT_HAS_METHOD (case_table, memory_usage); #endif } void syms_of_casetab (void) { INIT_LISP_OBJECT (case_table); DEFSYMBOL_MULTIWORD_PREDICATE (Qcase_tablep); DEFSYMBOL (Qdowncase); DEFSYMBOL (Qupcase); DEFSUBR (Fmake_case_table); DEFSUBR (Fcase_table_p); DEFSUBR (Fget_case_table); DEFSUBR (Fput_case_table); DEFSUBR (Fput_case_table_pair); DEFSUBR (Fcurrent_case_table); DEFSUBR (Fstandard_case_table); DEFSUBR (Fcopy_case_table); DEFSUBR (Fset_case_table); DEFSUBR (Fset_standard_case_table); } void vars_of_casetab (void) { #ifdef MEMORY_USAGE_STATS OBJECT_HAS_PROPERTY (case_table, memusage_stats_list, list5 (Qt, intern ("downcase"), intern ("upcase"), intern ("case-canon"), intern ("case-eqv"))); #endif /* MEMORY_USAGE_STATS */ } void complex_vars_of_casetab (void) { REGISTER Ichar i; staticpro (&Vstandard_case_table); Vstandard_case_table = allocate_case_table (1); for (i = 0; i < 256; i++) { unsigned char lowered = tolower (i); SET_TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (Vstandard_case_table), i, lowered); } for (i = 0; i < 256; i++) { unsigned char flipped = (isupper (i) ? tolower (i) : (islower (i) ? toupper (i) : i)); SET_TRT_TABLE_OF (XCASE_TABLE_UPCASE (Vstandard_case_table), i, flipped); } recompute_case_table (Vstandard_case_table); }