Commit e98227af authored by Karl Heuer's avatar Karl Heuer
Browse files

(DOWNCASE): Return int, not Lisp_Object.

(UPPERCASEP): Use DOWNCASE.
(UPCASE_TABLE): New macro.
(NOCASEP, UPCASE1): Use UPCASE_TABLE.
[!NO_UNION_TYPE] (make_number): Declare.
parent c219c2a0
......@@ -372,6 +372,8 @@ extern int pure_size;
#define XSET(var, vartype, ptr) \
(((var).s.type = ((char) (vartype))), ((var).s.val = ((int) (ptr))))
extern Lisp_Object make_number ();
/* During garbage collection, XGCTYPE must be used for extracting types
so that the mark bit is ignored. XMARKBIT access the markbit.
Markbits are used only in particular slots of particular structure types.
......@@ -1313,36 +1315,37 @@ extern char *stack_bottom;
#define QUITP (!NILP (Vquit_flag) && NILP (Vinhibit_quit))
/* 1 if CH is upper case. */
/* Current buffer's map from characters to lower-case characters. */
#define UPPERCASEP(CH) \
(XCHAR_TABLE (current_buffer->downcase_table)->contents[CH] != (CH))
#define DOWNCASE_TABLE XCHAR_TABLE (current_buffer->downcase_table)->contents
/* 1 if CH is lower case. */
/* Current buffer's map from characters to upper-case characters. */
#define LOWERCASEP(CH) (!UPPERCASEP (CH) && !NOCASEP(CH))
#define UPCASE_TABLE XCHAR_TABLE (current_buffer->upcase_table)->contents
/* 1 if CH is neither upper nor lower case. */
/* Downcase a character, or make no change if that cannot be done. */
#define NOCASEP(CH) \
(XCHAR_TABLE (current_buffer->upcase_table)->contents[CH] == (CH))
#define DOWNCASE(CH) (XFASTINT (DOWNCASE_TABLE[CH]))
/* Upcase a character, or make no change if that cannot be done. */
/* 1 if CH is upper case. */
#define UPCASE(CH) (!UPPERCASEP (CH) ? UPCASE1 (CH) : (CH))
#define UPPERCASEP(CH) (DOWNCASE(CH) != (CH))
/* Upcase a character known to be not upper case. */
/* 1 if CH is neither upper nor lower case. */
#define UPCASE1(CH) (XCHAR_TABLE (current_buffer->upcase_table)->contents[CH])
#define NOCASEP(CH) (XFASTINT (UPCASE_TABLE[CH]) == (CH))
/* Downcase a character, or make no change if that cannot be done. */
/* 1 if CH is lower case. */
#define DOWNCASE(CH) \
(XCHAR_TABLE (current_buffer->downcase_table)->contents[CH])
#define LOWERCASEP(CH) (!UPPERCASEP (CH) && !NOCASEP(CH))
/* Current buffer's map from characters to lower-case characters. */
/* Upcase a character, or make no change if that cannot be done. */
#define DOWNCASE_TABLE XCHAR_TABLE (current_buffer->downcase_table)->contents
#define UPCASE(CH) (!UPPERCASEP (CH) ? UPCASE1 (CH) : (CH))
/* Upcase a character known to be not upper case. */
#define UPCASE1(CH) (XFASTINT (UPCASE_TABLE[CH]))
extern Lisp_Object Vascii_downcase_table;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment