X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fchartab.h;h=e6d637b2ea964019dcab5617b903e99048654122;hb=98f1518a09e923a4f8b14b6a637cc283f02719bd;hp=2b722b5320992eb1ebfe08e2902e70c6fbffcb0a;hpb=bc5164f42a491dd99d15d312b932322b7179c70b;p=chise%2Fxemacs-chise.git- diff --git a/src/chartab.h b/src/chartab.h index 2b722b5..e6d637b2 100644 --- a/src/chartab.h +++ b/src/chartab.h @@ -40,6 +40,8 @@ EXFUN (Fdecode_char, 3); EXFUN (Fput_char_attribute, 3); +EXFUN (Ffind_char, 1); + /************************************************************************/ /* Char-ID Tables */ @@ -166,7 +168,6 @@ struct Lisp_Char_Table Lisp_Object table; Lisp_Object default_value; Lisp_Object name; - Lisp_Object db_file; Lisp_Object db; unsigned char unloaded; #else @@ -356,18 +357,28 @@ char_attribute_system_db_file (Lisp_Object key_type, Lisp_Object attribute, Lisp_Object load_char_attribute_maybe (Lisp_Char_Table* cit, Emchar ch); #endif -INLINE_HEADER Lisp_Object get_char_id_table (Lisp_Char_Table* cit, Emchar ch); +INLINE_HEADER Lisp_Object +get_char_id_table_0 (Lisp_Char_Table* cit, Emchar ch); +INLINE_HEADER Lisp_Object +get_char_id_table_0 (Lisp_Char_Table* cit, Emchar ch) +{ + return get_byte_table (get_byte_table + (get_byte_table + (get_byte_table + (cit->table, + (unsigned char)(ch >> 24)), + (unsigned char) (ch >> 16)), + (unsigned char) (ch >> 8)), + (unsigned char) ch); +} + +INLINE_HEADER Lisp_Object +get_char_id_table (Lisp_Char_Table* cit, Emchar ch); INLINE_HEADER Lisp_Object get_char_id_table (Lisp_Char_Table* cit, Emchar ch) { - Lisp_Object val = get_byte_table (get_byte_table - (get_byte_table - (get_byte_table - (cit->table, - (unsigned char)(ch >> 24)), - (unsigned char) (ch >> 16)), - (unsigned char) (ch >> 8)), - (unsigned char) ch); + Lisp_Object val = get_char_id_table_0 (cit, ch); + #ifdef HAVE_DATABASE if (EQ (val, Qunloaded)) {