1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

(GLYPH_TABLE_LENGTH, GLYPH_TABLE_BASE, GLYPH_SIMPLE_P, GLYPH_ALIAS_P): Use

type test macros.
This commit is contained in:
Karl Heuer 1994-09-27 03:15:02 +00:00
parent 693f8fb080
commit 40de0d7ba2

View File

@ -40,25 +40,21 @@ extern Lisp_Object Vglyph_table;
/* Return the current length of the GLYPH table,
or 0 if the table isn't currently valid. */
#define GLYPH_TABLE_LENGTH \
((XTYPE (Vglyph_table) == Lisp_Vector) \
? XVECTOR (Vglyph_table)->size : 0)
((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->size : 0)
/* Return the current base (for indexing) of the GLYPH table,
or 0 if the table isn't currently valid. */
#define GLYPH_TABLE_BASE \
((XTYPE (Vglyph_table) == Lisp_Vector) \
? XVECTOR (Vglyph_table)->contents : 0)
((VECTORP (Vglyph_table)) ? XVECTOR (Vglyph_table)->contents : 0)
/* Given BASE and LEN returned by the two previous macros,
return nonzero if the GLYPH code G should be output as a single
character with code G. Return zero if G has a string in the table. */
#define GLYPH_SIMPLE_P(base,len,g) \
((g) >= (len) || XTYPE (base[g]) != Lisp_String)
#define GLYPH_SIMPLE_P(base,len,g) ((g) >= (len) || !STRINGP (base[g]))
/* Given BASE and LEN returned by the two previous macros,
return nonzero if GLYPH code G is aliased to a different code. */
#define GLYPH_ALIAS_P(base,len,g) \
((g) < (len) && XTYPE (base[g]) == Lisp_Int)
#define GLYPH_ALIAS_P(base,len,g) ((g) < (len) && INTEGERP (base[g]))
/* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 1,
return the alias for G. */