Mercurial > hg > xemacs-beta
annotate lib-src/getopt.h @ 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 | abe6d1db359e |
| children | ed624ab64583 |
| rev | line source |
|---|---|
| 428 | 1 /* Declarations for getopt. |
| 2 Copyright (C) 1989,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 #ifndef _GETOPT_H | |
| 23 #define _GETOPT_H 1 | |
| 24 | |
| 25 #ifdef __cplusplus | |
| 26 extern "C" { | |
| 27 #endif | |
| 28 | |
| 29 /* For communication from `getopt' to the caller. | |
| 30 When `getopt' finds an option that takes an argument, | |
| 31 the argument value is returned here. | |
| 32 Also, when `ordering' is RETURN_IN_ORDER, | |
| 33 each non-option ARGV-element is returned here. */ | |
| 34 | |
| 35 extern char *optarg; | |
| 36 | |
| 37 /* Index in ARGV of the next element to be scanned. | |
| 38 This is used for communication to and from the caller | |
| 39 and for communication between successive calls to `getopt'. | |
| 40 | |
| 41 On entry to `getopt', zero means this is the first call; initialize. | |
| 42 | |
| 43 When `getopt' returns -1, this is the index of the first of the | |
| 44 non-option elements that the caller should itself scan. | |
| 45 | |
| 46 Otherwise, `optind' communicates from one call to the next | |
| 47 how much of ARGV has been scanned so far. */ | |
| 48 | |
| 49 extern int optind; | |
| 50 | |
| 51 /* Callers store zero here to inhibit the error message `getopt' prints | |
| 52 for unrecognized options. */ | |
| 53 | |
| 54 extern int opterr; | |
| 55 | |
| 56 /* Set to an option character which was unrecognized. */ | |
| 57 | |
| 58 extern int optopt; | |
| 59 | |
| 60 /* Describe the long-named options requested by the application. | |
| 61 The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector | |
| 62 of `struct option' terminated by an element containing a name which is | |
| 63 zero. | |
| 64 | |
| 65 The field `has_arg' is: | |
| 66 no_argument (or 0) if the option does not take an argument, | |
| 67 required_argument (or 1) if the option requires an argument, | |
| 68 optional_argument (or 2) if the option takes an optional argument. | |
| 69 | |
| 70 If the field `flag' is not NULL, it points to a variable that is set | |
| 71 to the value given in the field `val' when the option is found, but | |
| 72 left unchanged if the option is not found. | |
| 73 | |
| 74 To have a long-named option do something other than set an `int' to | |
| 75 a compiled-in constant, such as set a value from `optarg', set the | |
| 76 option's `flag' field to zero and its `val' field to a nonzero | |
| 77 value (the equivalent single-letter option character, if there is | |
| 78 one). For long options that have a zero `flag' field, `getopt' | |
| 79 returns the contents of the `val' field. */ | |
| 80 | |
| 81 struct option | |
| 82 { | |
| 83 #if defined (__STDC__) && __STDC__ | |
| 84 const char *name; | |
| 85 #else | |
| 86 char *name; | |
| 87 #endif | |
| 88 /* has_arg can't be an enum because some compilers complain about | |
| 89 type mismatches in all the code that assumes it is an int. */ | |
| 90 int has_arg; | |
| 91 int *flag; | |
| 92 int val; | |
| 93 }; | |
| 94 | |
| 95 /* Names for the values of the `has_arg' field of `struct option'. */ | |
| 96 | |
| 97 #define no_argument 0 | |
| 98 #define required_argument 1 | |
| 99 #define optional_argument 2 | |
| 100 | |
| 442 | 101 #if defined (__GNU_LIBRARY__) || defined (__cplusplus) || defined (CYGWIN) |
| 428 | 102 /* Many other libraries have conflicting prototypes for getopt, with |
| 103 differences in the consts, in stdlib.h. To avoid compilation | |
| 104 errors, only prototype getopt for the GNU C library. */ | |
| 105 extern int getopt (int argc, char *const *argv, const char *shortopts); | |
| 440 | 106 #else /* not __GNU_LIBRARY__ || C++ */ |
| 428 | 107 extern int getopt (); |
| 440 | 108 #endif /* __GNU_LIBRARY__ || C++ */ |
| 428 | 109 extern int getopt_long (int argc, char *const *argv, const char *shortopts, |
| 110 const struct option *longopts, int *longind); | |
| 111 extern int getopt_long_only (int argc, char *const *argv, | |
| 112 const char *shortopts, | |
| 113 const struct option *longopts, int *longind); | |
| 114 | |
| 115 /* Internal only. Users should not call this directly. */ | |
| 116 extern int _getopt_internal (int argc, char *const *argv, | |
| 117 const char *shortopts, | |
| 118 const struct option *longopts, int *longind, | |
| 119 int long_only); | |
| 120 | |
| 121 #ifdef __cplusplus | |
| 122 } | |
| 123 #endif | |
| 124 | |
| 125 #endif /* _GETOPT_H */ |