Mercurial > hg > xemacs-beta
comparison src/casetab.c @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 06:42:16 -0600 |
parents | 6ef8256a020a |
children | b5df3737028a |
comparison
equal
deleted
inserted
replaced
5012:f68b2ec914e3 | 5013:ae48681c47fa |
---|---|
302 | 302 |
303 static int | 303 static int |
304 compute_canon_mapper (struct chartab_range *range, | 304 compute_canon_mapper (struct chartab_range *range, |
305 Lisp_Object UNUSED (table), Lisp_Object val, void *arg) | 305 Lisp_Object UNUSED (table), Lisp_Object val, void *arg) |
306 { | 306 { |
307 Lisp_Object casetab = VOID_TO_LISP (arg); | 307 Lisp_Object casetab = GET_LISP_FROM_VOID (arg); |
308 if (range->type == CHARTAB_RANGE_CHAR) | 308 if (range->type == CHARTAB_RANGE_CHAR) |
309 SET_TRT_TABLE_OF (XCASE_TABLE_CANON (casetab), range->ch, | 309 SET_TRT_TABLE_OF (XCASE_TABLE_CANON (casetab), range->ch, |
310 TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (casetab), | 310 TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (casetab), |
311 TRT_TABLE_OF (XCASE_TABLE_UPCASE (casetab), | 311 TRT_TABLE_OF (XCASE_TABLE_UPCASE (casetab), |
312 XCHAR (val)))); | 312 XCHAR (val)))); |
317 static int | 317 static int |
318 initialize_identity_mapper (struct chartab_range *range, | 318 initialize_identity_mapper (struct chartab_range *range, |
319 Lisp_Object UNUSED (table), | 319 Lisp_Object UNUSED (table), |
320 Lisp_Object UNUSED (val), void *arg) | 320 Lisp_Object UNUSED (val), void *arg) |
321 { | 321 { |
322 Lisp_Object trt = VOID_TO_LISP (arg); | 322 Lisp_Object trt = GET_LISP_FROM_VOID (arg); |
323 if (range->type == CHARTAB_RANGE_CHAR) | 323 if (range->type == CHARTAB_RANGE_CHAR) |
324 SET_TRT_TABLE_OF (trt, range->ch, range->ch); | 324 SET_TRT_TABLE_OF (trt, range->ch, range->ch); |
325 | 325 |
326 return 0; | 326 return 0; |
327 } | 327 } |
329 static int | 329 static int |
330 compute_up_or_eqv_mapper (struct chartab_range *range, | 330 compute_up_or_eqv_mapper (struct chartab_range *range, |
331 Lisp_Object UNUSED (table), | 331 Lisp_Object UNUSED (table), |
332 Lisp_Object val, void *arg) | 332 Lisp_Object val, void *arg) |
333 { | 333 { |
334 Lisp_Object inverse = VOID_TO_LISP (arg); | 334 Lisp_Object inverse = GET_LISP_FROM_VOID (arg); |
335 Ichar toch = XCHAR (val); | 335 Ichar toch = XCHAR (val); |
336 | 336 |
337 if (range->type == CHARTAB_RANGE_CHAR && range->ch != toch) | 337 if (range->type == CHARTAB_RANGE_CHAR && range->ch != toch) |
338 { | 338 { |
339 Ichar c = TRT_TABLE_OF (inverse, toch); | 339 Ichar c = TRT_TABLE_OF (inverse, toch); |
359 range.type = CHARTAB_RANGE_ALL; | 359 range.type = CHARTAB_RANGE_ALL; |
360 /* Turn off dirty flag first so we don't get infinite recursion when | 360 /* Turn off dirty flag first so we don't get infinite recursion when |
361 retrieving the values below! */ | 361 retrieving the values below! */ |
362 XCASE_TABLE (casetab)->dirty = 0; | 362 XCASE_TABLE (casetab)->dirty = 0; |
363 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | 363 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, |
364 compute_canon_mapper, LISP_TO_VOID (casetab)); | 364 compute_canon_mapper, STORE_LISP_IN_VOID (casetab)); |
365 map_char_table (XCASE_TABLE_CANON (casetab), &range, | 365 map_char_table (XCASE_TABLE_CANON (casetab), &range, |
366 initialize_identity_mapper, | 366 initialize_identity_mapper, |
367 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | 367 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); |
368 map_char_table (XCASE_TABLE_CANON (casetab), &range, | 368 map_char_table (XCASE_TABLE_CANON (casetab), &range, |
369 compute_up_or_eqv_mapper, | 369 compute_up_or_eqv_mapper, |
370 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | 370 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); |
371 } | 371 } |
372 | 372 |
373 DEFUN ("current-case-table", Fcurrent_case_table, 0, 1, 0, /* | 373 DEFUN ("current-case-table", Fcurrent_case_table, 0, 1, 0, /* |
374 Return the case table of BUFFER, which defaults to the current buffer. | 374 Return the case table of BUFFER, which defaults to the current buffer. |
375 */ | 375 */ |
434 | 434 |
435 if (NILP (up)) | 435 if (NILP (up)) |
436 { | 436 { |
437 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | 437 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, |
438 initialize_identity_mapper, | 438 initialize_identity_mapper, |
439 LISP_TO_VOID (XCASE_TABLE_UPCASE (casetab))); | 439 STORE_LISP_IN_VOID (XCASE_TABLE_UPCASE (casetab))); |
440 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | 440 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, |
441 compute_up_or_eqv_mapper, | 441 compute_up_or_eqv_mapper, |
442 LISP_TO_VOID (XCASE_TABLE_UPCASE (casetab))); | 442 STORE_LISP_IN_VOID (XCASE_TABLE_UPCASE (casetab))); |
443 } | 443 } |
444 else | 444 else |
445 convert_old_style_syntax_string (XCASE_TABLE_UPCASE (casetab), up); | 445 convert_old_style_syntax_string (XCASE_TABLE_UPCASE (casetab), up); |
446 | 446 |
447 if (NILP (canon)) | 447 if (NILP (canon)) |
448 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | 448 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, |
449 compute_canon_mapper, LISP_TO_VOID (casetab)); | 449 compute_canon_mapper, STORE_LISP_IN_VOID (casetab)); |
450 else | 450 else |
451 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), canon); | 451 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), canon); |
452 | 452 |
453 if (NILP (eqv)) | 453 if (NILP (eqv)) |
454 { | 454 { |
455 map_char_table (XCASE_TABLE_CANON (casetab), &range, | 455 map_char_table (XCASE_TABLE_CANON (casetab), &range, |
456 initialize_identity_mapper, | 456 initialize_identity_mapper, |
457 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | 457 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); |
458 map_char_table (XCASE_TABLE_CANON (casetab), &range, | 458 map_char_table (XCASE_TABLE_CANON (casetab), &range, |
459 compute_up_or_eqv_mapper, | 459 compute_up_or_eqv_mapper, |
460 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | 460 STORE_LISP_IN_VOID (XCASE_TABLE_EQV (casetab))); |
461 } | 461 } |
462 else | 462 else |
463 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), eqv); | 463 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), eqv); |
464 } | 464 } |
465 | 465 |