comparison src/file-coding.c @ 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 e7ee5f8bde58
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
548 printing_unreadable_object 548 printing_unreadable_object
549 ("printing unreadable object #<coding-system 0x%x>", c->header.uid); 549 ("printing unreadable object #<coding-system 0x%x>", c->header.uid);
550 550
551 write_fmt_string_lisp (printcharfun, "#<coding-system %s ", 1, c->name); 551 write_fmt_string_lisp (printcharfun, "#<coding-system %s ", 1, c->name);
552 print_coding_system_properties (obj, printcharfun); 552 print_coding_system_properties (obj, printcharfun);
553 write_c_string (">", printcharfun); 553 write_c_string (printcharfun, ">");
554 } 554 }
555 555
556 /* Print an abbreviated version of a coding system (but still containing 556 /* Print an abbreviated version of a coding system (but still containing
557 all the information), for use within a coding system print method. */ 557 all the information), for use within a coding system print method. */
558 558
560 print_coding_system_in_print_method (Lisp_Object cs, Lisp_Object printcharfun, 560 print_coding_system_in_print_method (Lisp_Object cs, Lisp_Object printcharfun,
561 int escapeflag) 561 int escapeflag)
562 { 562 {
563 write_fmt_string_lisp (printcharfun, "%s[", 1, XCODING_SYSTEM_NAME (cs)); 563 write_fmt_string_lisp (printcharfun, "%s[", 1, XCODING_SYSTEM_NAME (cs));
564 print_coding_system_properties (cs, printcharfun); 564 print_coding_system_properties (cs, printcharfun);
565 write_c_string ("]", printcharfun); 565 write_c_string (printcharfun, "]");
566 } 566 }
567 567
568 static void 568 static void
569 finalize_coding_system (void *header, int for_disksave) 569 finalize_coding_system (void *header, int for_disksave)
570 { 570 {
2682 static void 2682 static void
2683 chain_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) 2683 chain_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag)
2684 { 2684 {
2685 int i; 2685 int i;
2686 2686
2687 write_c_string ("(", printcharfun); 2687 write_c_string (printcharfun, "(");
2688 for (i = 0; i < XCODING_SYSTEM_CHAIN_COUNT (cs); i++) 2688 for (i = 0; i < XCODING_SYSTEM_CHAIN_COUNT (cs); i++)
2689 { 2689 {
2690 write_c_string (i == 0 ? "" : "->", printcharfun); 2690 write_c_string (printcharfun, i == 0 ? "" : "->");
2691 print_coding_system_in_print_method (XCODING_SYSTEM_CHAIN_CHAIN (cs)[i], 2691 print_coding_system_in_print_method (XCODING_SYSTEM_CHAIN_CHAIN (cs)[i],
2692 printcharfun, escapeflag); 2692 printcharfun, escapeflag);
2693 } 2693 }
2694 { 2694 {
2695 Lisp_Object cac = XCODING_SYSTEM_CHAIN_CANONICALIZE_AFTER_CODING (cs); 2695 Lisp_Object cac = XCODING_SYSTEM_CHAIN_CANONICALIZE_AFTER_CODING (cs);
2696 if (!NILP (cac)) 2696 if (!NILP (cac))
2697 { 2697 {
2698 if (i > 0) 2698 if (i > 0)
2699 write_c_string (" ", printcharfun); 2699 write_c_string (printcharfun, " ");
2700 write_c_string ("canonicalize-after-coding=", printcharfun); 2700 write_c_string (printcharfun, "canonicalize-after-coding=");
2701 print_coding_system_in_print_method (cac, printcharfun, escapeflag); 2701 print_coding_system_in_print_method (cac, printcharfun, escapeflag);
2702 } 2702 }
2703 } 2703 }
2704 2704
2705 write_c_string (")", printcharfun); 2705 write_c_string (printcharfun, ")");
2706 } 2706 }
2707 2707
2708 static void 2708 static void
2709 chain_rewind_coding_stream_1 (struct chain_coding_stream *data) 2709 chain_rewind_coding_stream_1 (struct chain_coding_stream *data)
2710 { 2710 {
2942 { 2942 {
2943 2943
2944 while (n--) 2944 while (n--)
2945 { 2945 {
2946 c = *src++; 2946 c = *src++;
2947 if (BYTE_ASCII_P (c)) 2947 if (byte_ascii_p (c))
2948 { 2948 {
2949 assert (ch == 0); 2949 assert (ch == 0);
2950 Dynarr_add (dst, c); 2950 Dynarr_add (dst, c);
2951 } 2951 }
2952 #ifdef MULE 2952 #ifdef MULE
2953 else if (INTBYTE_LEADING_BYTE_P (c)) 2953 else if (intbyte_leading_byte_p (c))
2954 { 2954 {
2955 assert (ch == 0); 2955 assert (ch == 0);
2956 if (c == LEADING_BYTE_LATIN_ISO8859_1 || 2956 if (c == LEADING_BYTE_LATIN_ISO8859_1 ||
2957 c == LEADING_BYTE_CONTROL_1) 2957 c == LEADING_BYTE_CONTROL_1)
2958 ch = c; 2958 ch = c;
3320 { 3320 {
3321 struct undecided_coding_system *data = 3321 struct undecided_coding_system *data =
3322 XCODING_SYSTEM_TYPE_DATA (cs, undecided); 3322 XCODING_SYSTEM_TYPE_DATA (cs, undecided);
3323 int need_space = 0; 3323 int need_space = 0;
3324 3324
3325 write_c_string ("(", printcharfun); 3325 write_c_string (printcharfun, "(");
3326 if (data->do_eol) 3326 if (data->do_eol)
3327 { 3327 {
3328 write_c_string ("do-eol", printcharfun); 3328 write_c_string (printcharfun, "do-eol");
3329 need_space = 1; 3329 need_space = 1;
3330 } 3330 }
3331 if (data->do_coding) 3331 if (data->do_coding)
3332 { 3332 {
3333 if (need_space) 3333 if (need_space)
3334 write_c_string (" ", printcharfun); 3334 write_c_string (printcharfun, " ");
3335 write_c_string ("do-coding", printcharfun); 3335 write_c_string (printcharfun, "do-coding");
3336 need_space = 1; 3336 need_space = 1;
3337 } 3337 }
3338 if (!NILP (data->cs)) 3338 if (!NILP (data->cs))
3339 { 3339 {
3340 if (need_space) 3340 if (need_space)
3341 write_c_string (" ", printcharfun); 3341 write_c_string (printcharfun, " ");
3342 write_c_string ("coding-system=", printcharfun); 3342 write_c_string (printcharfun, "coding-system=");
3343 print_coding_system_in_print_method (data->cs, printcharfun, escapeflag); 3343 print_coding_system_in_print_method (data->cs, printcharfun, escapeflag);
3344 } 3344 }
3345 write_c_string (")", printcharfun); 3345 write_c_string (printcharfun, ")");
3346 } 3346 }
3347 3347
3348 static void 3348 static void
3349 undecided_mark_coding_stream (struct coding_stream *str) 3349 undecided_mark_coding_stream (struct coding_stream *str)
3350 { 3350 {
4301 static void 4301 static void
4302 gzip_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) 4302 gzip_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag)
4303 { 4303 {
4304 struct gzip_coding_system *data = XCODING_SYSTEM_TYPE_DATA (cs, gzip); 4304 struct gzip_coding_system *data = XCODING_SYSTEM_TYPE_DATA (cs, gzip);
4305 4305
4306 write_c_string ("(", printcharfun); 4306 write_c_string (printcharfun, "(");
4307 if (data->level == -1) 4307 if (data->level == -1)
4308 write_c_string ("default", printcharfun); 4308 write_c_string (printcharfun, "default");
4309 else 4309 else
4310 print_internal (make_int (data->level), printcharfun, 0); 4310 print_internal (make_int (data->level), printcharfun, 0);
4311 write_c_string (")", printcharfun); 4311 write_c_string (printcharfun, ")");
4312 } 4312 }
4313 4313
4314 static int 4314 static int
4315 gzip_putprop (Lisp_Object codesys, Lisp_Object key, Lisp_Object value) 4315 gzip_putprop (Lisp_Object codesys, Lisp_Object key, Lisp_Object value)
4316 { 4316 {