Mercurial > hg > xemacs-beta
comparison src/lrecord.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 | a634e3b7acc8 |
children | 2c12fe2da451 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
841 | 841 |
842 #ifdef ERROR_CHECK_TYPES | 842 #ifdef ERROR_CHECK_TYPES |
843 | 843 |
844 # define DECLARE_LRECORD(c_name, structtype) \ | 844 # define DECLARE_LRECORD(c_name, structtype) \ |
845 extern const struct lrecord_implementation lrecord_##c_name; \ | 845 extern const struct lrecord_implementation lrecord_##c_name; \ |
846 INLINE_HEADER structtype * \ | 846 DECLARE_INLINE_HEADER ( \ |
847 error_check_##c_name (Lisp_Object obj, const char *file, int line); \ | 847 structtype * \ |
848 INLINE_HEADER structtype * \ | |
849 error_check_##c_name (Lisp_Object obj, const char *file, int line) \ | 848 error_check_##c_name (Lisp_Object obj, const char *file, int line) \ |
849 ) \ | |
850 { \ | 850 { \ |
851 assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \ | 851 assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \ |
852 return (structtype *) XPNTR (obj); \ | 852 return (structtype *) XPNTR (obj); \ |
853 } \ | 853 } \ |
854 extern Lisp_Object Q##c_name##p | 854 extern Lisp_Object Q##c_name##p |
855 | 855 |
856 # define DECLARE_EXTERNAL_LRECORD(c_name, structtype) \ | 856 # define DECLARE_EXTERNAL_LRECORD(c_name, structtype) \ |
857 extern int lrecord_type_##c_name; \ | 857 extern int lrecord_type_##c_name; \ |
858 extern struct lrecord_implementation lrecord_##c_name; \ | 858 extern struct lrecord_implementation lrecord_##c_name; \ |
859 INLINE_HEADER structtype * \ | 859 DECLARE_INLINE_HEADER ( \ |
860 error_check_##c_name (Lisp_Object obj, const char *file, int line); \ | 860 structtype * \ |
861 INLINE_HEADER structtype * \ | |
862 error_check_##c_name (Lisp_Object obj, const char *file, int line) \ | 861 error_check_##c_name (Lisp_Object obj, const char *file, int line) \ |
862 ) \ | |
863 { \ | 863 { \ |
864 assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \ | 864 assert_at_line (RECORD_TYPEP (obj, lrecord_type_##c_name), file, line); \ |
865 return (structtype *) XPNTR (obj); \ | 865 return (structtype *) XPNTR (obj); \ |
866 } \ | 866 } \ |
867 extern Lisp_Object Q##c_name##p | 867 extern Lisp_Object Q##c_name##p |
868 | 868 |
869 # define DECLARE_NONRECORD(c_name, type_enum, structtype) \ | 869 # define DECLARE_NONRECORD(c_name, type_enum, structtype) \ |
870 INLINE_HEADER structtype * \ | 870 DECLARE_INLINE_HEADER ( \ |
871 error_check_##c_name (Lisp_Object obj, const char *file, int line); \ | 871 structtype * \ |
872 INLINE_HEADER structtype * \ | |
873 error_check_##c_name (Lisp_Object obj, const char *file, int line) \ | 872 error_check_##c_name (Lisp_Object obj, const char *file, int line) \ |
873 ) \ | |
874 { \ | 874 { \ |
875 assert_at_line (XTYPE (obj) == type_enum, file, line); \ | 875 assert_at_line (XTYPE (obj) == type_enum, file, line); \ |
876 return (structtype *) XPNTR (obj); \ | 876 return (structtype *) XPNTR (obj); \ |
877 } \ | 877 } \ |
878 extern Lisp_Object Q##c_name##p | 878 extern Lisp_Object Q##c_name##p |
880 # define XRECORD(x, c_name, structtype) \ | 880 # define XRECORD(x, c_name, structtype) \ |
881 error_check_##c_name (x, __FILE__, __LINE__) | 881 error_check_##c_name (x, __FILE__, __LINE__) |
882 # define XNONRECORD(x, c_name, type_enum, structtype) \ | 882 # define XNONRECORD(x, c_name, type_enum, structtype) \ |
883 error_check_##c_name (x, __FILE__, __LINE__) | 883 error_check_##c_name (x, __FILE__, __LINE__) |
884 | 884 |
885 INLINE_HEADER Lisp_Object wrap_record_1 (const void *ptr, enum lrecord_type ty, | 885 DECLARE_INLINE_HEADER ( |
886 const char *file, int line); | 886 Lisp_Object |
887 INLINE_HEADER Lisp_Object | |
888 wrap_record_1 (const void *ptr, enum lrecord_type ty, const char *file, | 887 wrap_record_1 (const void *ptr, enum lrecord_type ty, const char *file, |
889 int line) | 888 int line) |
889 ) | |
890 { | 890 { |
891 Lisp_Object obj = wrap_pointer_1 (ptr); | 891 Lisp_Object obj = wrap_pointer_1 (ptr); |
892 | 892 |
893 assert_at_line (RECORD_TYPEP (obj, ty), file, line); | 893 assert_at_line (RECORD_TYPEP (obj, ty), file, line); |
894 return obj; | 894 return obj; |
957 #define CHECK_NONRECORD(x, lisp_enum, predicate) do { \ | 957 #define CHECK_NONRECORD(x, lisp_enum, predicate) do { \ |
958 if (XTYPE (x) != lisp_enum) \ | 958 if (XTYPE (x) != lisp_enum) \ |
959 dead_wrong_type_argument (predicate, x); \ | 959 dead_wrong_type_argument (predicate, x); \ |
960 } while (0) | 960 } while (0) |
961 | 961 |
962 /* Various ways of allocating lcrecords. All bytes (except lcrecord | |
963 header) are zeroed in returned structure. */ | |
964 | |
962 void *alloc_lcrecord (Bytecount size, | 965 void *alloc_lcrecord (Bytecount size, |
963 const struct lrecord_implementation *); | 966 const struct lrecord_implementation *); |
964 | 967 |
965 void *alloc_automanaged_lcrecord (Bytecount size, | 968 void *alloc_automanaged_lcrecord (Bytecount size, |
966 const struct lrecord_implementation *); | 969 const struct lrecord_implementation *); |