Mercurial > hg > xemacs-beta
annotate lib-src/getopt1.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 | 84b14dcb0985 |
| children | 061f4f90f874 |
| rev | line source |
|---|---|
| 428 | 1 /* getopt_long and getopt_long_only entry points for GNU getopt. |
| 2 Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc. | |
| 3 | |
| 4 NOTE: The canonical source of this file is maintained with the GNU C Library. | |
| 5 Bugs can be reported to bug-glibc@prep.ai.mit.edu. | |
| 6 | |
| 7 This program is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 This program is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with this program; if not, write to the Free Software | |
| 19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | |
| 20 USA. */ | |
| 21 | |
| 22 #ifdef HAVE_CONFIG_H | |
| 438 | 23 #include <config.h> |
| 428 | 24 #endif |
| 25 | |
| 26 #include "getopt.h" | |
| 27 | |
| 28 #include <stdio.h> | |
| 29 | |
| 30 /* Comment out all this code if we are using the GNU C Library, and are not | |
| 31 actually compiling the library itself. This code is part of the GNU C | |
| 32 Library, but also included in many other GNU distributions. Compiling | |
| 33 and linking in this code is a waste when using the GNU C library | |
| 34 (especially if it is a shared library). Rather than having every GNU | |
| 35 program understand `configure --with-gnu-libc' and omit the object files, | |
| 36 it is simpler to just do this in the source for each such file. */ | |
| 37 | |
| 38 #define GETOPT_INTERFACE_VERSION 2 | |
| 39 #if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2 | |
| 40 #include <gnu-versions.h> | |
| 41 #if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION | |
| 42 #define ELIDE_CODE | |
| 43 #endif | |
| 44 #endif | |
| 45 | |
| 46 #ifndef ELIDE_CODE | |
| 47 | |
| 48 | |
| 49 /* This needs to come after some library #include | |
| 50 to get __GNU_LIBRARY__ defined. */ | |
| 51 #ifdef __GNU_LIBRARY__ | |
| 52 #include <stdlib.h> | |
| 53 #endif | |
| 54 | |
| 55 #ifndef NULL | |
| 56 #define NULL 0 | |
| 57 #endif | |
| 58 | |
| 59 int | |
| 60 getopt_long (int argc, char *const *argv, const char *options, | |
| 61 const struct option *long_options, int *opt_index) | |
| 62 { | |
| 63 return _getopt_internal (argc, argv, options, long_options, opt_index, 0); | |
| 64 } | |
| 65 | |
| 66 /* Like getopt_long, but '-' as well as '--' can indicate a long option. | |
| 67 If an option that starts with '-' (not '--') doesn't match a long option, | |
| 68 but does match a short option, it is parsed as a short option | |
| 69 instead. */ | |
| 70 | |
| 71 int | |
| 72 getopt_long_only (int argc, char *const *argv, const char *options, | |
| 73 const struct option *long_options, int *opt_index) | |
| 74 { | |
| 75 return _getopt_internal (argc, argv, options, long_options, opt_index, 1); | |
| 76 } | |
| 77 | |
| 78 | |
| 79 #endif /* Not ELIDE_CODE. */ | |
| 80 | |
| 81 #ifdef TEST | |
| 82 | |
| 83 #include <stdio.h> | |
| 84 | |
| 85 int | |
| 86 main (int argc, char **argv) | |
| 87 { | |
| 88 int c; | |
| 89 int digit_optind = 0; | |
| 90 | |
| 91 while (1) | |
| 92 { | |
| 93 int this_option_optind = optind ? optind : 1; | |
| 94 int option_index = 0; | |
| 95 static struct option long_options[] = | |
| 96 { | |
| 97 {"add", 1, 0, 0}, | |
| 98 {"append", 0, 0, 0}, | |
| 99 {"delete", 1, 0, 0}, | |
| 100 {"verbose", 0, 0, 0}, | |
| 101 {"create", 0, 0, 0}, | |
| 102 {"file", 1, 0, 0}, | |
| 103 {0, 0, 0, 0} | |
| 104 }; | |
| 105 | |
| 106 c = getopt_long (argc, argv, "abc:d:0123456789", | |
| 107 long_options, &option_index); | |
| 108 if (c == -1) | |
| 109 break; | |
| 110 | |
| 111 switch (c) | |
| 112 { | |
| 113 case 0: | |
| 114 printf ("option %s", long_options[option_index].name); | |
| 115 if (optarg) | |
| 116 printf (" with arg %s", optarg); | |
| 117 printf ("\n"); | |
| 118 break; | |
| 119 | |
| 120 case '0': | |
| 121 case '1': | |
| 122 case '2': | |
| 123 case '3': | |
| 124 case '4': | |
| 125 case '5': | |
| 126 case '6': | |
| 127 case '7': | |
| 128 case '8': | |
| 129 case '9': | |
| 130 if (digit_optind != 0 && digit_optind != this_option_optind) | |
| 131 printf ("digits occur in two different argv-elements.\n"); | |
| 132 digit_optind = this_option_optind; | |
| 133 printf ("option %c\n", c); | |
| 134 break; | |
| 135 | |
| 136 case 'a': | |
| 137 printf ("option a\n"); | |
| 138 break; | |
| 139 | |
| 140 case 'b': | |
| 141 printf ("option b\n"); | |
| 142 break; | |
| 143 | |
| 144 case 'c': | |
| 145 printf ("option c with value `%s'\n", optarg); | |
| 146 break; | |
| 147 | |
| 148 case 'd': | |
| 149 printf ("option d with value `%s'\n", optarg); | |
| 150 break; | |
| 151 | |
| 152 case '?': | |
| 153 break; | |
| 154 | |
| 155 default: | |
| 156 printf ("?? getopt returned character code 0%o ??\n", c); | |
| 157 } | |
| 158 } | |
| 159 | |
| 160 if (optind < argc) | |
| 161 { | |
| 162 printf ("non-option ARGV-elements: "); | |
| 163 while (optind < argc) | |
| 164 printf ("%s ", argv[optind++]); | |
| 165 printf ("\n"); | |
| 166 } | |
| 167 | |
| 168 exit (0); | |
| 169 } | |
| 170 | |
| 171 #endif /* TEST */ |