Mercurial > hg > xemacs-beta
annotate src/make-src-depend @ 5560:58b38d5b32d0
Implement print-circle, allowing recursive and circular structures to be read.
src/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* alloc.c:
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT_1):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (cons_print_preprocess):
* alloc.c (vector_print_preprocess):
* alloc.c (vector_nsubst_structures_descend):
* alloc.c (Fmake_symbol):
* alloc.c (UNMARK_symbol):
* alloc.c (sweep_symbols):
* alloc.c (reinit_alloc_objects_early):
* alloc.c (reinit_alloc_early):
* bytecode.c:
* bytecode.c (compiled_function_print_preprocess):
* bytecode.c (compiled_function_nsubst_structures_descend):
* bytecode.c (set_compiled_function_arglist):
* bytecode.c (set_compiled_function_interactive):
* bytecode.c (bytecode_objects_create):
* chartab.c:
* chartab.c (print_preprocess_mapper):
* chartab.c (nsubst_structures_mapper):
* chartab.c (char_table_nsubst_structures_descend):
* chartab.c (chartab_objects_create):
* elhash.c:
* elhash.c (nsubst_structures_map_hash_table):
* elhash.c (hash_table_nsubst_structures_descend):
* elhash.c (print_preprocess_mapper):
* elhash.c (hash_table_print_preprocess):
* elhash.c (inchash_eq):
* elhash.c (hash_table_objects_create):
* elhash.c (syms_of_elhash):
* elhash.h:
* emacs.c (main_1):
* fns.c:
* fns.c (check_eq_nokey):
* fns.c (Fnsubst):
* fns.c (syms_of_fns):
* lisp.h:
* lisp.h (struct Lisp_Symbol):
* lisp.h (IN_OBARRAY):
* lisp.h (struct):
* lisp.h (PRINT_PREPROCESS):
* lread.c (read1):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* print.c:
* print.c (PRINT_CIRCLE_LIMIT):
* print.c (print_continuous_numbering_changed):
* print.c (print_prepare):
* print.c (print_finish):
* print.c (Fprin1_to_string):
* print.c (print_cons):
* print.c (print_preprocess_inchash_eq):
* print.c (print_preprocess):
* print.c (print_sort_get_numbers):
* print.c (print_sort_compare_ordinals):
* print.c (print_gensym_or_circle):
* print.c (nsubst_structures_descend):
* print.c (nsubst_structures):
* print.c (print_internal):
* print.c (print_symbol):
* print.c (vars_of_print):
* rangetab.c:
* rangetab.c (range_table_print_preprocess):
* rangetab.c (range_table_nsubst_structures_descend):
* rangetab.c (rangetab_objects_create):
* rangetab.c (syms_of_rangetab):
* symbols.c:
* symbols.c (symbol_print_preprocess):
* symbols.c (Fintern):
* symbols.c (Funintern):
* symbols.c (reinit_symbol_objects_early):
* symbols.c (init_symbols_once_early):
* symsinit.h:
Implement print-circle, printing circular structures in a readable
fashion, and treating them appropriately on read. This is by means
of two new object methods, print_preprocess (detecting
circularities), and nsubst_structures_descend (replacing
placeholders with the read objects).
Expose the substitution to Lisp via #'nsubst and its new
:descend-structures keyword.
Store information as to whether symbols are interned in obarray or
not in their header, making checking for keywords and uninterned
symbols (and thus printing) cheaper.
Default print_gensym to t, as Common Lisp does, and as a
more-than-decade old comment suggests.
lisp/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-output-file-form):
* bytecomp.el (byte-compile-output-docform):
Bind print-circle, print-continuous-numbering in these functions,
now those variables are available.
* lisp.el (forward-sexp):
* lisp.el (backward-sexp):
Recognise leading #N= as being part of an expression.
tests/ChangeLog addition:
2011-09-04 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
* automated/lisp-tests.el (literal-with-uninterned):
* automated/symbol-tests.el (foo):
Test print-circle, for printing (mutually-)recursive and circular
structures.
Bind print-continuous-numbering where appropriate.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 04 Sep 2011 19:51:35 +0100 |
| parents | 308d34e9f07d |
| children |
| 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. |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
6 # Copyright (C) 2010 Ben Wing. |
| 428 | 7 |
| 1303 | 8 ## Author: Martin Buchholz <martin@xemacs.org> |
| 9 ## Maintainer: XEmacs Development Team | |
| 10 | |
| 11 ## This file is part of XEmacs. | |
| 12 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
13 ## XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
14 ## under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
15 ## Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
16 ## option) any later version. |
| 428 | 17 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
18 ## XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
19 ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
20 ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
21 ## for more details. |
| 1303 | 22 |
| 23 ## You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5050
diff
changeset
|
24 ## along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 1303 | 25 |
| 428 | 26 eval 'exec perl -w -S $0 ${1+"$@"}' |
| 27 if 0; | |
| 28 | |
| 29 use strict; | |
| 30 my ($myName, $srcdir, %exists, %uses, %generated_header); | |
| 31 | |
| 32 ($myName = $0) =~ s@.*/@@; my $usage =" | |
| 33 Usage: $myName | |
| 34 | |
| 35 Generates Makefile dependencies for the XEmacs src directory. | |
| 1303 | 36 The dependencies are written to stdout. |
| 37 "; | |
| 428 | 38 |
| 39 die $usage if @ARGV; | |
| 40 | |
| 41 ($srcdir = $0) =~ s@[^/]+$@@; | |
| 42 $srcdir = "." if $srcdir eq ""; | |
| 43 chdir $srcdir or die "$srcdir: $!"; | |
| 44 | |
| 45 opendir SRCDIR, "." or die "$srcdir: $!"; | |
| 46 for (grep (/\.[ch]$/, readdir (SRCDIR))) { $exists{$_} = 1; } | |
| 47 closedir SRCDIR; | |
| 48 | |
| 49 for (qw (config.h sheap-adjust.h paths.h Emacs.ad.h)) { | |
| 50 $generated_header{$_} = 1; | |
| 51 } | |
| 52 | |
| 442 | 53 # Although this is not technically true, it ought to be true, |
| 54 # and makes the generated Makefile smaller. | |
| 55 $uses{'lisp.h'}{'config.h'} = 1; | |
| 56 | |
| 428 | 57 for my $file (keys %exists) { |
| 58 open (FILE, $file) or die "$file: $!"; | |
| 59 undef $/; $_ = <FILE>; | |
| 60 RemoveComments ($_); | |
| 61 s/[ \t]+//g; | |
| 62 # Find include dependencies | |
| 63 for (/^\#include([^\n]+)/gm) { | |
| 462 | 64 if (m@^\"([A-Za-z0-9._-]+\.[ch])\"@) { |
| 428 | 65 $uses{$file}{$1} = 1 if exists $exists{$1}; |
| 442 | 66 } elsif (m@<([A-Za-z0-9._-]+\.h)>@) { |
| 428 | 67 $uses{$file}{$1} = 1 if exists $generated_header{$1}; |
| 442 | 68 } elsif (m@\"../lwlib/([A-Za-z0-9._-]+\.h)\"@) { |
| 428 | 69 $uses{$file}{"\$(LWLIB_SRCDIR)/lwlib.h"} = 1; |
| 70 } | |
| 71 } | |
| 72 } | |
| 73 | |
| 74 # Make transitive closure of %uses | |
| 75 while (1) { | |
| 76 my $changedP = 0; | |
| 77 for my $x (keys %uses) { | |
| 78 for my $y (keys %{$uses{$x}}) { | |
| 79 for my $z (keys %{$uses{$y}}) { | |
| 80 if (! exists $uses{$x}{$z}) { | |
| 81 $uses{$x}{$z} = 1; | |
| 82 $changedP = 1; | |
| 83 } | |
| 84 } | |
| 85 } | |
| 86 } | |
| 87 last if !$changedP; | |
| 88 } | |
| 89 | |
| 90 # Print file header | |
| 91 print | |
| 442 | 92 "## This file is automatically generated by \`$myName'. Do not modify. |
| 428 | 93 |
| 442 | 94 #if defined(USE_UNION_TYPE) |
| 428 | 95 LISP_UNION_H=lisp-union.h |
| 96 #else | |
| 97 LISP_UNION_H=lisp-disunion.h | |
| 98 #endif | |
| 99 "; | |
| 100 | |
| 452 | 101 my @LISP_H = ('lisp.h', sort keys %{$uses{'lisp.h'}}); |
| 1303 | 102 print " |
| 103 #if defined(QUICK_BUILD) | |
| 104 CONFIG_H= | |
| 105 LISP_H= | |
| 106 #else | |
| 107 CONFIG_H=config.h | |
| 108 LISP_H=@{[grep (!/lisp-(dis)?union\.h/, @LISP_H)]} \$(LISP_UNION_H) | |
| 109 #endif | |
| 110 | |
| 111 "; | |
| 428 | 112 |
| 113 sub PrintDeps { | |
| 114 my $file = shift; | |
| 115 my $ofile = $file; $ofile =~ s/c$/o/; print "$ofile: "; | |
| 1303 | 116 if (exists $uses{$file}{'config.h'}) { |
| 117 delete $uses{$file}{'config.h'}; | |
| 118 $uses{$file}{'$(CONFIG_H)'} = 1; | |
| 119 } | |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
120 if (exists $uses{$file}{'lisp.h'}) { |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
121 for my $x (@LISP_H) { |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
122 delete $uses{$file}{$x}; |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
123 } |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
124 $uses{$file}{'$(LISP_H)'} = 1; |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
125 } |
| 1333 | 126 # Huge hack. With QUICK_BUILD, general.c has no dependence on |
| 127 # general-slots.h but really should. | |
| 128 $uses{$file}{'general-slots.h'} = 1 if $file eq "general.c"; | |
| 428 | 129 print "@{[sort keys %{$uses{$file}}]}\n"; |
| 130 } | |
| 131 | |
| 132 sub PrintPatternDeps { | |
| 133 my ($pattern, $CPP_SYMBOL) = @_; | |
| 442 | 134 print "#if defined($CPP_SYMBOL)\n"; |
| 428 | 135 for my $file (sort grep (/$pattern/ && /\.c$/, keys %uses)) { |
| 136 PrintDeps($file); | |
| 137 delete $uses{$file}; | |
| 138 } | |
| 139 print "#endif\n"; | |
| 140 } | |
| 141 | |
| 442 | 142 PrintPatternDeps ('-msw\\.', "HAVE_MS_WINDOWS"); |
| 1303 | 143 PrintPatternDeps ('-xlike', "HAVE_XLIKE"); |
| 4984 | 144 # X-specific files: *-x.c *-x-impl.h balloon_help.c x*.h Emacs*.[ch] |
| 145 PrintPatternDeps ('-x\\.|balloon_help|^Emacs', "HAVE_X_WINDOWS"); | |
| 442 | 146 PrintPatternDeps ('-tty\\.', "HAVE_TTY"); |
| 1303 | 147 # GTK-specific files: *-gtk.[ch] *-gtk-*.[ch] gtk-*.[ch] emacs-marshals.c emacs-widget-accessors.c glade.c ui-byhand.c |
| 148 PrintPatternDeps ('gtk|emacs-marshals|emacs-widget-accessors|glade|ui-byhand', "HAVE_GTK"); | |
| 442 | 149 PrintPatternDeps ('^database', "HAVE_DATABASE"); |
| 150 PrintPatternDeps ('^mule', "MULE"); | |
| 428 | 151 PrintPatternDeps ('^(?:External|extw-)', "EXTERNAL_WIDGET"); |
| 152 | |
| 153 for my $file (sort grep (/\.c$/, keys %uses)) { PrintDeps($file); } | |
| 154 | |
| 442 | 155 # Surprisingly robust regexp to remove comments from arbitrary C code |
| 428 | 156 sub RemoveComments { |
| 157 $_[0] =~ | |
| 158 s{ ( | |
| 159 [^\"\'/]+ | | |
| 160 (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\" [^\"\'/]*)+ | | |
| 161 (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\' [^\"\'/]*)+ | |
| 162 ) | |
| 163 | / (?: | |
| 164 \*[^*]*\*+(?:[^/*][^*]*\*+)*/ | |
| 165 | | |
| 166 /[^\n]* | |
| 167 ) | |
| 168 }{defined $1 ? $1 : ""}gsxeo; | |
| 169 } |