Mercurial > hg > xemacs-beta
view src/inline.c @ 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 | a6c778975d7d |
children | b5df3737028a 8b2f75cecb89 |
line wrap: on
line source
/* Repository for inline functions Copyright (C) 1995 Sun Microsystems, Inc. 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. */ /* The purpose of this file is so that there is at least one actual definition of each inline function. This is needed under GCC. The reason is that under GCC we declare our inline functions `inline extern', which causes the inlined version to get used only for inlining, and in other cases to generate an external reference to the function. This is more efficient than declaring our inline functions `inline static', which (in many cases) would cause a separate version of the function to get inserted into every source file that included the corresponding header file. See internals.texi. Some compilers that recognize `inline' may not do the same `inline extern' business, so on those we just do `inline static'. */ /* Note to maintainers: This file contains a list of all header files that use the INLINE macro, either directly, or by using DECLARE_LRECORD. i.e. the output of ``grep -l -w 'DECLARE_LRECORD|INLINE_HEADER' *.h'' */ #define DONT_EXTERN_INLINE_HEADER_FUNCTIONS #include <config.h> #include "lisp.h" #include "sysfile.h" #include "buffer.h" #include "bytecode.h" #include "casetab.h" #include "chartab.h" #include "device-impl.h" #include "elhash.h" #include "events.h" #include "extents-impl.h" #include "faces.h" #include "frame-impl.h" #include "glyphs.h" #include "gui.h" #include "keymap.h" #include "lstream.h" #include "objects-impl.h" #include "opaque.h" #include "process.h" #include "rangetab.h" #include "specifier.h" #include "symeval.h" #include "syntax.h" #include "window.h" /* If we demand !defined (HAVE_SHLIB) the INLINE_HEADERS aren't instantiated. This only shows up in --with-error-checking=types builds AFAIK. On Mac OS X 10.3.9 with the Apple toolchain (GCC 3.3) gives a buildtime link error (the lrecord error_check functions are undefined). Debian GNU/Linux `sid' with GCC 4.0.3 prerelease & binutils 2.16.91 gives a runtime link error (the lrecord error_check functions are undefined). It is possible that this can be fixed trickily by appropriately defining INLINE, or that it should be done in the module itself somehow. If you can do it better or more elegantly, please feel free to consult me. --stephen 2005-11-07 */ #if defined (HAVE_LDAP) #include "../modules/ldap/eldap.h" #endif /* We can't ask for !defined (HAVE_SHLIB). See HAVE_LDAP, above. */ #if defined (HAVE_POSTGRESQL) #include "../modules/postgresql/postgresql.h" #endif #ifdef HAVE_TOOLBARS #include "toolbar.h" #endif #ifdef HAVE_SCROLLBARS #include "scrollbar.h" #endif #ifdef HAVE_DATABASE #include "database.h" #endif #ifdef HAVE_X_WINDOWS #include "glyphs-x.h" #ifdef HAVE_XFT #include "font-mgr.h" #endif #endif #ifdef HAVE_MS_WINDOWS #include "console-msw.h" #endif #ifdef HAVE_GTK #include "console-gtk.h" #include "ui-gtk.h" #endif #include "file-coding.h" #ifdef TOOLTALK #include "tooltalk.h" #endif