Mercurial > hg > xemacs-beta
annotate src/src-headers @ 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 | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 : #-*- Perl -*- |
| 2 # Copyright (C) 1998 Free Software Foundation, Inc. | |
| 3 | |
| 4 # This file is part of XEmacs. | |
| 5 # | |
| 6 # XEmacs is free software; you can redistribute it and/or modify it | |
| 7 # under the terms of the GNU General Public License as published by the | |
| 8 # Free Software Foundation; either version 2, or (at your option) any | |
| 9 # later version. | |
| 10 # | |
| 11 # XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 # for more details. | |
| 15 # | |
| 16 # You should have received a copy of the GNU General Public License | |
| 17 # along with XEmacs; see the file COPYING. If not, write to | |
| 18 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 # Boston, MA 02111-1307, USA. | |
| 20 | |
| 21 # Author: Martin Buchholz | |
| 22 eval 'exec perl -w -S $0 ${1+"$@"}' | |
| 23 if 0; | |
| 24 | |
| 25 use strict; | |
| 26 my ($myName, $srcdir); | |
| 27 | |
| 28 ($myName = $0) =~ s@.*/@@; my $usage =" | |
| 29 Usage: $myName | |
| 30 | |
| 31 Generates header file fragments from the Emacs sources | |
| 32 and writes them to stdout.\n"; | |
| 33 | |
| 34 die $usage if @ARGV; | |
| 35 | |
| 36 ($srcdir = $0) =~ s@[^/]+$@@; | |
| 37 chdir $srcdir or die "$srcdir: $!"; | |
| 38 | |
| 39 # Find include dependencies | |
| 40 my (%exists, %uses); | |
| 41 opendir SRCDIR, "." or die "$srcdir: $!"; | |
| 42 for (grep (/\.[ch]$/, readdir (SRCDIR))) { $exists{$_} = 1; } | |
| 43 closedir SRCDIR; | |
| 44 { | |
| 45 my %generated_header; | |
| 46 for (qw (config.h sheap-adjust.h paths.h Emacs.ad.h)) { | |
| 47 $generated_header{$_} = 1; | |
| 48 } | |
| 49 | |
| 50 for my $file (keys %exists) { | |
| 51 open (FILE, $file) or die "$file: $!"; | |
| 52 undef $/; $_ = <FILE>; | |
| 53 RemoveComments ($_); | |
| 54 s/[ \t]+//g; | |
| 55 for (/^\#include([^\n]+)/gmo) { | |
| 56 if (m@^\"([A-Za-z0-9_-]+\.h)\"@) { | |
| 57 $uses{$file}{$1} = 1 if exists $exists{$1}; | |
| 58 } elsif (m@<([A-Za-z0-9_-]+\.h)>@) { | |
| 59 $uses{$file}{$1} = 1 if exists $generated_header{$1}; | |
| 60 } elsif (m@\"../lwlib/([A-Za-z0-9_-]+\.h)\"@) { | |
| 61 $uses{$file}{"\$(LWLIB_SRCDIR)/lwlib.h"} = 1; | |
| 62 } | |
| 63 } | |
| 64 } | |
| 65 | |
| 66 # Make transitive closure of %uses | |
| 67 while (1) { | |
| 68 my $changedP = 0; | |
| 69 for my $x (keys %uses) { | |
| 70 for my $y (keys %{$uses{$x}}) { | |
| 71 for my $z (keys %{$uses{$y}}) { | |
| 72 if (! exists $uses{$x}{$z}) { | |
| 73 $uses{$x}{$z} = 1; | |
| 74 $changedP = 1; | |
| 75 } | |
| 76 } | |
| 77 } | |
| 78 } | |
| 79 last if !$changedP; | |
| 80 } | |
| 81 } # End of finding include dependencies | |
| 82 | |
| 83 my (%used, %maxargs); | |
| 84 my $minargs = '(?:[0-8])'; | |
| 85 my $maxargs = '(?:[0-8]|MANY|UNEVALLED)'; | |
| 86 my $doc = "(?:0|STR)"; | |
| 87 my $fun = '(?:\\bF[a-z0-9_]+X?\\b)'; | |
| 88 my $defun = "^DEFUN\\s*\\(\\s+STR\\s+($fun)\\s+$minargs\\s+($maxargs)\\s+$doc\\s+\\("; | |
| 89 my $var = '(?:\\b(?:Q[KS]?[a-z0-9_]+D?|V(?:[a-z0-9_]+)|Q_TT[A-Z]+)\\b)'; | |
| 90 my $pat = "(?:$var|$fun)"; | |
| 91 my %automagic; | |
| 92 my (%decl_file, %defn_file); | |
| 93 | |
| 94 for my $file (keys %exists) { | |
| 95 open (FILE, $file) or die "$file: $!"; | |
| 96 undef $/; $_ = <FILE>; | |
| 97 RemoveComments($_); | |
| 98 RemoveStrings ($_); | |
| 99 s/,/ /gmo; | |
| 100 s/^\s*EXFUN[^\n]+//gmo; | |
| 101 | |
| 102 # Now search for DECLARE_LRECORD to find types for predicates | |
| 103 for my $sym (/^DECLARE_LRECORD\s*\(\s*([a-z_]+)\s+struct /gmo) { | |
| 104 $automagic{"Q${sym}p"} = 1; | |
| 105 } | |
| 106 | |
| 107 if ($file =~ /\.c$/) { | |
| 108 my @match = (/$defun/gmo); | |
| 109 while (my $fun = shift @match) { | |
| 110 $defn_file{$fun} = $file; | |
| 111 $maxargs{$fun} = shift @match; | |
| 112 } | |
| 113 | |
| 114 # Now do Lisp_Object variables | |
| 115 for my $defs (/^\s*Lisp_Object\s+((?:$var\s*)+)\s*;/gmo) { | |
| 116 for my $var (split (' ',$defs)) { | |
| 117 $defn_file{$var} = $file; | |
| 118 } | |
| 119 } | |
| 120 } | |
| 121 | |
| 122 # Remove declarations of Lisp_Objects | |
| 123 s/^extern\s+Lisp_Object\s+(?:$var\s*)+\s*;//gmo; | |
| 124 | |
| 125 # Remove declarations of functions | |
| 126 s/^Lisp_Object $fun//; | |
| 127 | |
| 128 # Find all uses of symbols | |
| 129 for (/($pat)/gmo) { $used{$_}{$file} = 1; } | |
| 130 } | |
| 131 | |
| 132 my %candidates; | |
| 133 for my $file (keys %exists) { | |
| 134 @{$candidates{$file}} = (); | |
| 135 my $header1 = $file; $header1 =~ s/\.c$/.h/; | |
| 136 my $header2 = $header1; $header2 =~ s/-\w+\././; | |
| 137 push @{$candidates{$file}}, $header1 if exists $exists{$header1}; | |
| 138 push @{$candidates{$file}}, $header2 if exists $exists{$header2} && | |
| 139 $header1 ne $header2; | |
| 140 } | |
| 141 | |
| 142 SYM: for my $sym (keys %used) { | |
| 143 next SYM unless my $defn_file = $defn_file{$sym}; | |
| 144 my @users = keys %{$used{$sym}}; | |
| 145 if (@users == 1) { | |
| 146 die "$sym\n" unless $defn_file eq $users[0]; | |
| 147 next SYM; | |
| 148 } | |
| 149 for my $candidate (@{$candidates{$defn_file}}) { | |
| 150 if (!grep (!exists $uses{$_}{$candidate}, @users)) { | |
| 151 $decl_file{$sym} = $candidate; | |
| 152 next SYM; | |
| 153 } | |
| 154 } | |
| 155 $decl_file{$sym} = 'lisp.h'; | |
| 156 } | |
| 157 | |
| 158 # Print global Lisp_Objects | |
| 159 { | |
| 160 my $line; | |
| 161 sub flushvars { | |
| 162 if (defined $line) { | |
| 163 print "extern Lisp_Object $line;\n"; | |
| 164 undef $line; | |
| 165 } | |
| 166 } | |
| 167 | |
| 168 sub printvar { | |
| 169 my $var = shift; | |
| 170 if (!defined $line) { $line = $var; return; } | |
| 171 if ($var =~ /^Vcharset_/) { | |
| 172 flushvars (); | |
| 173 $line = $var; | |
| 174 flushvars (); | |
| 175 return; | |
| 176 } | |
| 177 if (length "$line, $var" > 59) { | |
| 178 flushvars (); $line = $var; return; | |
| 179 } | |
| 180 $line = "$line, $var"; | |
| 181 } | |
| 182 END { flushvars (); } | |
| 183 } | |
| 184 | |
| 185 delete @decl_file{ keys %automagic, qw(Qzero Qnull_pointer)}; | |
| 186 | |
| 187 # Print Lisp_Object var declarations | |
| 188 for my $file (keys %exists) { | |
| 189 | |
| 190 # Print EXFUNs | |
| 191 if (my @funs = grep ($decl_file{$_} eq $file && exists $maxargs{$_}, | |
| 192 keys %decl_file)) { | |
| 193 print "\n\n$file:\n\n"; | |
| 194 for $fun (sort @funs) { | |
| 195 print "EXFUN ($fun, $maxargs{$fun});\n"; | |
| 196 } | |
| 197 print "\n"; | |
| 198 } | |
| 199 | |
| 200 if (my @vars = grep ($decl_file{$_} eq $file && /^[QV]/, keys %decl_file)) { | |
| 201 print "\n\n$file:\n\n"; | |
| 202 for $var (sort @vars) { | |
| 203 printvar ($var); | |
| 204 } | |
| 205 flushvars (); | |
| 206 print "\n\n"; | |
| 207 } | |
| 208 } | |
| 209 | |
| 210 #for my $var (sort grep (keys %{$used{$_}} > 1 , keys %defn_file)) { | |
| 211 # printvar ($var); | |
| 212 #} | |
| 213 | |
| 214 sub RemoveComments { | |
| 215 $_[0] =~ | |
| 216 s{ ( | |
| 217 [^\"\'/]+ | | |
| 218 (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\" [^\"\'/]*)+ | | |
| 219 (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\' [^\"\'/]*)+ | |
| 220 ) | |
| 221 | / (?: | |
| 222 \*[^*]*\*+(?:[^/*][^*]*\*+)*/ | |
| 223 | | |
| 224 /[^\n]* | |
| 225 ) | |
| 226 }{defined $1 ? $1 : ""}gsxeo; | |
| 227 } | |
| 228 | |
| 229 sub RemoveStrings { | |
| 230 $_[0] =~ | |
| 231 s{ ( | |
| 232 (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\") | | |
| 233 (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\') | |
| 234 ) | |
| 235 }{ STR }gxo; | |
| 236 } |