Mercurial > hg > xemacs-beta
annotate src/make-src-depend @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 20 Jan 2010 07:05:57 -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 } |