Mercurial > hg > xemacs-beta
annotate lib-src/config.values.sh @ 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 | 3580ae2ce979 |
| children | e6508b64ee08 308d34e9f07d |
| rev | line source |
|---|---|
| 434 | 1 : #-*- Perl -*- |
| 2 eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge | |
| 3 if 0; | |
| 4 | |
| 428 | 5 # config.values.sh --- create config.values.in from ../configure |
| 6 | |
| 7 # Author: Martin Buchholz | |
| 8 # Maintainer: Martin Buchholz | |
| 9 # Keywords: configure elisp report-xemacs-bugs | |
| 10 | |
| 11 # This file is part of XEmacs. | |
| 12 | |
| 13 # XEmacs is free software; you can redistribute it and/or modify it | |
| 14 # under the terms of the GNU General Public License as published by | |
| 15 # the Free Software Foundation; either version 2, or (at your option) | |
| 16 # any later version. | |
| 17 | |
| 18 # XEmacs is distributed in the hope that it will be useful, but | |
| 19 # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 # General Public License for more details. | |
| 22 | |
| 23 # You should have received a copy of the GNU General Public License | |
| 24 # along with XEmacs; see the file COPYING. If not, write to | |
| 25 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 # Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ### Commentary: | |
| 29 | |
| 30 ## Extract all the @foo@ configuration symbols from ../configure | |
| 31 ## to make them available to elisp later (see util/config.el) | |
| 32 ## Primarily useful for creating ridiculously verbose bug reports. | |
| 33 ## | |
| 543 | 34 ## See lisp/config.el, ../configure.in, |
| 428 | 35 ## and the Autoconf documentation on AC_OUTPUT, for more details. |
| 36 ## | |
| 37 ## This script needs only to be run occasionally (before a Net release) | |
| 38 ## by an XEmacs Maintainer (consider yourself so blessed, if you are | |
| 39 ## actually reading this commentary). | |
| 40 ## | |
| 434 | 41 |
| 42 if (! -r "./configure") { | |
| 43 chdir ".." or die "Can't chdir: $!"; | |
| 44 if (! -r "./configure") { | |
| 45 die "Can't find configure!"; | |
| 46 } | |
| 47 } | |
| 428 | 48 |
| 434 | 49 sub FileContents { |
| 50 local $/ = undef; # Slurp mode | |
| 51 open (FILE, "< $_[0]") or die "$_[0]: $!"; | |
| 52 my $contents = <FILE>; | |
| 53 close FILE or die "$_[0]: $!"; | |
| 54 return $contents; | |
| 55 } | |
| 56 | |
| 57 my $configure_contents = FileContents "./configure"; | |
| 58 my $cvi_contents = FileContents "lib-src/config.values.in"; | |
| 59 | |
| 60 my $new_cvi_contents = | |
| 61 ";;; Do not edit this file! | |
| 428 | 62 ;;; This file was automatically generated, by the config.values.sh script, |
| 63 ;;; from configure, which was itself automatically generated from configure.in. | |
| 64 ;;; | |
| 543 | 65 ;;; See lisp/config.el for details on how this file is used. |
| 428 | 66 ;;; |
| 67 ;;; You are trapped in a twisty maze of strange-looking files, all autogenerated... | |
| 68 | |
| 69 ;;; configure is created, from configure.in, by autoconf | |
| 70 ;;; config.values.in is created, from configure, by config.values.sh | |
| 71 ;;; config.values is created, from config.values.in, by configure | |
| 543 | 72 ;;; config.values is read by lisp/config.el, |
| 428 | 73 ;;; to create the (Lisp object) config-value-hash-table |
| 74 | |
| 75 ;;; Variables defined in configure by AC_SUBST follow: | |
| 76 ;;; (These are used in Makefiles) | |
| 77 | |
| 434 | 78 "; |
| 428 | 79 |
| 434 | 80 my %done; |
| 81 for my $var (sort { $a cmp $b } | |
| 82 $configure_contents =~ | |
| 2651 | 83 /^s\,\@([A-Za-z0-9_]+)\@\,\$[A-Za-z0-9_]+\,;t t/mg) { |
| 434 | 84 $new_cvi_contents .= "$var \"\@$var\@\"\n" unless exists $done{$var}; |
| 85 $done{$var} = 1; | |
| 86 } | |
| 87 | |
| 88 $new_cvi_contents .= " | |
| 428 | 89 ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow: |
| 90 ;;; (These are used in C code) | |
| 91 | |
| 434 | 92 "; |
| 93 | |
| 94 if ($cvi_contents ne $new_cvi_contents) { | |
| 95 unlink "lib-src/config.values.in"; | |
| 96 open (CVI, "> lib-src/config.values.in") | |
| 97 or die "lib-src/config.values.in: $!"; | |
| 98 print CVI $new_cvi_contents; | |
| 99 close CVI | |
| 100 or die "lib-src/config.values.in: $!"; | |
| 101 } |