Mercurial > hg > xemacs-beta
annotate src/casefiddle.c @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | ecf1ebac70d8 |
| children | 6bc1f3f6cf0d |
| rev | line source |
|---|---|
| 428 | 1 /* XEmacs case conversion functions. |
| 2 Copyright (C) 1985, 1992, 1993, 1994, 1997, 1998 Free Software Foundation, Inc. | |
| 826 | 3 Copyright (C) 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs 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 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: FSF 19.34, but substantially rewritten by Martin. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 | |
| 27 #include "buffer.h" | |
| 28 #include "insdel.h" | |
| 29 #include "syntax.h" | |
| 30 | |
| 31 enum case_action {CASE_UP, CASE_DOWN, CASE_CAPITALIZE, CASE_CAPITALIZE_UP}; | |
| 32 | |
| 33 static Lisp_Object | |
| 444 | 34 casify_object (enum case_action flag, Lisp_Object string_or_char, |
| 35 Lisp_Object buffer) | |
| 428 | 36 { |
| 37 struct buffer *buf = decode_buffer (buffer, 0); | |
| 38 | |
| 39 retry: | |
| 40 | |
| 444 | 41 if (CHAR_OR_CHAR_INTP (string_or_char)) |
| 428 | 42 { |
| 867 | 43 Ichar c; |
| 444 | 44 CHECK_CHAR_COERCE_INT (string_or_char); |
| 45 c = XCHAR (string_or_char); | |
| 428 | 46 c = (flag == CASE_DOWN) ? DOWNCASE (buf, c) : UPCASE (buf, c); |
| 47 return make_char (c); | |
| 48 } | |
| 49 | |
| 444 | 50 if (STRINGP (string_or_char)) |
| 428 | 51 { |
| 826 | 52 Lisp_Object syntax_table = buf->mirror_syntax_table; |
| 867 | 53 Ibyte *storage = |
| 2367 | 54 alloca_ibytes (XSTRING_LENGTH (string_or_char) * MAX_ICHAR_LEN); |
| 867 | 55 Ibyte *newp = storage; |
| 56 Ibyte *oldp = XSTRING_DATA (string_or_char); | |
| 57 Ibyte *endp = oldp + XSTRING_LENGTH (string_or_char); | |
| 428 | 58 int wordp = 0, wordp_prev; |
| 59 | |
| 771 | 60 while (oldp < endp) |
| 428 | 61 { |
| 867 | 62 Ichar c = itext_ichar (oldp); |
| 428 | 63 switch (flag) |
| 64 { | |
| 65 case CASE_UP: | |
| 66 c = UPCASE (buf, c); | |
| 67 break; | |
| 68 case CASE_DOWN: | |
| 69 c = DOWNCASE (buf, c); | |
| 70 break; | |
| 71 case CASE_CAPITALIZE: | |
| 72 case CASE_CAPITALIZE_UP: | |
| 73 wordp_prev = wordp; | |
| 74 wordp = WORD_SYNTAX_P (syntax_table, c); | |
| 75 if (!wordp) break; | |
| 76 if (wordp_prev) | |
| 77 { | |
| 78 if (flag == CASE_CAPITALIZE) | |
| 79 c = DOWNCASE (buf, c); | |
| 80 } | |
| 81 else | |
| 82 c = UPCASE (buf, c); | |
| 83 break; | |
| 84 } | |
| 85 | |
| 867 | 86 newp += set_itext_ichar (newp, c); |
| 87 INC_IBYTEPTR (oldp); | |
| 428 | 88 } |
| 89 | |
| 90 return make_string (storage, newp - storage); | |
| 91 } | |
| 92 | |
| 444 | 93 string_or_char = wrong_type_argument (Qchar_or_string_p, string_or_char); |
| 428 | 94 goto retry; |
| 95 } | |
| 96 | |
| 97 DEFUN ("upcase", Fupcase, 1, 2, 0, /* | |
| 444 | 98 Convert STRING-OR-CHAR to upper case and return that. |
| 99 STRING-OR-CHAR may be a character or string. The result has the same type. | |
| 100 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 101 See also `capitalize', `downcase' and `upcase-initials'. |
| 102 Optional second arg BUFFER specifies which buffer's case tables to use, | |
| 103 and defaults to the current buffer. | |
| 104 */ | |
| 444 | 105 (string_or_char, buffer)) |
| 428 | 106 { |
| 444 | 107 return casify_object (CASE_UP, string_or_char, buffer); |
| 428 | 108 } |
| 109 | |
| 110 DEFUN ("downcase", Fdowncase, 1, 2, 0, /* | |
| 444 | 111 Convert STRING-OR-CHAR to lower case and return that. |
| 112 STRING-OR-CHAR may be a character or string. The result has the same type. | |
| 113 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 114 Optional second arg BUFFER specifies which buffer's case tables to use, |
| 115 and defaults to the current buffer. | |
| 116 */ | |
| 444 | 117 (string_or_char, buffer)) |
| 428 | 118 { |
| 444 | 119 return casify_object (CASE_DOWN, string_or_char, buffer); |
| 428 | 120 } |
| 121 | |
| 122 DEFUN ("capitalize", Fcapitalize, 1, 2, 0, /* | |
| 444 | 123 Convert STRING-OR-CHAR to capitalized form and return that. |
| 428 | 124 This means that each word's first character is upper case |
| 125 and the rest is lower case. | |
| 444 | 126 STRING-OR-CHAR may be a character or string. The result has the same type. |
| 127 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 128 Optional second arg BUFFER specifies which buffer's case tables to use, |
| 129 and defaults to the current buffer. | |
| 130 */ | |
| 444 | 131 (string_or_char, buffer)) |
| 428 | 132 { |
| 444 | 133 return casify_object (CASE_CAPITALIZE, string_or_char, buffer); |
| 428 | 134 } |
| 135 | |
| 136 /* Like Fcapitalize but change only the initial characters. */ | |
| 137 | |
| 138 DEFUN ("upcase-initials", Fupcase_initials, 1, 2, 0, /* | |
| 444 | 139 Convert the initial of each word in STRING-OR-CHAR to upper case. |
| 428 | 140 Do not change the other letters of each word. |
| 444 | 141 STRING-OR-CHAR may be a character or string. The result has the same type. |
| 142 STRING-OR-CHAR is not altered--the value is a copy. | |
| 428 | 143 Optional second arg BUFFER specifies which buffer's case tables to use, |
| 144 and defaults to the current buffer. | |
| 145 */ | |
| 444 | 146 (string_or_char, buffer)) |
| 428 | 147 { |
| 444 | 148 return casify_object (CASE_CAPITALIZE_UP, string_or_char, buffer); |
| 428 | 149 } |
| 150 | |
| 151 /* flag is CASE_UP, CASE_DOWN or CASE_CAPITALIZE or CASE_CAPITALIZE_UP. | |
| 444 | 152 START and END specify range of buffer to operate on. */ |
| 428 | 153 |
| 154 static void | |
| 444 | 155 casify_region_internal (enum case_action flag, Lisp_Object start, |
| 156 Lisp_Object end, struct buffer *buf) | |
| 428 | 157 { |
| 158 /* This function can GC */ | |
| 665 | 159 Charbpos pos, s, e; |
| 826 | 160 Lisp_Object syntax_table = buf->mirror_syntax_table; |
| 428 | 161 int mccount; |
| 162 int wordp = 0, wordp_prev; | |
| 163 | |
| 444 | 164 if (EQ (start, end)) |
| 428 | 165 /* Not modifying because nothing marked */ |
| 166 return; | |
| 167 | |
| 444 | 168 get_buffer_range_char (buf, start, end, &s, &e, 0); |
| 169 | |
| 170 mccount = begin_multiple_change (buf, s, e); | |
| 171 record_change (buf, s, e - s); | |
| 428 | 172 |
| 444 | 173 for (pos = s; pos < e; pos++) |
| 428 | 174 { |
| 867 | 175 Ichar oldc = BUF_FETCH_CHAR (buf, pos); |
| 176 Ichar c = oldc; | |
| 428 | 177 |
| 178 switch (flag) | |
| 179 { | |
| 180 case CASE_UP: | |
| 181 c = UPCASE (buf, oldc); | |
| 182 break; | |
| 183 case CASE_DOWN: | |
| 184 c = DOWNCASE (buf, oldc); | |
| 185 break; | |
| 186 case CASE_CAPITALIZE: | |
| 187 case CASE_CAPITALIZE_UP: | |
| 188 /* !!#### need to revalidate the start and end pointers in case | |
| 189 the buffer was changed */ | |
| 190 wordp_prev = wordp; | |
| 191 wordp = WORD_SYNTAX_P (syntax_table, c); | |
| 192 if (!wordp) continue; | |
| 193 if (wordp_prev) | |
| 194 { | |
| 195 if (flag == CASE_CAPITALIZE) | |
| 196 c = DOWNCASE (buf, c); | |
| 197 } | |
| 198 else | |
| 199 c = UPCASE (buf, c); | |
| 200 break; | |
| 201 } | |
| 202 | |
| 203 if (oldc == c) continue; | |
| 444 | 204 buffer_replace_char (buf, pos, c, 1, (pos == s)); |
| 428 | 205 BUF_MODIFF (buf)++; |
| 206 } | |
| 207 | |
| 208 end_multiple_change (buf, mccount); | |
| 209 } | |
| 210 | |
| 211 static Lisp_Object | |
| 444 | 212 casify_region (enum case_action flag, Lisp_Object start, Lisp_Object end, |
| 428 | 213 Lisp_Object buffer) |
| 214 { | |
| 444 | 215 casify_region_internal (flag, start, end, decode_buffer (buffer, 1)); |
| 428 | 216 return Qnil; |
| 217 } | |
| 218 | |
| 219 DEFUN ("upcase-region", Fupcase_region, 2, 3, "r", /* | |
| 220 Convert the region to upper case. In programs, wants two arguments. | |
| 221 These arguments specify the starting and ending character numbers of | |
| 222 the region to operate on. When used as a command, the text between | |
| 223 point and the mark is operated on. | |
| 224 See also `capitalize-region'. | |
| 225 Optional third arg BUFFER defaults to the current buffer. | |
| 226 */ | |
| 444 | 227 (start, end, buffer)) |
| 428 | 228 { |
| 229 /* This function can GC */ | |
| 444 | 230 return casify_region (CASE_UP, start, end, buffer); |
| 428 | 231 } |
| 232 | |
| 233 DEFUN ("downcase-region", Fdowncase_region, 2, 3, "r", /* | |
| 234 Convert the region to lower case. In programs, wants two arguments. | |
| 235 These arguments specify the starting and ending character numbers of | |
| 236 the region to operate on. When used as a command, the text between | |
| 237 point and the mark is operated on. | |
| 238 Optional third arg BUFFER defaults to the current buffer. | |
| 239 */ | |
| 444 | 240 (start, end, buffer)) |
| 428 | 241 { |
| 242 /* This function can GC */ | |
| 444 | 243 return casify_region (CASE_DOWN, start, end, buffer); |
| 428 | 244 } |
| 245 | |
| 246 DEFUN ("capitalize-region", Fcapitalize_region, 2, 3, "r", /* | |
| 247 Convert the region to capitalized form. | |
| 248 Capitalized form means each word's first character is upper case | |
| 249 and the rest of it is lower case. | |
| 250 In programs, give two arguments, the starting and ending | |
| 251 character positions to operate on. | |
| 252 Optional third arg BUFFER defaults to the current buffer. | |
| 253 */ | |
| 444 | 254 (start, end, buffer)) |
| 428 | 255 { |
| 256 /* This function can GC */ | |
| 444 | 257 return casify_region (CASE_CAPITALIZE, start, end, buffer); |
| 428 | 258 } |
| 259 | |
| 260 /* Like Fcapitalize_region but change only the initials. */ | |
| 261 | |
| 262 DEFUN ("upcase-initials-region", Fupcase_initials_region, 2, 3, "r", /* | |
| 263 Upcase the initial of each word in the region. | |
| 264 Subsequent letters of each word are not changed. | |
| 265 In programs, give two arguments, the starting and ending | |
| 266 character positions to operate on. | |
| 267 Optional third arg BUFFER defaults to the current buffer. | |
| 268 */ | |
| 444 | 269 (start, end, buffer)) |
| 428 | 270 { |
| 444 | 271 return casify_region (CASE_CAPITALIZE_UP, start, end, buffer); |
| 428 | 272 } |
| 273 | |
| 274 | |
| 275 static Lisp_Object | |
| 276 casify_word (enum case_action flag, Lisp_Object arg, Lisp_Object buffer) | |
| 277 { | |
| 665 | 278 Charbpos farend; |
| 428 | 279 struct buffer *buf = decode_buffer (buffer, 1); |
| 280 | |
| 281 CHECK_INT (arg); | |
| 282 | |
| 283 farend = scan_words (buf, BUF_PT (buf), XINT (arg)); | |
| 284 if (!farend) | |
| 285 farend = XINT (arg) > 0 ? BUF_ZV (buf) : BUF_BEGV (buf); | |
| 286 | |
| 287 casify_region_internal (flag, make_int (BUF_PT (buf)), make_int (farend), buf); | |
| 288 BUF_SET_PT (buf, max (BUF_PT (buf), farend)); | |
| 289 return Qnil; | |
| 290 } | |
| 291 | |
| 292 DEFUN ("upcase-word", Fupcase_word, 1, 2, "p", /* | |
| 444 | 293 Convert following word (or COUNT words) to upper case, moving over. |
| 428 | 294 With negative argument, convert previous words but do not move. |
| 295 See also `capitalize-word'. | |
| 296 Optional second arg BUFFER defaults to the current buffer. | |
| 297 */ | |
| 444 | 298 (count, buffer)) |
| 428 | 299 { |
| 300 /* This function can GC */ | |
| 444 | 301 return casify_word (CASE_UP, count, buffer); |
| 428 | 302 } |
| 303 | |
| 304 DEFUN ("downcase-word", Fdowncase_word, 1, 2, "p", /* | |
| 444 | 305 Convert following word (or COUNT words) to lower case, moving over. |
| 428 | 306 With negative argument, convert previous words but do not move. |
| 307 Optional second arg BUFFER defaults to the current buffer. | |
| 308 */ | |
| 444 | 309 (count, buffer)) |
| 428 | 310 { |
| 311 /* This function can GC */ | |
| 444 | 312 return casify_word (CASE_DOWN, count, buffer); |
| 428 | 313 } |
| 314 | |
| 315 DEFUN ("capitalize-word", Fcapitalize_word, 1, 2, "p", /* | |
| 444 | 316 Capitalize the following word (or COUNT words), moving over. |
| 428 | 317 This gives the word(s) a first character in upper case |
| 318 and the rest lower case. | |
| 319 With negative argument, capitalize previous words but do not move. | |
| 320 Optional second arg BUFFER defaults to the current buffer. | |
| 321 */ | |
| 444 | 322 (count, buffer)) |
| 428 | 323 { |
| 324 /* This function can GC */ | |
| 444 | 325 return casify_word (CASE_CAPITALIZE, count, buffer); |
| 428 | 326 } |
| 327 | |
| 328 | |
| 329 void | |
| 330 syms_of_casefiddle (void) | |
| 331 { | |
| 332 DEFSUBR (Fupcase); | |
| 333 DEFSUBR (Fdowncase); | |
| 334 DEFSUBR (Fcapitalize); | |
| 335 DEFSUBR (Fupcase_initials); | |
| 336 DEFSUBR (Fupcase_region); | |
| 337 DEFSUBR (Fdowncase_region); | |
| 338 DEFSUBR (Fcapitalize_region); | |
| 339 DEFSUBR (Fupcase_initials_region); | |
| 340 DEFSUBR (Fupcase_word); | |
| 341 DEFSUBR (Fdowncase_word); | |
| 342 DEFSUBR (Fcapitalize_word); | |
| 343 } |