comparison src/lisp-union.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 2b676dc88c66
children 5d09ddada9ae
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
75 75
76 /* This was formerly declared 'void *v' etc. but that causes 76 /* This was formerly declared 'void *v' etc. but that causes
77 GCC to accept any (yes, any) pointer as the argument of 77 GCC to accept any (yes, any) pointer as the argument of
78 a function declared to accept a Lisp_Object. */ 78 a function declared to accept a Lisp_Object. */
79 struct nosuchstruct *v; 79 struct nosuchstruct *v;
80 const struct nosuchstruct *cv;
81 } 80 }
82 Lisp_Object; 81 Lisp_Object;
83 82
84 #define XCHARVAL(x) ((x).gu.val) 83 #define XCHARVAL(x) ((x).gu.val)
85 # define XPNTRVAL(x) ((x).ui) 84 #define XPNTRVAL(x) ((x).ui)
86 85
87 INLINE_HEADER Lisp_Object make_int (EMACS_INT val); 86 #define XREALINT(x) ((x).s.val)
88 INLINE_HEADER Lisp_Object 87 #define XUINT(x) ((x).u.val)
88 #define XTYPE(x) ((x).gu.type)
89 #define EQ(x,y) ((x).v == (y).v)
90
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
89 make_int (EMACS_INT val) 105 make_int (EMACS_INT val)
106 )
90 { 107 {
91 Lisp_Object obj; 108 Lisp_Object obj;
92 obj.s.bits = 1; 109 obj.s.bits = 1;
93 obj.s.val = val; 110 obj.s.val = val;
94 return obj; 111 return obj;
95 } 112 }
96
97 113
98 #ifdef __cplusplus 114 #ifdef __cplusplus
99 115
100 #define volatile_make_int(val) make_int (val) 116 #define volatile_make_int(val) make_int (val)
101 117
107 assign to something else instead? But in any case, the warnings about 123 assign to something else instead? But in any case, the warnings about
108 volatile clobbering doesn't occur in C++. I bet the thing is that C++ 124 volatile clobbering doesn't occur in C++. I bet the thing is that C++
109 already has a built-in system for dealing with non-local exits and such, 125 already has a built-in system for dealing with non-local exits and such,
110 in a smart way that doesn't clobber registers, and incorporates 126 in a smart way that doesn't clobber registers, and incorporates
111 longjmp() into that. */ 127 longjmp() into that. */
112 INLINE_HEADER Lisp_Object volatile_make_int (EMACS_INT val); 128 DECLARE_INLINE_HEADER (
113 INLINE_HEADER Lisp_Object 129 Lisp_Object
114 volatile_make_int (EMACS_INT val) 130 volatile_make_int (EMACS_INT val)
131 )
115 { 132 {
116 volatile Lisp_Object obj; 133 volatile Lisp_Object obj;
117 obj.s.bits = 1; 134 obj.s.bits = 1;
118 obj.s.val = val; 135 obj.s.val = val;
119 return obj; 136 return obj;
120 } 137 }
121 138
122 #endif /* __cplusplus */ 139 #endif /* __cplusplus */
123 140
124 141
125 INLINE_HEADER Lisp_Object make_char (Emchar val); 142 DECLARE_INLINE_HEADER (
126 INLINE_HEADER Lisp_Object 143 Lisp_Object
127 make_char (Emchar val) 144 make_char (Emchar val)
145 )
128 { 146 {
129 Lisp_Object obj; 147 Lisp_Object obj;
130 obj.gu.type = Lisp_Type_Char; 148 obj.gu.type = Lisp_Type_Char;
131 obj.gu.val = val; 149 obj.gu.val = val;
132 return obj; 150 return obj;
133 } 151 }
134 152
135 INLINE_HEADER Lisp_Object wrap_pointer_1 (const void *ptr); 153 DECLARE_INLINE_HEADER (
136 INLINE_HEADER Lisp_Object 154 Lisp_Object
137 wrap_pointer_1 (const void *ptr) 155 wrap_pointer_1 (const void *ptr)
156 )
138 { 157 {
139 Lisp_Object obj; 158 Lisp_Object obj;
140 obj.ui = (EMACS_UINT) ptr; 159 obj.ui = (EMACS_UINT) ptr;
141 return obj; 160 return obj;
142 } 161 }
143 162
144 extern Lisp_Object Qnull_pointer, Qzero; 163 extern Lisp_Object Qnull_pointer, Qzero;
145
146 #define XREALINT(x) ((x).s.val)
147 #define XUINT(x) ((x).u.val)
148 #define XTYPE(x) ((x).gu.type)
149 #define EQ(x,y) ((x).v == (y).v)
150 164
151 #define INTP(x) ((x).s.bits) 165 #define INTP(x) ((x).s.bits)
152 #define INT_PLUS(x,y) make_int (XINT (x) + XINT (y)) 166 #define INT_PLUS(x,y) make_int (XINT (x) + XINT (y))
153 #define INT_MINUS(x,y) make_int (XINT (x) - XINT (y)) 167 #define INT_MINUS(x,y) make_int (XINT (x) - XINT (y))
154 #define INT_PLUS1(x) make_int (XINT (x) + 1) 168 #define INT_PLUS1(x) make_int (XINT (x) + 1)
155 #define INT_MINUS1(x) make_int (XINT (x) - 1) 169 #define INT_MINUS1(x) make_int (XINT (x) - 1)
156 170
157 /* Convert between a (void *) and a Lisp_Object, as when the 171 /* Convert between a (void *) and a Lisp_Object, as when the
158 Lisp_Object is passed to a toolkit callback function */ 172 Lisp_Object is passed to a toolkit callback function */
159 #define VOID_TO_LISP(larg,varg) \ 173 DECLARE_INLINE_HEADER (
160 ((void) ((larg).v = (struct nosuchstruct *) (varg))) 174 Lisp_Object
161 #define CVOID_TO_LISP(larg,varg) \ 175 VOID_TO_LISP (const void *arg)
162 ((void) ((larg).cv = (const struct nosuchstruct *) (varg))) 176 )
177 {
178 Lisp_Object larg;
179 larg.v = (struct nosuchstruct *) arg;
180 return larg;
181 }
182
163 #define LISP_TO_VOID(larg) ((void *) ((larg).v)) 183 #define LISP_TO_VOID(larg) ((void *) ((larg).v))
164 #define LISP_TO_CVOID(larg) ((const void *) ((larg).cv))
165 184
166 /* Convert a Lisp_Object into something that can't be used as an 185 /* Convert a Lisp_Object into something that can't be used as an
167 lvalue. Useful for type-checking. */ 186 lvalue. Useful for type-checking. */
168 #if (__GNUC__ > 1) 187 #if (__GNUC__ > 1)
169 #define NON_LVALUE(larg) ({ (larg); }) 188 #define NON_LVALUE(larg) ({ (larg); })