annotate src/src-headers @ 2367:ecf1ebac70d8
[xemacs-hg @ 2004-11-04 23:05:23 by ben]
commit mega-patch
configure.in: Turn off -Winline and -Wchar-subscripts.
Use the right set of cflags when compiling modules.
Rewrite ldap configuration to separate the inclusion of lber
(needed in recent Cygwin) from the basic checks for the
needed libraries.
add a function for MAKE_JUNK_C; initially code was added to
generate xemacs.def using this, but it will need to be rewritten.
add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto
an existing file.
Sort list of auto-detected functions and eliminate unused checks for
stpcpy, setlocale and getwd.
Add autodetection of Cygwin scanf problems
BETA: Rewrite section on configure to indicate what flags are important
and what not.
digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main().
make-msgfile.c: Document that this is old junk.
Move proposal to text.c.
make-msgfile.lex: Move proposal to text.c.
make-mswin-unicode.pl: Convert error-generating code so that the entire message will
be seen as a single unrecognized token.
mule/mule-ccl.el: Update docs.
lispref/mule.texi: Update CCL docs.
ldap/eldap.c: Mule-ize.
Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP.
* XEmacs 21.5.18 "chestnut" is released.
---------------------------------------------------------------
MULE-RELATED WORK:
---------------------------------------------------------------
---------------------------
byte-char conversion
---------------------------
buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken
previous version. Track the char position of the gap. Add
functions to do char-byte conversion downwards as well as upwards.
Move comments about algorithm workings to internals manual.
---------------------------
work on types
---------------------------
alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all
the basic semantics of `char' that I have so far identified, so that
its semantics can always be identified for the purposes of proper
Mule-safe code, and the raw use of `char' always avoided.
(1) More type renaming, for consistency of naming.
Char_ASCII -> Ascbyte
UChar_ASCII -> UAscbyte
Char_Binary -> CBinbyte
UChar_Binary -> Binbyte
SChar_Binary -> SBinbyte
(2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and
Bitbyte and use them.
(3) New types Itext, Wexttext and Textcount for separating out
the concepts of bytes and textual units (different under UTF-16
and UTF-32, which are potential internal encodings).
(4) qxestr*_c -> qxestr*_ascii.
lisp.h: New; goes with other qxe() functions. #### Maybe goes in a
different section.
lisp.h: Group generic int-type defs together with EMACS_INT defs.
lisp.h: * lisp.h (WEXTTEXT_IS_WIDE)
New defns.
lisp.h: New type to replace places where int occurs as a boolean.
It's signed because occasionally people may want to use -1 as
an error value, and because unsigned ints are viral -- see comments
in the internals manual against using them.
dynarr.c: int -> Bytecount.
---------------------------
Mule-izing
---------------------------
device-x.c: Partially Mule-ize.
dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*().
sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be
Unicode (e.g. startup code under Windows).
emacs.c: Mule-ize. Properly deal with argv in external encoding.
Use wext_*() and Wexttext. Use Rawbyte.
#if 0 some old junk on SCO that is unlikely to be correct.
Rewrite allocation code in run-temacs.
emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to
initialize mswindows_9x_p even earlier, for use in startup code
(XEUNICODE_P).
process.c: Use _wenviron not environ under Windows, to get Unicode environment
variables.
event-Xt.c: Mule-ize drag-n-drop related stuff.
dragdrop.c, dragdrop.h, frame-x.c: Mule-ize.
text.h: Add some more stand-in defines for particular kinds of conversion;
use in Mule-ization work in frame-x.c etc.
---------------------------
Freshening
---------------------------
intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate.
---------------------------
Unicode-work
---------------------------
intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and
WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc()
and convert_unicode_to_multibyte_dynarr() and use. Add stuff for
alloca() conversion of multibyte/unicode.
alloc.c: Use dfc_external_data_len() in case of unicode coding system.
alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up
dump-time loading. Anyway, either we load them at dump time or
run time, never both.
unicode.c: Dump the blank tables as well.
---------------------------------------------------------------
DOCUMENTATION, MOSTLY MULE-RELATED:
---------------------------------------------------------------
EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed.
text.h: Add more documentation describing why DFC routines were not written
to return their value. Add some other DFC documentation.
console-msw.c, console-msw.h: Add pointer to docs in win32.c.
emacs.c: Add comments on sources of doc info.
text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and
internationalization, and proposals for work to be done, in text.c
or Internals manual, stuff related to specific textual API's in
text.h, and stuff related to internal implementation of Unicode
conversion in unicode.c. Put lots of pointers to the comments to
make them easier to find.
s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of
builds and environments under Windows and how they work.
Collect this info in win32.c. Add pointers to these docs in
the relevant s/* files.
emacs.c: Document places with long comments.
Remove comment about exiting, move to internals manual, put
in pointer.
event-stream.c: Move docs about event queues and focus to internals manual, put
in pointer.
events.h: Move docs about event stream callbacks to internals manual, put
in pointer.
profile.c, redisplay.c, signal.c: Move documentation to the Internals manual.
process-nt.c: Add pointer to comment in win32-native.el.
lisp.h: Add comments about some comment conventions.
lisp.h: Add comment about the second argument.
device-msw.c, redisplay-msw.c: @@#### comments are out-of-date.
---------------------------------------------------------------
PDUMP WORK (MOTIVATED BY UNICODE CHANGES)
---------------------------------------------------------------
alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP:
Properly implement dump_add_root_block(), which never worked before,
and is necessary for dumping Unicode tables.
Pdump name changes for accuracy:
XD_STRUCT_PTR -> XD_BLOCK_PTR.
XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY.
XD_C_STRING -> XD_ASCII_STRING.
*_structure_* -> *_block_*.
lrecord.h: some comments added about
dump_add_root_block() vs dump_add_root_block_ptr().
extents.c: remove incorrect comment about pdump problems with gap array.
---------------------------------------------------------------
ALLOCATION
---------------------------------------------------------------
abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for
more convenient allocation of these commonly requested items.
Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes,
xnew_ibytes, etc. also XREALLOC_ARRAY, xnew.
alloc.c: Rewrite the allocation functions to factor out repeated code.
Add assertions for freeing dumped data.
lisp.h: Moved down and consolidated with other allocation stuff.
lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in
LIFO order.
lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs.
text.h, lisp.h: Fill out convenience routines for allocating various kinds of
bytes and put them in lisp.h. Use them in place of xmalloc(),
ALLOCA().
text.h: Fill out the convenience functions so the _MALLOC() kinds match
the alloca() kinds.
---------------------------------------------------------------
ERROR-CHECKING
---------------------------------------------------------------
text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN()
from similar Eistring checkers and change the Eistring checkers to
use them instead.
---------------------------------------------------------------
MACROS IN LISP.H
---------------------------------------------------------------
lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can
be used to generate any kind of gcpro sets -- regular, ngcpro,
nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2.
buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities.
Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3
or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2
(new macro). Removed/redid comments on EXTERNAL_LIST_LOOP.
---------------------------------------------------------------
SPACING FIXES
---------------------------------------------------------------
callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes.
---------------------------------------------------------------
FIX FOR GEOMETRY PROBLEM IN FIRST FRAME
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows.
will be overridden by my other ws.
---------------------------------------------------------------
FIX FOR LEAKING PROCESS HANDLES:
---------------------------------------------------------------
process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner
<adrian@xemacs.org>.
---------------------------------------------------------------
FIX FOR CYGWIN BUG (Unicode-related):
---------------------------------------------------------------
unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by
release 1.5.12 of Cygwin].
---------------------------------------------------------------
WARNING FIXES:
---------------------------------------------------------------
console-stream.c: `reinit' is unused.
compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got.
regex.c: Gather includes together to avoid warning.
---------------------------------------------------------------
CHANGES TO INITIALIZATION ROUTINES:
---------------------------------------------------------------
buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity.
Factor out some redundant init code. Move disallowed stuff
that had crept into vars_of_glyphs() into complex_vars_of_glyphs().
Call init_eval_semi_early() from eval.c not in the middle of
vars_of_() in emacs.c since there should be no order dependency
in the latter calls.
---------------------------------------------------------------
ARMAGEDDON:
---------------------------------------------------------------
alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to
inhibit_non_essential_conversion_operations.
text.c: Assert on !inhibit_non_essential_conversion_operations.
console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid
problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT
in places where problems would arise.
---------------------------------------------------------------
CHANGES TO THE BUILD PROCEDURE:
---------------------------------------------------------------
config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file.
Rearrange everything to follow this -- put all #undefs together
and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA,
BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused
HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE.
m/gec63.h: Deleted; totally broken, not used at all, not in FSF.
m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION,
BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected.
When in doubt, I followed recent FSF sources, which also have
these things deleted.
| author |
ben |
| date |
Thu, 04 Nov 2004 23:08:28 +0000 |
| 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 }
|
