comparison src/chartab.c @ 934:c925bacdda60

[xemacs-hg @ 2002-07-29 09:21:12 by michaels] 2002-07-17 Marcus Crestani <crestani@informatik.uni-tuebingen.de> Markus Kaltenbach <makalten@informatik.uni-tuebingen.de> Mike Sperber <mike@xemacs.org> configure flag to turn these changes on: --use-kkcc First we added a dumpable flag to lrecord_implementation. It shows, if the object is dumpable and should be processed by the dumper. * lrecord.h (struct lrecord_implementation): added dumpable flag (MAKE_LRECORD_IMPLEMENTATION): fitted the different makro definitions to the new lrecord_implementation and their calls. Then we changed mark_object, that it no longer needs a mark method for those types that have pdump descritions. * alloc.c: (mark_object): If the object has a description, the new mark algorithm is called, and the object is marked according to its description. Otherwise it uses the mark method like before. These procedures mark objects according to their descriptions. They are modeled on the corresponding pdumper procedures. (mark_with_description): (get_indirect_count): (structure_size): (mark_struct_contents): These procedures still call mark_object, this is needed while there are Lisp_Objects without descriptions left. We added pdump descriptions for many Lisp_Objects: * extents.c: extent_auxiliary_description * database.c: database_description * gui.c: gui_item_description * scrollbar.c: scrollbar_instance_description * toolbar.c: toolbar_button_description * event-stream.c: command_builder_description * mule-charset.c: charset_description * device-msw.c: devmode_description * dialog-msw.c: mswindows_dialog_id_description * eldap.c: ldap_description * postgresql.c: pgconn_description pgresult_description * tooltalk.c: tooltalk_message_description tooltalk_pattern_description * ui-gtk.c: emacs_ffi_description emacs_gtk_object_description * events.c: * events.h: * event-stream.c: * event-Xt.c: * event-gtk.c: * event-tty.c: To write a pdump description for Lisp_Event, we converted every struct in the union event to a Lisp_Object. So we created nine new Lisp_Objects: Lisp_Key_Data, Lisp_Button_Data, Lisp_Motion_Data, Lisp_Process_Data, Lisp_Timeout_Data, Lisp_Eval_Data, Lisp_Misc_User_Data, Lisp_Magic_Data, Lisp_Magic_Eval_Data. We also wrote makro selectors and mutators for the fields of the new designed Lisp_Event and added everywhere these new abstractions. We implemented XD_UNION support in (mark_with_description), so we can describe exspecially console/device specific data with XD_UNION. To describe with XD_UNION, we added a field to these objects, which holds the variant type of the object. This field is initialized in the appendant constructor. The variant is an integer, it has also to be described in an description, if XD_UNION is used. XD_UNION is used in following descriptions: * console.c: console_description (get_console_variant): returns the variant (create_console): added variant initialization * console.h (console_variant): the different console types * console-impl.h (struct console): added enum console_variant contype * device.c: device_description (Fmake_device): added variant initialization * device-impl.h (struct device): added enum console_variant devtype * objects.c: image_instance_description font_instance_description (Fmake_color_instance): added variant initialization (Fmake_font_instance): added variant initialization * objects-impl.h (struct Lisp_Color_Instance): added color_instance_type * objects-impl.h (struct Lisp_Font_Instance): added font_instance_type * process.c: process_description (make_process_internal): added variant initialization * process.h (process_variant): the different process types
author michaels
date Mon, 29 Jul 2002 09:21:25 +0000
parents 804517e16990
children e22b0213b713
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
136 static const struct lrecord_description char_table_entry_description[] = { 136 static const struct lrecord_description char_table_entry_description[] = {
137 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table_Entry, level2), 96 }, 137 { XD_LISP_OBJECT_ARRAY, offsetof (Lisp_Char_Table_Entry, level2), 96 },
138 { XD_END } 138 { XD_END }
139 }; 139 };
140 140
141 #ifdef USE_KKCC
142 DEFINE_LRECORD_IMPLEMENTATION ("char-table-entry", char_table_entry,
143 1, /* dumpable flag */
144 mark_char_table_entry, internal_object_printer,
145 0, char_table_entry_equal,
146 char_table_entry_hash,
147 char_table_entry_description,
148 Lisp_Char_Table_Entry);
149 #else /* not USE_KKCC */
141 DEFINE_LRECORD_IMPLEMENTATION ("char-table-entry", char_table_entry, 150 DEFINE_LRECORD_IMPLEMENTATION ("char-table-entry", char_table_entry,
142 mark_char_table_entry, internal_object_printer, 151 mark_char_table_entry, internal_object_printer,
143 0, char_table_entry_equal, 152 0, char_table_entry_equal,
144 char_table_entry_hash, 153 char_table_entry_hash,
145 char_table_entry_description, 154 char_table_entry_description,
146 Lisp_Char_Table_Entry); 155 Lisp_Char_Table_Entry);
156 #endif /* not USE_KKCC */
157
147 #endif /* MULE */ 158 #endif /* MULE */
148 159
149 static Lisp_Object 160 static Lisp_Object
150 mark_char_table (Lisp_Object obj) 161 mark_char_table (Lisp_Object obj)
151 { 162 {
387 { XD_LISP_OBJECT, offsetof (Lisp_Char_Table, mirror_table) }, 398 { XD_LISP_OBJECT, offsetof (Lisp_Char_Table, mirror_table) },
388 { XD_LO_LINK, offsetof (Lisp_Char_Table, next_table) }, 399 { XD_LO_LINK, offsetof (Lisp_Char_Table, next_table) },
389 { XD_END } 400 { XD_END }
390 }; 401 };
391 402
403 #ifdef USE_KKCC
404 DEFINE_LRECORD_IMPLEMENTATION ("char-table", char_table,
405 1, /*dumpable-flag*/
406 mark_char_table, print_char_table, 0,
407 char_table_equal, char_table_hash,
408 char_table_description,
409 Lisp_Char_Table);
410 #else /* not USE_KKCC */
392 DEFINE_LRECORD_IMPLEMENTATION ("char-table", char_table, 411 DEFINE_LRECORD_IMPLEMENTATION ("char-table", char_table,
393 mark_char_table, print_char_table, 0, 412 mark_char_table, print_char_table, 0,
394 char_table_equal, char_table_hash, 413 char_table_equal, char_table_hash,
395 char_table_description, 414 char_table_description,
396 Lisp_Char_Table); 415 Lisp_Char_Table);
416 #endif /* not USE_KKCC */
397 417
398 DEFUN ("char-table-p", Fchar_table_p, 1, 1, 0, /* 418 DEFUN ("char-table-p", Fchar_table_p, 1, 1, 0, /*
399 Return non-nil if OBJECT is a char table. 419 Return non-nil if OBJECT is a char table.
400 */ 420 */
401 (object)) 421 (object))