Mercurial > hg > xemacs-beta
view lisp/symbol-syntax.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 16:51:25 -0600 |
parents | 3ecd8885ac67 |
children | 308d34e9f07d |
line wrap: on
line source
;;; symbol-syntax.el --- find chars with symbol syntax ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Author: JBW, JBW@_CORTEZ ;; Created: Wed Jun 20 15:15:34 1990 ;; Maintainer: XEmacs Development Team ;; Keywords: matching ;; 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: Not in FSF. ;;; Commentary: ;; Last modified by: Ben Wing, ben@xemacs.org ;; Last modified on: Mon Oct 2 02:32:05 GMT 1995 ;;; Code: (defvar symbol-syntax-table-alist nil) ;; '((c-mode-syntax-table) ;; (emacs-lisp-mode-syntax-table) ;; (lisp-mode-syntax-table) ;; (text-mode-syntax-table))) (defun update-symbol-syntax-table-alist () (let ((alist symbol-syntax-table-alist) item) (while (consp alist) (cond ((null (car alist)) (error "Missing alist item")) ((null (car (car alist))) (error "Alist item with null car")) ;; this functionality not used ((symbolp (setq item (car (car alist)))) (or (null (cdr (car alist))) (error "Alist item expected to have null cdr")) (while (symbolp item) (setq item (symbol-value item))) (setcar (car alist) item))) (cond ((not (syntax-table-p (car (car alist)))) (error "Alist item car expected to be symbol table")) ((null (cdr (car alist))) (setcdr (car alist) (make-symbol-syntax-table (car (car alist)))))) (setq alist (cdr alist))))) (defun get-symbol-syntax-table (norm-table) (let (result) (if (setq result (assq norm-table symbol-syntax-table-alist)) nil (update-symbol-syntax-table-alist) (if (setq result (assq norm-table symbol-syntax-table-alist)) nil (setq symbol-syntax-table-alist (cons (list norm-table) symbol-syntax-table-alist)) (update-symbol-syntax-table-alist) (or (setq result (assq norm-table symbol-syntax-table-alist)) (error "Syntax table missing from symbol-syntax-table-alist")))) (or (setq result (cdr result)) (error "Alist item has null cdr")) (or (syntax-table-p result) (error "Non-syntax-table item in alist")) result)) (defun make-symbol-syntax-table (in-table) (let ((out-table (copy-syntax-table in-table))) (map-syntax-table #'(lambda (key value) (if (eq ?_ (char-syntax-from-code value)) (put-char-table key (set-char-syntax-in-code value ?w) out-table)) nil) out-table) out-table)) ;; stuff for examining contents of syntax tables ;;(show-chars-with-syntax ;; '(c-mode-syntax-table ;; emacs-lisp-mode-syntax-table ;; lisp-mode-syntax-table ;; text-mode-syntax-table) ;; ?_) (defun show-chars-with-syntax (tables syntax) (let ((schars nil)) (unwind-protect (while (consp tables) (let* ((chars nil) (table-symbol (car tables)) (table table-symbol)) (or (symbolp table-symbol) (error "bad argument non-symbol")) (while (symbolp table) (setq table (symbol-value table))) (map-syntax-table #'(lambda (key value) (if (eq syntax (char-syntax-from-code value)) (setq chars (cons key chars))) nil) table) (setq schars (cons (list table-symbol (nreverse chars)) schars))) (setq tables (cdr tables)))) (nreverse schars))) (provide 'symbol-syntax) ;;; symbol-syntax.el ends here