Mercurial > hg > xemacs-beta
annotate src/make-src-depend @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -0600 |
| parents | 6dffa171b748 |
| children | f23cd0184dcf |
| rev | line source |
|---|---|
| 428 | 1 : #-*- Perl -*- |
| 1303 | 2 |
| 3 ### make-src-depend --- update the Makefile dependency information for XEmacs | |
| 4 | |
| 428 | 5 # Copyright (C) 1998 Free Software Foundation, Inc. |
| 6 | |
| 1303 | 7 ## Author: Martin Buchholz <martin@xemacs.org> |
| 8 ## Maintainer: XEmacs Development Team | |
| 9 | |
| 10 ## This file is part of XEmacs. | |
| 11 | |
| 12 ## XEmacs is free software; you can redistribute it and/or modify it | |
| 13 ## under the terms of the GNU General Public License as published by | |
| 14 ## the Free Software Foundation; either version 2, or (at your option) | |
| 15 ## any later version. | |
| 428 | 16 |
| 1303 | 17 ## XEmacs is distributed in the hope that it will be useful, but |
| 18 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 ## General Public License for more details. | |
| 21 | |
| 22 ## You should have received a copy of the GNU General Public License | |
| 23 ## along with XEmacs; see the file COPYING. If not, write to the Free | |
| 24 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 25 ## 02111-1307, USA. | |
| 26 | |
| 428 | 27 eval 'exec perl -w -S $0 ${1+"$@"}' |
| 28 if 0; | |
| 29 | |
| 30 use strict; | |
| 31 my ($myName, $srcdir, %exists, %uses, %generated_header); | |
| 32 | |
| 33 ($myName = $0) =~ s@.*/@@; my $usage =" | |
| 34 Usage: $myName | |
| 35 | |
| 36 Generates Makefile dependencies for the XEmacs src directory. | |
| 1303 | 37 The dependencies are written to stdout. |
| 38 "; | |
| 428 | 39 |
| 40 die $usage if @ARGV; | |
| 41 | |
| 42 ($srcdir = $0) =~ s@[^/]+$@@; | |
| 43 $srcdir = "." if $srcdir eq ""; | |
| 44 chdir $srcdir or die "$srcdir: $!"; | |
| 45 | |
| 46 opendir SRCDIR, "." or die "$srcdir: $!"; | |
| 47 for (grep (/\.[ch]$/, readdir (SRCDIR))) { $exists{$_} = 1; } | |
| 48 closedir SRCDIR; | |
| 49 | |
| 50 for (qw (config.h sheap-adjust.h paths.h Emacs.ad.h)) { | |
| 51 $generated_header{$_} = 1; | |
| 52 } | |
| 53 | |
| 442 | 54 # Although this is not technically true, it ought to be true, |
| 55 # and makes the generated Makefile smaller. | |
| 56 $uses{'lisp.h'}{'config.h'} = 1; | |
| 57 | |
| 428 | 58 for my $file (keys %exists) { |
| 59 open (FILE, $file) or die "$file: $!"; | |
| 60 undef $/; $_ = <FILE>; | |
| 61 RemoveComments ($_); | |
| 62 s/[ \t]+//g; | |
| 63 # Find include dependencies | |
| 64 for (/^\#include([^\n]+)/gm) { | |
| 462 | 65 if (m@^\"([A-Za-z0-9._-]+\.[ch])\"@) { |
| 428 | 66 $uses{$file}{$1} = 1 if exists $exists{$1}; |
| 442 | 67 } elsif (m@<([A-Za-z0-9._-]+\.h)>@) { |
| 428 | 68 $uses{$file}{$1} = 1 if exists $generated_header{$1}; |
| 442 | 69 } elsif (m@\"../lwlib/([A-Za-z0-9._-]+\.h)\"@) { |
| 428 | 70 $uses{$file}{"\$(LWLIB_SRCDIR)/lwlib.h"} = 1; |
| 71 } | |
| 72 } | |
| 73 } | |
| 74 | |
| 75 # Make transitive closure of %uses | |
| 76 while (1) { | |
| 77 my $changedP = 0; | |
| 78 for my $x (keys %uses) { | |
| 79 for my $y (keys %{$uses{$x}}) { | |
| 80 for my $z (keys %{$uses{$y}}) { | |
| 81 if (! exists $uses{$x}{$z}) { | |
| 82 $uses{$x}{$z} = 1; | |
| 83 $changedP = 1; | |
| 84 } | |
| 85 } | |
| 86 } | |
| 87 } | |
| 88 last if !$changedP; | |
| 89 } | |
| 90 | |
| 91 # Print file header | |
| 92 print | |
| 442 | 93 "## This file is automatically generated by \`$myName'. Do not modify. |
| 428 | 94 |
| 442 | 95 #if defined(USE_UNION_TYPE) |
| 428 | 96 LISP_UNION_H=lisp-union.h |
| 97 #else | |
| 98 LISP_UNION_H=lisp-disunion.h | |
| 99 #endif | |
| 100 "; | |
| 101 | |
| 452 | 102 my @LISP_H = ('lisp.h', sort keys %{$uses{'lisp.h'}}); |
| 1303 | 103 print " |
| 104 #if defined(QUICK_BUILD) | |
| 105 CONFIG_H= | |
| 106 LISP_H= | |
| 107 #else | |
| 108 CONFIG_H=config.h | |
| 109 LISP_H=@{[grep (!/lisp-(dis)?union\.h/, @LISP_H)]} \$(LISP_UNION_H) | |
| 110 #endif | |
| 111 | |
| 112 "; | |
| 428 | 113 |
| 114 sub PrintDeps { | |
| 115 my $file = shift; | |
| 116 my $ofile = $file; $ofile =~ s/c$/o/; print "$ofile: "; | |
| 117 if (exists $uses{$file}{'lisp.h'}) { | |
| 4411 | 118 delete $uses{$file}{@LISP_H}; |
| 428 | 119 $uses{$file}{'$(LISP_H)'} = 1; |
| 120 } | |
| 1303 | 121 # Note: If both config.h and lisp.h are dependencies, config.h got deleted |
| 122 # by the last clause. | |
| 123 if (exists $uses{$file}{'config.h'}) { | |
| 124 delete $uses{$file}{'config.h'}; | |
| 125 $uses{$file}{'$(CONFIG_H)'} = 1; | |
| 126 } | |
| 1333 | 127 # Huge hack. With QUICK_BUILD, general.c has no dependence on |
| 128 # general-slots.h but really should. | |
| 129 $uses{$file}{'general-slots.h'} = 1 if $file eq "general.c"; | |
| 428 | 130 print "@{[sort keys %{$uses{$file}}]}\n"; |
| 131 } | |
| 132 | |
| 133 sub PrintPatternDeps { | |
| 134 my ($pattern, $CPP_SYMBOL) = @_; | |
| 442 | 135 print "#if defined($CPP_SYMBOL)\n"; |
| 428 | 136 for my $file (sort grep (/$pattern/ && /\.c$/, keys %uses)) { |
| 137 PrintDeps($file); | |
| 138 delete $uses{$file}; | |
| 139 } | |
| 140 print "#endif\n"; | |
| 141 } | |
| 142 | |
| 442 | 143 PrintPatternDeps ('-msw\\.', "HAVE_MS_WINDOWS"); |
| 1303 | 144 PrintPatternDeps ('-xlike', "HAVE_XLIKE"); |
| 145 # X-specific files: *-x.c *-x-impl.h xgccache.c balloon_help.c x*.h Emacs*.[ch] | |
| 146 PrintPatternDeps ('-x\\.|xgccache|balloon_help|^Emacs', "HAVE_X_WINDOWS"); | |
| 442 | 147 PrintPatternDeps ('-tty\\.', "HAVE_TTY"); |
| 1303 | 148 # GTK-specific files: *-gtk.[ch] *-gtk-*.[ch] gtk-*.[ch] emacs-marshals.c emacs-widget-accessors.c glade.c ui-byhand.c |
| 149 PrintPatternDeps ('gtk|emacs-marshals|emacs-widget-accessors|glade|ui-byhand', "HAVE_GTK"); | |
| 442 | 150 PrintPatternDeps ('^database', "HAVE_DATABASE"); |
| 151 PrintPatternDeps ('^mule', "MULE"); | |
| 428 | 152 PrintPatternDeps ('^(?:External|extw-)', "EXTERNAL_WIDGET"); |
| 153 | |
| 154 for my $file (sort grep (/\.c$/, keys %uses)) { PrintDeps($file); } | |
| 155 | |
| 442 | 156 # Surprisingly robust regexp to remove comments from arbitrary C code |
| 428 | 157 sub RemoveComments { |
| 158 $_[0] =~ | |
| 159 s{ ( | |
| 160 [^\"\'/]+ | | |
| 161 (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\" [^\"\'/]*)+ | | |
| 162 (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\' [^\"\'/]*)+ | |
| 163 ) | |
| 164 | / (?: | |
| 165 \*[^*]*\*+(?:[^/*][^*]*\*+)*/ | |
| 166 | | |
| 167 /[^\n]* | |
| 168 ) | |
| 169 }{defined $1 ? $1 : ""}gsxeo; | |
| 170 } |