Mercurial > hg > xemacs-beta
annotate src/lisp-disunion.h @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | a5954632b187 |
children | 5d09ddada9ae |
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) | |
104 #define make_char(x) ((Lisp_Object) (((x) << GCBITS) | Lisp_Type_Char)) | |
105 | |
428 | 106 #define INTP(x) ((EMACS_UINT)(x) & Lisp_Type_Int_Bit) |
107 #define INT_PLUS(x,y) ((x)+(y)-Lisp_Type_Int_Bit) | |
108 #define INT_MINUS(x,y) ((x)-(y)+Lisp_Type_Int_Bit) | |
109 #define INT_PLUS1(x) INT_PLUS (x, make_int (1)) | |
110 #define INT_MINUS1(x) INT_MINUS (x, make_int (1)) | |
111 | |
112 #define Qzero make_int (0) | |
113 #define Qnull_pointer ((Lisp_Object) 0) | |
114 #define EQ(x,y) ((x) == (y)) | |
115 | |
116 /* Convert between a (void *) and a Lisp_Object, as when the | |
117 Lisp_Object is passed to a toolkit callback function */ | |
826 | 118 #define VOID_TO_LISP(varg) ((Lisp_Object) (varg)) |
428 | 119 #define LISP_TO_VOID(larg) ((void *) (larg)) |
120 | |
121 /* Convert a Lisp_Object into something that can't be used as an | |
122 lvalue. Useful for type-checking. */ | |
123 #define NON_LVALUE(larg) ((larg) + 0) |