Mercurial > hg > xemacs-beta
annotate src/lisp-union.h @ 1314:15a91d7ae2d1
[xemacs-hg @ 2003-02-20 08:16:21 by ben]
check in makefile fixes et al
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory into src/. Simplify the dependencies -- everything
in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
mule/mule-msw-init.el: Removed.
Delete this file.
mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows
native, boys and girls!
bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc
file in a non-Mule XEmacs. Formerly you got the rather cryptic
"The required feature `mule' cannot be provided". Now you get
"Loading this file requires Mule support".
finder.el: Remove dependency on which directory this function is invoked
from.
update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that
Makefile.in.in and xemacs.mak are in sync, both of them use
NEEDTODUMP and the other one isn't used.
dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so
we can have arbitrary forms, not just `when-feature'.
very-early-lisp.el: Nuke this file.
finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp.
msw-glyphs.el: Comment clarification.
xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro
section is now completely in sync with src/Makefile.in.in. Copy
check-features, load-shadows, and rebuilding finder-inf.el from
src/Makefile.in.in. The main build/dump/recompile process is now
synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE'
and `error checking' to `error-checking' TO avoid tripping
faux warnings and errors in the VC++ IDE.
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory from top-level Makefile.in.in to here. Simplify
the dependencies. Rearrange into logical subsections.
Synchronize the main compile/dump/build-elcs section with
xemacs.mak, which is already clean and in good working order.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add
additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS,
TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out
duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so
it doesn't need to ignore the return value from dumping. Add
.NO_PARALLEL since various aspects of building and dumping must be
serialized but do not always have dependencies between them
(this is impossible in some cases). Everything related to src/
now gets built in one pass in this directory by just running
`make' (except the Makefiles themselves and config.h, paths.h,
Emacs.ad.h, and other generated .h files).
console.c: Update list of possibly valid console types.
emacs.c: Rationalize the specifying and handling of the type of the first
frame. This was originally prompted by a workspace in which I got
GTK to compile under C++ and in the process fixed it so it could
coexist with X in the same build -- hence, a combined
TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However,
you can't simultaneously *display* more than one kind of device
connection -- but getting that to work is not that difficult.
Perhaps a project for a bored grad student. I (ben) would do it
but don't see the use.) To make sense of this, I added new
switches that can be used to specifically indicate the window
system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka
--use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka
--use-gnome, same as --use-gtk]. -nw continues as an alias for
-tty. When none have been given, XEmacs checks for other
parameters implying particular device types (-t -> tty, -display
-> x [or should it have same treatment as DISPLAY below?]), and
has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or
gtk? perhaps should check whether gnome is running), else MS
Windows if it exsits, else TTY if it exists, else stream, and you
must be running in batch mode. This also fixes an existing bug
whereby compiling with no x, no mswin, no tty, when running non-
interactively (e.g. to dump) I get "sorry, must have TTY support".
emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even
when occurring extremely early in reinitialization.
emacs.c: Try to make sure that the user can see message output under
Windows (i.e. it doesn't just disappear right away) regardless of
when it occurs, e.g. in the middle of creating the first frame.
emacs.c: Define new function `emacs-run-status', indicating whether XEmacs
is noninteractive or interactive, whether raw,
post-dump/pdump-load or run-temacs, whether we are dumping,
whether pdump is in effect.
event-stream.c: It's "mommas are fat", not "momas are fat".
Fix other typo.
event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS,
because it won't exist on w/o menubar support,
lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here
if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it
blank only for GCC 2.5 through 2.999999999999999.
Declare Vstack_trace_on_error.
profile.c: Need to include "profile.h" to fix warnings.
sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0).
That way we can distinguish between a dumping failing expectedly
(due to lack of stack space, triggering another dump) and unexpectedly,
in which case, we want to stop building. (or go on, if -K is given)
syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong,
and fix warnings thereby.
syntax.h: Fix crash caused by an edge condition in the syntax-cache macros.
text.h: Spacing fixes.
xmotif.h: New file, to get around shadowing warnings.
EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h.
alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC.
config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead.
Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY.
lisp.h: More futile attempts to walk and chew gum at the same time when
dealing with subr's that don't return.
| author | ben |
|---|---|
| date | Thu, 20 Feb 2003 08:16:21 +0000 |
| parents | 184461bc8de4 |
| children | 64eaceca611d |
| rev | line source |
|---|---|
| 428 | 1 /* Fundamental definitions for XEmacs Lisp interpreter -- union objects. |
| 2 Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994 | |
| 3 Free Software Foundation, Inc. | |
| 800 | 4 Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Divergent from FSF. */ | |
| 24 | |
| 25 /* Definition of Lisp_Object type as a union. | |
| 26 The declaration order of the objects within the struct members | |
| 27 of the union is dependent on ENDIAN-ness. | |
| 28 See lisp-disunion.h for more details. */ | |
| 29 | |
| 30 typedef | |
| 31 union Lisp_Object | |
| 32 { | |
| 33 /* if non-valbits are at lower addresses */ | |
| 442 | 34 #ifdef WORDS_BIGENDIAN |
| 428 | 35 struct |
| 36 { | |
| 37 EMACS_UINT val : VALBITS; | |
| 38 enum_field (Lisp_Type) type : GCTYPEBITS; | |
| 39 } gu; | |
| 40 | |
| 41 struct | |
| 42 { | |
| 43 signed EMACS_INT val : INT_VALBITS; | |
| 44 unsigned int bits : INT_GCBITS; | |
| 45 } s; | |
| 46 | |
| 47 struct | |
| 48 { | |
| 49 EMACS_UINT val : INT_VALBITS; | |
| 50 unsigned int bits : INT_GCBITS; | |
| 51 } u; | |
| 52 #else /* non-valbits are at higher addresses */ | |
| 53 struct | |
| 54 { | |
| 55 enum_field (Lisp_Type) type : GCTYPEBITS; | |
| 56 EMACS_UINT val : VALBITS; | |
| 57 } gu; | |
| 58 | |
| 59 struct | |
| 60 { | |
| 61 unsigned int bits : INT_GCBITS; | |
| 62 signed EMACS_INT val : INT_VALBITS; | |
| 63 } s; | |
| 64 | |
| 65 struct | |
| 66 { | |
| 67 unsigned int bits : INT_GCBITS; | |
| 68 EMACS_UINT val : INT_VALBITS; | |
| 69 } u; | |
| 70 | |
| 71 #endif /* non-valbits are at higher addresses */ | |
| 72 | |
| 73 EMACS_UINT ui; | |
| 74 signed EMACS_INT i; | |
| 75 | |
| 76 /* This was formerly declared 'void *v' etc. but that causes | |
| 77 GCC to accept any (yes, any) pointer as the argument of | |
| 78 a function declared to accept a Lisp_Object. */ | |
| 79 struct nosuchstruct *v; | |
| 80 } | |
| 81 Lisp_Object; | |
| 82 | |
| 83 #define XCHARVAL(x) ((x).gu.val) | |
| 826 | 84 #define XPNTRVAL(x) ((x).ui) |
| 85 | |
| 86 #define XREALINT(x) ((x).s.val) | |
| 87 #define XUINT(x) ((x).u.val) | |
| 88 #define XTYPE(x) ((x).gu.type) | |
| 89 #define EQ(x,y) ((x).v == (y).v) | |
| 428 | 90 |
| 826 | 91 DECLARE_INLINE_HEADER ( |
| 92 Lisp_Object | |
| 93 make_int_verify (EMACS_INT val) | |
| 94 ) | |
| 95 { | |
| 96 Lisp_Object obj; | |
| 97 obj.s.bits = 1; | |
| 98 obj.s.val = val; | |
| 99 type_checking_assert (XREALINT (obj) == val); | |
| 100 return obj; | |
| 101 } | |
| 102 | |
| 103 DECLARE_INLINE_HEADER ( | |
| 104 Lisp_Object | |
| 428 | 105 make_int (EMACS_INT val) |
| 826 | 106 ) |
| 428 | 107 { |
| 108 Lisp_Object obj; | |
| 793 | 109 obj.s.bits = 1; |
| 110 obj.s.val = val; | |
| 428 | 111 return obj; |
| 112 } | |
| 113 | |
| 826 | 114 DECLARE_INLINE_HEADER ( |
| 115 Lisp_Object | |
| 867 | 116 make_char_1 (Ichar val) |
| 826 | 117 ) |
| 428 | 118 { |
| 119 Lisp_Object obj; | |
| 793 | 120 obj.gu.type = Lisp_Type_Char; |
| 121 obj.gu.val = val; | |
| 442 | 122 return obj; |
| 123 } | |
| 124 | |
| 826 | 125 DECLARE_INLINE_HEADER ( |
| 126 Lisp_Object | |
| 800 | 127 wrap_pointer_1 (const void *ptr) |
| 826 | 128 ) |
| 442 | 129 { |
| 130 Lisp_Object obj; | |
| 793 | 131 obj.ui = (EMACS_UINT) ptr; |
| 428 | 132 return obj; |
| 133 } | |
| 134 | |
| 135 extern Lisp_Object Qnull_pointer, Qzero; | |
| 136 | |
| 137 #define INTP(x) ((x).s.bits) | |
| 138 #define INT_PLUS(x,y) make_int (XINT (x) + XINT (y)) | |
| 139 #define INT_MINUS(x,y) make_int (XINT (x) - XINT (y)) | |
| 140 #define INT_PLUS1(x) make_int (XINT (x) + 1) | |
| 141 #define INT_MINUS1(x) make_int (XINT (x) - 1) | |
| 142 | |
| 853 | 143 /* WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 144 | |
| 145 You can only VOID_TO_LISP something that had previously been | |
| 146 LISP_TO_VOID'd. You cannot go the other way, i.e. create a bogus | |
| 147 Lisp_Object. If you want to stuff a void * into a Lisp_Object, use | |
| 148 make_opaque_ptr(). */ | |
| 149 | |
| 428 | 150 /* Convert between a (void *) and a Lisp_Object, as when the |
| 151 Lisp_Object is passed to a toolkit callback function */ | |
| 826 | 152 DECLARE_INLINE_HEADER ( |
| 153 Lisp_Object | |
| 154 VOID_TO_LISP (const void *arg) | |
| 155 ) | |
| 156 { | |
| 157 Lisp_Object larg; | |
| 158 larg.v = (struct nosuchstruct *) arg; | |
| 159 return larg; | |
| 160 } | |
| 161 | |
| 428 | 162 #define LISP_TO_VOID(larg) ((void *) ((larg).v)) |
| 163 | |
| 164 /* Convert a Lisp_Object into something that can't be used as an | |
| 165 lvalue. Useful for type-checking. */ | |
| 166 #if (__GNUC__ > 1) | |
| 167 #define NON_LVALUE(larg) ({ (larg); }) | |
| 168 #else | |
| 169 /* Well, you can't really do it without using a function call, and | |
| 170 there's no real point in that; no-union-type is the rule, and that | |
| 171 will catch errors. */ | |
| 172 #define NON_LVALUE(larg) (larg) | |
| 173 #endif |
