Mercurial > hg > xemacs-beta
annotate lib-src/getopt1.c @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 01:02:40 -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 */ |