Mercurial > hg > xemacs-beta
annotate src/lisp-disunion.h @ 853:2b6fa2618f76
[xemacs-hg @ 2002-05-28 08:44:22 by ben]
merge my stderr-proc ws
make-docfile.c: Fix places where we forget to check for EOF.
code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and
friends work both ways but Cygwin programs don't like the CRs.
code-process.el, multicast.el, process.el: Removed.
Improvements to call-process-internal:
-- allows a buffer to be specified for input and stderr output
-- use it on all systems
-- implement C-g as documented
-- clean up and comment
call-process-region uses new call-process facilities; no temp file.
remove duplicate funs in process.el.
comment exactly how coding systems work and fix various problems.
open-multicast-group now does similar coding-system frobbing to
open-network-stream.
dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time.
xemacs.mak: Add -DSTRICT.
================================================================
ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
================================================================
Standard output and standard error can be processed separately in
a process. Each can have its own buffer, its own mark in that buffer,
and its filter function. You can specify a separate buffer for stderr
in `start-process' to get things started, or use the new primitives:
set-process-stderr-buffer
process-stderr-buffer
process-stderr-mark
set-process-stderr-filter
process-stderr-filter
Also, process-send-region takes a 4th optional arg, a buffer.
Currently always uses a pipe() under Unix to read the error output.
(#### Would a PTY be better?)
sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c.
wait_for_termination() now only needed on a few really old systems.
console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for
error input. Create Lstreams for reading in the error channel.
Many process methods need change. In general the changes are
fairly clear as they involve duplicating what's used for reading
the normal stdout and changing for stderr -- although tedious,
as such changes are required throughout the entire process code.
Rewrote the code that reads process output to do two loops, one
for stdout and one for stderr.
gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr.
================================================================
NEW ERROR-TRAPPING MECHANISM
================================================================
Totally rewrite error trapping code to be unified and support more
features. Basic function is call_trapping_problems(), which lets
you specify, by means of flags, what sorts of problems you want
trapped. these can include
-- quit
-- errors
-- throws past the function
-- creation of "display objects" (e.g. buffers)
-- deletion of already-existing "display objects" (e.g. buffers)
-- modification of already-existing buffers
-- entering the debugger
-- gc
-- errors->warnings (ala suspended errors)
etc. All other error funs rewritten in terms of this one.
Various older mechanisms removed or rewritten.
window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to
note_object_created(), for use with trapping_problems mechanism.
When deleting, call check_allowed_operation() and note_object
deleted().
The trapping-problems code records the objects created since the
call-trapping-problems began. Those objects can be deleted, but
none others (i.e. previously existing ones).
bytecode.c, cmdloop.c: internal_catch takes another arg.
eval.c: Add long comments describing the "five lists" used to maintain
state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or
redo in terms of new one.
frame.c, gutter.c: Flush out the concept of "critical display section", defined by
the in_display() var. Use an internal_bind() to get it reset,
rather than just doing it at end, because there may be a non-local
exit.
event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on
old mechanisms.
glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay.
insdel.c: Protect hooks against deleting existing buffers.
frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers.
Otherwise we run into stickiness in redisplay because
internal_equal() can QUIT.
================================================================
SIGNAL, C-G CHANGES
================================================================
Here we change the way that C-g interacts with event reading. The
idea is that a C-g occurring while we're reading a user event
should be read as C-g, but elsewhere should be a QUIT. The former
code did all sorts of bizarreness -- requiring that no QUIT occurs
anywhere in event-reading code (impossible to enforce given the
stuff called or Lisp code invoked), and having some weird system
involving enqueue/dequeue of a C-g and interaction with Vquit_flag
-- and it didn't work.
Now, we simply enclose all code where we want C-g read as an event
with {begin/end}_dont_check_for_quit(). This completely turns off
the mechanism that checks (and may remove or alter) C-g in the
read-ahead queues, so we just get the C-g normal.
Signal.c documents this very carefully.
cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old
out-of-date comments.
event-stream.c: Fix C-g handling to actually work.
device-x.c: Disable quit checking when err out.
signal.c: Cleanup. Add large descriptive comment.
process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT.
It's not necessary to use REALLY_QUIT and just confuses the issue.
lisp.h: Comment quit handlers.
================================================================
CONS CHANGES
================================================================
free_cons() now takes a Lisp_Object not the result of XCONS().
car and cdr have been renamed so that they don't get used directly;
go through XCAR(), XCDR() instead.
alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object,
not Lisp_Cons
chartab.c: Eliminate direct use of ->car, ->cdr, should be black box.
callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
================================================================
USE INTERNAL-BIND-*
================================================================
eval.c: Cleanups of these funs.
alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object()
in place of whatever varied and cumbersome mechanisms were
formerly there.
================================================================
SPECBIND SANITY
================================================================
backtrace.h: - Improved comments
backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity
checking code each time the catchlist or specbind stack change.
Removed older prototype of same mechanism.
================================================================
MISC
================================================================
lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship.
device-msw.c: Correct bad Unicode-ization.
print.c: Be more careful when not initialized or in fatal error handling.
search.c: Eliminate running_asynch_code, an FSF holdover.
alloc.c: Added comments about gc-cons-threshold.
dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value
tree, like in menubar-x.c.
gui.c: Use Qunbound not Qnil as the default for
gethash.
lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP().
lisp.h: Use ERROR_CHECK_STRUCTURES to turn on
ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK
lisp.h: Add assert_with_message.
lisp.h: Add macros for gcproing entire arrays. (You could do this before
but it required manual twiddling the gcpro structure.)
lisp.h: Add prototypes for new functions defined elsewhere.
author | ben |
---|---|
date | Tue, 28 May 2002 08:45:36 +0000 |
parents | 5d09ddada9ae |
children | 804517e16990 |
rev | line source |
---|---|
428 | 1 /* Fundamental definitions for XEmacs Lisp interpreter -- non-union objects. |
2 Copyright (C) 1985, 1986, 1987, 1992, 1993 Free Software Foundation, Inc. | |
826 | 3 Copyright (C) 2001, 2002 Ben Wing. |
428 | 4 |
5 This file is part of XEmacs. | |
6 | |
7 XEmacs is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 2, or (at your option) any | |
10 later version. | |
11 | |
12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with XEmacs; see the file COPYING. If not, write to | |
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
20 Boston, MA 02111-1307, USA. */ | |
21 | |
22 /* Synched up with: FSF 19.30. Split out from lisp.h. */ | |
23 /* This file has diverged greatly from FSF Emacs. Syncing is no | |
24 longer desirable or possible */ | |
25 | |
26 /* | |
27 Format of a non-union-type Lisp Object | |
28 | |
29 3 2 1 0 | |
30 bit 10987654321098765432109876543210 | |
31 -------------------------------- | |
32 VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVTT | |
33 | |
34 Integers are treated specially, and look like this: | |
35 | |
36 3 2 1 0 | |
37 bit 10987654321098765432109876543210 | |
38 -------------------------------- | |
39 VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVT | |
40 | |
41 For integral Lisp types, i.e. integers and characters, the value | |
458 | 42 bits are the Lisp object. Some people call such Lisp_Objects "immediate". |
428 | 43 |
458 | 44 The object is obtained by masking off the type bits. |
462 | 45 Bit 1 is used as a value bit by splitting the Lisp integer type |
458 | 46 into two subtypes, Lisp_Type_Int_Even and Lisp_Type_Int_Odd. |
47 By this trickery we get 31 bits for integers instead of 30. | |
428 | 48 |
49 For non-integral types, the value bits of a Lisp_Object contain | |
50 a pointer to a structure containing the object. The pointer is | |
51 obtained by masking off the type and mark bits. | |
52 | |
462 | 53 All pointer-based types are coalesced under a single type called |
458 | 54 Lisp_Type_Record. The type bits for this type are required by the |
55 implementation to be 00, just like the least significant bits of | |
56 word-aligned struct pointers on 32-bit hardware. This requires that | |
57 all structs implementing Lisp_Objects have an alignment of at least 4 | |
58 bytes. Because of this, Lisp_Object pointers don't have to be masked | |
59 and are full-sized. | |
428 | 60 |
458 | 61 There are no mark bits in the Lisp_Object itself (there used to be). |
62 | |
63 Integers and characters don't need to be marked. All other types are | |
64 lrecord-based, which means they get marked by setting the mark bit in | |
65 the struct lrecord_header. | |
428 | 66 |
67 Here is a brief description of the following macros: | |
68 | |
69 XTYPE The type bits of a Lisp_Object | |
70 XPNTRVAL The value bits of a Lisp_Object storing a pointer | |
71 XCHARVAL The value bits of a Lisp_Object storing a Emchar | |
72 XREALINT The value bits of a Lisp_Object storing an integer, signed | |
73 XUINT The value bits of a Lisp_Object storing an integer, unsigned | |
458 | 74 INTP Non-zero if this Lisp_Object is an integer |
428 | 75 Qzero Lisp Integer 0 |
458 | 76 EQ Non-zero if two Lisp_Objects are identical, not merely equal. */ |
428 | 77 |
78 | |
79 typedef EMACS_INT Lisp_Object; | |
80 | |
81 #define Lisp_Type_Int_Bit (Lisp_Type_Int_Even & Lisp_Type_Int_Odd) | |
82 #define VALMASK (((1UL << VALBITS) - 1UL) << GCTYPEBITS) | |
83 #define XTYPE(x) ((enum Lisp_Type) (((EMACS_UINT)(x)) & ~VALMASK)) | |
84 #define XPNTRVAL(x) (x) /* This depends on Lisp_Type_Record == 0 */ | |
85 #define XCHARVAL(x) ((x) >> GCBITS) | |
86 #define XREALINT(x) ((x) >> INT_GCBITS) | |
87 #define XUINT(x) ((EMACS_UINT)(x) >> INT_GCBITS) | |
826 | 88 |
89 #define wrap_pointer_1(ptr) ((Lisp_Object) (ptr)) | |
90 | |
91 DECLARE_INLINE_HEADER ( | |
92 Lisp_Object | |
93 make_int_verify (EMACS_INT val) | |
94 ) | |
95 { | |
96 Lisp_Object obj = (Lisp_Object) ((val << INT_GCBITS) | Lisp_Type_Int_Bit); | |
97 type_checking_assert (XREALINT (obj) == val); | |
98 return obj; | |
99 } | |
100 | |
101 #define make_int(x) ((Lisp_Object) (((x) << INT_GCBITS) | Lisp_Type_Int_Bit)) | |
102 | |
103 #define volatile_make_int(x) make_int (x) | |
831 | 104 |
105 #define make_char_1(x) ((Lisp_Object) (((x) << GCBITS) | Lisp_Type_Char)) | |
826 | 106 |
428 | 107 #define INTP(x) ((EMACS_UINT)(x) & Lisp_Type_Int_Bit) |
108 #define INT_PLUS(x,y) ((x)+(y)-Lisp_Type_Int_Bit) | |
109 #define INT_MINUS(x,y) ((x)-(y)+Lisp_Type_Int_Bit) | |
110 #define INT_PLUS1(x) INT_PLUS (x, make_int (1)) | |
111 #define INT_MINUS1(x) INT_MINUS (x, make_int (1)) | |
112 | |
113 #define Qzero make_int (0) | |
114 #define Qnull_pointer ((Lisp_Object) 0) | |
115 #define EQ(x,y) ((x) == (y)) | |
116 | |
853 | 117 /* WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
118 | |
119 You can only VOID_TO_LISP something that had previously been | |
120 LISP_TO_VOID'd. You cannot go the other way, i.e. create a bogus | |
121 Lisp_Object. If you want to stuff a void * into a Lisp_Object, use | |
122 make_opaque_ptr(). */ | |
123 | |
428 | 124 /* Convert between a (void *) and a Lisp_Object, as when the |
125 Lisp_Object is passed to a toolkit callback function */ | |
826 | 126 #define VOID_TO_LISP(varg) ((Lisp_Object) (varg)) |
428 | 127 #define LISP_TO_VOID(larg) ((void *) (larg)) |
128 | |
129 /* Convert a Lisp_Object into something that can't be used as an | |
130 lvalue. Useful for type-checking. */ | |
131 #define NON_LVALUE(larg) ((larg) + 0) |