Mercurial > hg > xemacs-beta
view src/src-headers @ 5632:bd80d9103fc8
Integrate CL code better into core, remove obsolete compatibility code.
lisp/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
Call #'cl-compile-time-init explicitly here, don't rely on
bytecomp-load-hook for what is core functionality.
* cl-extra.el:
* cl-extra.el (require):
* cl-extra.el (make-random-state):
* cl-extra.el (random-state-p):
* cl-extra.el (make-hashtable): Removed.
* cl-extra.el (make-weak-hashtable): Removed.
* cl-extra.el (make-key-weak-hashtable): Removed.
* cl-extra.el (make-value-weak-hashtable): Removed.
* cl-extra.el ('hashtablep): Removed.
* cl-extra.el ('hashtable-fullness): Removed.
* cl-extra.el ('hashtable-test-function): Removed.
* cl-extra.el ('hashtable-type): Removed.
* cl-extra.el ('hashtable-size): Removed.
* cl-extra.el ('copy-hashtable): Removed.
* cl-extra.el (cl-builtin-gethash): Removed.
* cl-extra.el (cl-builtin-remhash): Removed.
* cl-extra.el (cl-builtin-clrhash): Removed.
* cl-extra.el (cl-builtin-maphash): Removed.
* cl-extra.el ('cl-gethash): Removed.
* cl-extra.el ('cl-puthash): Removed.
* cl-extra.el ('cl-remhash): Removed.
* cl-extra.el ('cl-clrhash): Removed.
* cl-extra.el ('cl-maphash): Removed.
* cl-extra.el ('cl-make-hash-table): Removed.
* cl-extra.el ('cl-hash-table-p): Removed.
* cl-extra.el ('cl-hash-table-count): Removed.
* cl-extra.el (cl-prettyexpand):
* cl-extra.el (names):
Remove compatibility aliases from this file.
In #'cl-prettyexpand, if FULL is nil, don't expand return-from
either, for symmetry with not expanding block.
Drop cl-extra-load-hook, it's useless when cl-extra is dumped
(since third-party code can't use it, and dumped code shouldn't
use it.)
* cl-macs.el:
* cl-macs.el (cl-pop2):
* cl-macs.el (defun*):
* cl-macs.el (cl-parse-loop-clause):
Remove some no-longer-needed compatibility kludges.
* cl.el:
* cl.el ('cl-map-extents): Removed.
* cl.el (cl-random-time):
* cl.el (list*): New, moved back from subr.el, given a shorter
implementation.
* cl.el ('cl-member): Removed.
* cl.el ('cl-floor): Removed.
* cl.el ('cl-ceiling): Removed.
* cl.el ('cl-truncate): Removed.
* cl.el ('cl-round): Removed.
* cl.el ('cl-mod): Removed.
Remove some compatibility aliases; these may conflict with
package usage, in which case the packages need to be updated, the
new names are available in 21.4, and that's the most recent
version we support.
* cl.el (cl-hacked-flag): Removed.
* cl.el (cl-hack-byte-compiler): Removed.
* subr.el:
* subr.el (list*): Moved back to cl.el.
* update-elc-2.el (batch-update-elc-2):
* update-elc.el (do-autoload-commands):
Add an autoload for cl-compile-time-init in these two files, they
run on bare temacs, auto-autoload isn't available to them, and now
bytecomp calls cl-compile-time-init explicitly.
* cl-compat.el: Removed. This file was long obsolete.
man/ChangeLog addition:
2011-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Top):
* cl.texi (Usage):
* cl.texi (Organization):
* cl.texi (Efficiency Concerns):
* cl.texi (Common Lisp Compatibility):
Remove documentation of cl-compat, now it's deleted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Fri, 30 Dec 2011 16:05:31 +0000 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line source
: #-*- Perl -*- # Copyright (C) 1998 Free Software Foundation, Inc. # This file is part of XEmacs. # # XEmacs is free software: you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation, either version 3 of the License, or (at your # option) any later version. # # XEmacs is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # # You should have received a copy of the GNU General Public License # along with XEmacs. If not, see <http://www.gnu.org/licenses/>. # Author: Martin Buchholz eval 'exec perl -w -S $0 ${1+"$@"}' if 0; use strict; my ($myName, $srcdir); ($myName = $0) =~ s@.*/@@; my $usage =" Usage: $myName Generates header file fragments from the Emacs sources and writes them to stdout.\n"; die $usage if @ARGV; ($srcdir = $0) =~ s@[^/]+$@@; chdir $srcdir or die "$srcdir: $!"; # Find include dependencies my (%exists, %uses); opendir SRCDIR, "." or die "$srcdir: $!"; for (grep (/\.[ch]$/, readdir (SRCDIR))) { $exists{$_} = 1; } closedir SRCDIR; { my %generated_header; for (qw (config.h sheap-adjust.h paths.h Emacs.ad.h)) { $generated_header{$_} = 1; } for my $file (keys %exists) { open (FILE, $file) or die "$file: $!"; undef $/; $_ = <FILE>; RemoveComments ($_); s/[ \t]+//g; for (/^\#include([^\n]+)/gmo) { if (m@^\"([A-Za-z0-9_-]+\.h)\"@) { $uses{$file}{$1} = 1 if exists $exists{$1}; } elsif (m@<([A-Za-z0-9_-]+\.h)>@) { $uses{$file}{$1} = 1 if exists $generated_header{$1}; } elsif (m@\"../lwlib/([A-Za-z0-9_-]+\.h)\"@) { $uses{$file}{"\$(LWLIB_SRCDIR)/lwlib.h"} = 1; } } } # Make transitive closure of %uses while (1) { my $changedP = 0; for my $x (keys %uses) { for my $y (keys %{$uses{$x}}) { for my $z (keys %{$uses{$y}}) { if (! exists $uses{$x}{$z}) { $uses{$x}{$z} = 1; $changedP = 1; } } } } last if !$changedP; } } # End of finding include dependencies my (%used, %maxargs); my $minargs = '(?:[0-8])'; my $maxargs = '(?:[0-8]|MANY|UNEVALLED)'; my $doc = "(?:0|STR)"; my $fun = '(?:\\bF[a-z0-9_]+X?\\b)'; my $defun = "^DEFUN\\s*\\(\\s+STR\\s+($fun)\\s+$minargs\\s+($maxargs)\\s+$doc\\s+\\("; my $var = '(?:\\b(?:Q[KS]?[a-z0-9_]+D?|V(?:[a-z0-9_]+)|Q_TT[A-Z]+)\\b)'; my $pat = "(?:$var|$fun)"; my %automagic; my (%decl_file, %defn_file); for my $file (keys %exists) { open (FILE, $file) or die "$file: $!"; undef $/; $_ = <FILE>; RemoveComments($_); RemoveStrings ($_); s/,/ /gmo; s/^\s*EXFUN[^\n]+//gmo; # Now search for DECLARE_LRECORD to find types for predicates for my $sym (/^DECLARE_LRECORD\s*\(\s*([a-z_]+)\s+struct /gmo) { $automagic{"Q${sym}p"} = 1; } if ($file =~ /\.c$/) { my @match = (/$defun/gmo); while (my $fun = shift @match) { $defn_file{$fun} = $file; $maxargs{$fun} = shift @match; } # Now do Lisp_Object variables for my $defs (/^\s*Lisp_Object\s+((?:$var\s*)+)\s*;/gmo) { for my $var (split (' ',$defs)) { $defn_file{$var} = $file; } } } # Remove declarations of Lisp_Objects s/^extern\s+Lisp_Object\s+(?:$var\s*)+\s*;//gmo; # Remove declarations of functions s/^Lisp_Object $fun//; # Find all uses of symbols for (/($pat)/gmo) { $used{$_}{$file} = 1; } } my %candidates; for my $file (keys %exists) { @{$candidates{$file}} = (); my $header1 = $file; $header1 =~ s/\.c$/.h/; my $header2 = $header1; $header2 =~ s/-\w+\././; push @{$candidates{$file}}, $header1 if exists $exists{$header1}; push @{$candidates{$file}}, $header2 if exists $exists{$header2} && $header1 ne $header2; } SYM: for my $sym (keys %used) { next SYM unless my $defn_file = $defn_file{$sym}; my @users = keys %{$used{$sym}}; if (@users == 1) { die "$sym\n" unless $defn_file eq $users[0]; next SYM; } for my $candidate (@{$candidates{$defn_file}}) { if (!grep (!exists $uses{$_}{$candidate}, @users)) { $decl_file{$sym} = $candidate; next SYM; } } $decl_file{$sym} = 'lisp.h'; } # Print global Lisp_Objects { my $line; sub flushvars { if (defined $line) { print "extern Lisp_Object $line;\n"; undef $line; } } sub printvar { my $var = shift; if (!defined $line) { $line = $var; return; } if ($var =~ /^Vcharset_/) { flushvars (); $line = $var; flushvars (); return; } if (length "$line, $var" > 59) { flushvars (); $line = $var; return; } $line = "$line, $var"; } END { flushvars (); } } delete @decl_file{ keys %automagic, qw(Qzero Qnull_pointer)}; # Print Lisp_Object var declarations for my $file (keys %exists) { # Print EXFUNs if (my @funs = grep ($decl_file{$_} eq $file && exists $maxargs{$_}, keys %decl_file)) { print "\n\n$file:\n\n"; for $fun (sort @funs) { print "EXFUN ($fun, $maxargs{$fun});\n"; } print "\n"; } if (my @vars = grep ($decl_file{$_} eq $file && /^[QV]/, keys %decl_file)) { print "\n\n$file:\n\n"; for $var (sort @vars) { printvar ($var); } flushvars (); print "\n\n"; } } #for my $var (sort grep (keys %{$used{$_}} > 1 , keys %defn_file)) { # printvar ($var); #} sub RemoveComments { $_[0] =~ s{ ( [^\"\'/]+ | (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\" [^\"\'/]*)+ | (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\' [^\"\'/]*)+ ) | / (?: \*[^*]*\*+(?:[^/*][^*]*\*+)*/ | /[^\n]* ) }{defined $1 ? $1 : ""}gsxeo; } sub RemoveStrings { $_[0] =~ s{ ( (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\") | (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\') ) }{ STR }gxo; }
