Mercurial > hg > xemacs-beta
annotate src/emodules.h @ 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 | 3461165c79be |
children | 308d34e9f07d |
rev | line source |
---|---|
388 | 1 /* emodules.h - Declarations and definitions for XEmacs loadable modules. |
2 (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 #ifndef EMODULES_HDR | |
22 | |
23 #ifndef EMODULES_GATHER_VERSION | |
24 #define EMODULES_HDR | |
25 #endif | |
26 | |
996 | 27 #define EMODULES_VERSION "1.1.0" |
388 | 28 #define EMODULES_MAJOR 1 |
996 | 29 #define EMODULES_MINOR 1 |
388 | 30 #define EMODULES_PATCH 0 |
31 #define EMODULES_REVISION (long)((EMODULES_MAJOR * 1000) + \ | |
32 (EMODULES_MINOR * 10) + \ | |
33 (EMODULES_PATCH)) | |
34 | |
35 #ifndef EMODULES_GATHER_VERSION | |
36 #include <config.h> | |
37 #include "lisp.h" | |
38 #include "sysdep.h" | |
39 #include "window.h" | |
40 #include "buffer.h" | |
41 #include "insdel.h" | |
42 #include "frame.h" | |
43 #include "lstream.h" | |
44 #include "file-coding.h" | |
45 | |
46 /* Module loading technology version number */ | |
47 extern Lisp_Object Vmodule_version; | |
48 | |
49 /* XEmacs version Information */ | |
50 extern Lisp_Object Vemacs_major_version; | |
51 extern Lisp_Object Vemacs_minor_version; | |
52 | |
53 /* | |
54 * Load in a C module. The first argument is the name of the .so file, the | |
55 * second is the name of the module, and the third is the module version. | |
56 * If the module name is NULL, we will always reload the .so. If it is not | |
57 * NULL, we check to make sure we haven't loaded it before. If the version | |
442 | 58 * is specified, we check to make sure we didn't load the module of the |
388 | 59 * specified version before. We also use these as checks when we open the |
60 * module to make sure we have the right module. | |
61 */ | |
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
2367
diff
changeset
|
62 extern void emodules_load (const Ibyte *module, const Ibyte *modname, |
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
2367
diff
changeset
|
63 const Ibyte *modver); |
388 | 64 |
65 /* | |
66 * Because subrs and symbols added by a dynamic module are not part of | |
67 * the make-docfile process, we need a clean way to get the variables | |
442 | 68 * and functions documented. Since people don't like the idea of making |
388 | 69 * shared modules use different versions of DEFSUBR() and DEFVAR_LISP() |
70 * and friends, we need these two functions to insert the documentation | |
71 * into the right place. These functions will be called by the module | |
72 * init code, generated by ellcc during initialization mode. | |
73 */ | |
4956
3461165c79be
fix compile errors due to mismatched string pointer types
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
74 EXTERN_C MODULE_API void emodules_doc_subr (const Ascbyte *objname, |
3461165c79be
fix compile errors due to mismatched string pointer types
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
75 const Ascbyte *docstr); |
3461165c79be
fix compile errors due to mismatched string pointer types
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
76 EXTERN_C MODULE_API void emodules_doc_sym (const Ascbyte *objname, |
3461165c79be
fix compile errors due to mismatched string pointer types
Ben Wing <ben@xemacs.org>
parents:
4952
diff
changeset
|
77 const Ascbyte *docstr); |
388 | 78 |
79 #define CDOCSUBR(Fname, DOC) emodules_doc_subr (Fname, DOC) | |
80 #define CDOCSYM(Sname, DOC) emodules_doc_sym (Sname, DOC) | |
81 #endif /* EMODULES_GATHER_VERSION */ | |
82 | |
996 | 83 /* We should not expose module entities to the portable dumper. */ |
1632 | 84 #if defined(PDUMP) && defined(EMACS_MODULE) |
2367 | 85 #undef dump_add_root_block_ptr |
86 #define dump_add_root_block_ptr(varaddr,descaddr) DO_NOTHING | |
1220 | 87 #undef dump_add_opaque |
996 | 88 #define dump_add_opaque(varaddr,size) DO_NOTHING |
1220 | 89 #undef dump_add_root_block |
996 | 90 #define dump_add_root_block(ptraddress,desc) DO_NOTHING |
1111 | 91 #undef dump_add_opaque_int |
996 | 92 #define dump_add_opaque_int(int_varaddr) DO_NOTHING |
1111 | 93 #undef dump_add_opaque_fixnum |
996 | 94 #define dump_add_opaque_fixnum(fixnum_varaddr) DO_NOTHING |
1220 | 95 #undef dump_add_root_lisp_object |
1204 | 96 #define dump_add_root_lisp_object(varaddr) DO_NOTHING |
1220 | 97 #undef dump_add_weak_object_chain |
996 | 98 #define dump_add_weak_object_chain(varaddr) DO_NOTHING |
1111 | 99 #undef staticpro |
996 | 100 #define staticpro(DSF_location) staticpro_nodump(DSF_location) |
1632 | 101 #undef unstaticpro |
102 #define unstaticpro(DSF_location) unstaticpro_nodump(DFS_location) | |
996 | 103 |
104 #undef DEFSYMBOL | |
1220 | 105 #define DEFSYMBOL(name) DEFSYMBOL_NO_DUMP (name) |
996 | 106 #undef DEFSYMBOL_MULTIWORD_PREDICATE |
107 #define DEFSYMBOL_MULTIWORD_PREDICATE(name) \ | |
108 DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP (name) | |
1220 | 109 #undef defsymbol |
996 | 110 #define defsymbol(location,name) defsymbol_nodump (location, name) |
1632 | 111 |
112 #endif /* defined(PDUMP) && defined(EMACS_MODULE) */ | |
996 | 113 |
388 | 114 #endif /* EMODULES_HDR */ |