\f
#ifdef UTF2000
+#if defined(HAVE_DATABASE)
+EXFUN (Fload_char_attribute_table, 1);
+EXFUN (Fmap_char_attribute, 3);
+#endif
+
#define BT_UINT8_MIN 0
#define BT_UINT8_MAX (UCHAR_MAX - 4)
#define BT_UINT8_t (UCHAR_MAX - 3)
mark_object (ct->table);
mark_object (ct->name);
- mark_object (ct->db_file);
mark_object (ct->db);
#else
int i;
{ XD_LISP_OBJECT, offsetof(Lisp_Char_Table, table) },
{ XD_LISP_OBJECT, offsetof(Lisp_Char_Table, default_value) },
{ XD_LISP_OBJECT, offsetof(Lisp_Char_Table, name) },
- { XD_LISP_OBJECT, offsetof(Lisp_Char_Table, db_file) },
{ XD_LISP_OBJECT, offsetof(Lisp_Char_Table, db) },
#else
{ XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table, ascii), NUM_ASCII_CHARS },
ct->mirror_table = Qnil;
#else
ct->name = Qnil;
- ct->db_file = Qnil;
ct->db = Qnil;
#endif
ct->next_table = Qnil;
ctnew->default_value = ct->default_value;
/* [tomo:2002-01-21] Perhaps this code seems wrong */
ctnew->name = ct->name;
- ctnew->db_file = ct->db_file;
ctnew->db = ct->db;
if (UINT8_BYTE_TABLE_P (ct->table))
return 0;
}
-#if defined(HAVE_DATABASE)
-EXFUN (Fload_char_attribute_table, 1);
-#endif
-
#endif
/* Map FN (with client data ARG) over range RANGE in char table CT.
else
return Qnil;
- if (NILP (ct->db_file))
- ct->db_file
- = char_attribute_system_db_file (Qsystem_char_id, attribute, 1);
if (NILP (Fdatabase_live_p (ct->db)))
- ct->db = Fopen_database (ct->db_file, Qnil, Qnil, Qnil, Qnil);
+ {
+ Lisp_Object db_file = char_attribute_system_db_file (Qsystem_char_id, attribute, 1);
+
+ ct->db = Fopen_database (db_file, Qnil, Qnil, Qnil, Qnil);
+ }
if (!NILP (ct->db))
{
if (UINT8_BYTE_TABLE_P (ct->table))
else
return Qnil;
- if (!NILP (Fdatabase_live_p (ct->db)))
- {
- Fclose_database (ct->db);
- }
if (!NILP (ct->db))
{
+ if (!NILP (Fdatabase_live_p (ct->db)))
+ Fclose_database (ct->db);
ct->db = Qnil;
- ct->db_file = Qnil;
}
#endif
return Qnil;
}
ct = XCHAR_TABLE (table);
ct->table = Qunloaded;
- ct->db_file = db_file;
if (!NILP (Fdatabase_live_p (ct->db)))
Fclose_database (ct->db);
ct->db = Qnil;
if (!NILP (attribute))
{
- if (NILP (cit->db_file))
- cit->db_file
- = char_attribute_system_db_file (Qsystem_char_id, attribute, 0);
if (NILP (Fdatabase_live_p (cit->db)))
- cit->db = Fopen_database (cit->db_file, Qnil, Qnil, Qnil, Qnil);
+ {
+ Lisp_Object db_file
+ = char_attribute_system_db_file (Qsystem_char_id, attribute, 0);
+
+ cit->db = Fopen_database (db_file, Qnil, Qnil, Qnil, Qnil);
+ }
if (!NILP (cit->db))
{
Lisp_Object val
{
Lisp_Char_Table *ct = XCHAR_TABLE (table);
- if (NILP (ct->db_file))
- ct->db_file
- = char_attribute_system_db_file (Qsystem_char_id, attribute, 0);
if (NILP (Fdatabase_live_p (ct->db)))
- ct->db = Fopen_database (ct->db_file, Qnil, Qnil, Qnil, Qnil);
+ {
+ Lisp_Object db_file
+ = char_attribute_system_db_file (Qsystem_char_id, attribute, 0);
+
+ ct->db = Fopen_database (db_file, Qnil, Qnil, Qnil, Qnil);
+ }
if (!NILP (ct->db))
{
struct gcpro gcpro1;