Mercurial > hg > xemacs-beta
comparison src/unicode.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 | a5954632b187 |
children | 804517e16990 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
584 if (tab[i] != -1) | 584 if (tab[i] != -1) |
585 { | 585 { |
586 Lisp_Object char_charset; | 586 Lisp_Object char_charset; |
587 int c1, c2; | 587 int c1, c2; |
588 | 588 |
589 assert (valid_char_p (tab[i])); | 589 assert (valid_emchar_p (tab[i])); |
590 BREAKUP_CHAR (tab[i], char_charset, c1, c2); | 590 BREAKUP_EMCHAR (tab[i], char_charset, c1, c2); |
591 assert (EQ (charset, char_charset)); | 591 assert (EQ (charset, char_charset)); |
592 if (XCHARSET_DIMENSION (charset) == 1) | 592 if (XCHARSET_DIMENSION (charset) == 1) |
593 { | 593 { |
594 int *to_table = | 594 int *to_table = |
595 (int *) XCHARSET_TO_UNICODE_TABLE (charset); | 595 (int *) XCHARSET_TO_UNICODE_TABLE (charset); |
673 Emchar this_ch; | 673 Emchar this_ch; |
674 short val; | 674 short val; |
675 void *frtab = XCHARSET_FROM_UNICODE_TABLE (charset); | 675 void *frtab = XCHARSET_FROM_UNICODE_TABLE (charset); |
676 | 676 |
677 if (XCHARSET_DIMENSION (charset) == 1) | 677 if (XCHARSET_DIMENSION (charset) == 1) |
678 this_ch = MAKE_CHAR (charset, i + 32, 0); | 678 this_ch = make_emchar (charset, i + 32, 0); |
679 else | 679 else |
680 this_ch = MAKE_CHAR (charset, codetop + 32, i + 32); | 680 this_ch = make_emchar (charset, codetop + 32, i + 32); |
681 | 681 |
682 assert (tab[i] >= 0); | 682 assert (tab[i] >= 0); |
683 BREAKUP_UNICODE_CODE (tab[i], u4, u3, u2, u1, levels); | 683 BREAKUP_UNICODE_CODE (tab[i], u4, u3, u2, u1, levels); |
684 assert (levels <= XCHARSET_FROM_UNICODE_LEVELS (charset)); | 684 assert (levels <= XCHARSET_FROM_UNICODE_LEVELS (charset)); |
685 | 685 |
690 case 3: val = ((short ***) frtab)[u3][u2][u1]; break; | 690 case 3: val = ((short ***) frtab)[u3][u2][u1]; break; |
691 case 4: val = ((short ****) frtab)[u4][u3][u2][u1]; break; | 691 case 4: val = ((short ****) frtab)[u4][u3][u2][u1]; break; |
692 default: abort (); | 692 default: abort (); |
693 } | 693 } |
694 | 694 |
695 ch = MAKE_CHAR (charset, val >> 8, val & 0xFF); | 695 ch = make_emchar (charset, val >> 8, val & 0xFF); |
696 assert (ch == this_ch); | 696 assert (ch == this_ch); |
697 | 697 |
698 switch (XCHARSET_FROM_UNICODE_LEVELS (charset)) | 698 switch (XCHARSET_FROM_UNICODE_LEVELS (charset)) |
699 { | 699 { |
700 case 4: | 700 case 4: |
779 set_unicode_conversion (Emchar chr, int code) | 779 set_unicode_conversion (Emchar chr, int code) |
780 { | 780 { |
781 Lisp_Object charset; | 781 Lisp_Object charset; |
782 int c1, c2; | 782 int c1, c2; |
783 | 783 |
784 BREAKUP_CHAR (chr, charset, c1, c2); | 784 BREAKUP_EMCHAR (chr, charset, c1, c2); |
785 | 785 |
786 assert (!EQ (charset, Vcharset_ascii)); | 786 assert (!EQ (charset, Vcharset_ascii)); |
787 assert (!EQ (charset, Vcharset_control_1)); | 787 assert (!EQ (charset, Vcharset_control_1)); |
788 assert (!EQ (charset, Vcharset_composite)); | 788 assert (!EQ (charset, Vcharset_composite)); |
789 | 789 |
911 sledgehammer_check_unicode_tables (charset); | 911 sledgehammer_check_unicode_tables (charset); |
912 #endif | 912 #endif |
913 } | 913 } |
914 | 914 |
915 int | 915 int |
916 char_to_unicode (Emchar chr) | 916 emchar_to_unicode (Emchar chr) |
917 { | 917 { |
918 Lisp_Object charset; | 918 Lisp_Object charset; |
919 int c1, c2; | 919 int c1, c2; |
920 | 920 |
921 type_checking_assert (valid_char_p (chr)); | 921 type_checking_assert (valid_emchar_p (chr)); |
922 if (chr < 256) | 922 if (chr < 256) |
923 return (int) chr; | 923 return (int) chr; |
924 | 924 |
925 BREAKUP_CHAR (chr, charset, c1, c2); | 925 BREAKUP_EMCHAR (chr, charset, c1, c2); |
926 if (EQ (charset, Vcharset_composite)) | 926 if (EQ (charset, Vcharset_composite)) |
927 return -1; /* #### don't know how to handle */ | 927 return -1; /* #### don't know how to handle */ |
928 else if (XCHARSET_DIMENSION (charset) == 1) | 928 else if (XCHARSET_DIMENSION (charset) == 1) |
929 return ((int *) XCHARSET_TO_UNICODE_TABLE (charset))[c1 - 32]; | 929 return ((int *) XCHARSET_TO_UNICODE_TABLE (charset))[c1 - 32]; |
930 else | 930 else |
962 case 4: retval = ((short ****) table)[u4][u3][u2][u1]; break; | 962 case 4: retval = ((short ****) table)[u4][u3][u2][u1]; break; |
963 default: abort (); retval = 0; | 963 default: abort (); retval = 0; |
964 } | 964 } |
965 | 965 |
966 if (retval != -1) | 966 if (retval != -1) |
967 return MAKE_CHAR (charset, retval >> 8, retval & 0xFF); | 967 return make_emchar (charset, retval >> 8, retval & 0xFF); |
968 } | 968 } |
969 } | 969 } |
970 | 970 |
971 return (Emchar) -1; | 971 return (Emchar) -1; |
972 } | 972 } |
1007 | 1007 |
1008 for (i = 0; i < NUM_LEADING_BYTES; i++) | 1008 for (i = 0; i < NUM_LEADING_BYTES; i++) |
1009 { | 1009 { |
1010 if (lbs[i] == 0) | 1010 if (lbs[i] == 0) |
1011 { | 1011 { |
1012 Lisp_Object charset = CHARSET_BY_LEADING_BYTE (i + MIN_LEADING_BYTE); | 1012 Lisp_Object charset = charset_by_leading_byte (i + MIN_LEADING_BYTE); |
1013 if (!NILP (charset)) | 1013 if (!NILP (charset)) |
1014 Dynarr_add (unicode_precedence_dynarr, charset); | 1014 Dynarr_add (unicode_precedence_dynarr, charset); |
1015 } | 1015 } |
1016 } | 1016 } |
1017 } | 1017 } |
1098 Lisp_Object charset; | 1098 Lisp_Object charset; |
1099 | 1099 |
1100 CHECK_CHAR (character); | 1100 CHECK_CHAR (character); |
1101 CHECK_NATNUM (code); | 1101 CHECK_NATNUM (code); |
1102 | 1102 |
1103 charset = CHAR_CHARSET (XCHAR (character)); | 1103 charset = emchar_charset (XCHAR (character)); |
1104 if (EQ (charset, Vcharset_ascii) || | 1104 if (EQ (charset, Vcharset_ascii) || |
1105 EQ (charset, Vcharset_control_1) || | 1105 EQ (charset, Vcharset_control_1) || |
1106 EQ (charset, Vcharset_composite)) | 1106 EQ (charset, Vcharset_composite)) |
1107 signal_error (Qinvalid_argument, "Cannot set Unicode translation for ASCII, Control-1 or Composite chars", | 1107 signal_error (Qinvalid_argument, "Cannot set Unicode translation for ASCII, Control-1 or Composite chars", |
1108 character); | 1108 character); |
1120 */ | 1120 */ |
1121 (character)) | 1121 (character)) |
1122 { | 1122 { |
1123 CHECK_CHAR (character); | 1123 CHECK_CHAR (character); |
1124 #ifdef MULE | 1124 #ifdef MULE |
1125 return make_int (char_to_unicode (XCHAR (character))); | 1125 return make_int (emchar_to_unicode (XCHAR (character))); |
1126 #else | 1126 #else |
1127 return Fchar_to_int (character); | 1127 return Fchar_to_int (character); |
1128 #endif /* MULE */ | 1128 #endif /* MULE */ |
1129 } | 1129 } |
1130 | 1130 |
1350 } | 1350 } |
1351 | 1351 |
1352 if (cp1high < l2 || cp1high > h2 || cp1low < l1 || cp1low > h1) | 1352 if (cp1high < l2 || cp1high > h2 || cp1low < l1 || cp1low > h1) |
1353 goto out_of_range; | 1353 goto out_of_range; |
1354 | 1354 |
1355 emch = (cp1high == 0 ? MAKE_CHAR (charset, cp1low, 0) : | 1355 emch = (cp1high == 0 ? make_emchar (charset, cp1low, 0) : |
1356 MAKE_CHAR (charset, cp1high, cp1low)); | 1356 make_emchar (charset, cp1high, cp1low)); |
1357 set_unicode_conversion (emch, cp2); | 1357 set_unicode_conversion (emch, cp2); |
1358 } | 1358 } |
1359 } | 1359 } |
1360 } | 1360 } |
1361 | 1361 |
1546 encode_unicode_char (Lisp_Object charset, int h, int l, | 1546 encode_unicode_char (Lisp_Object charset, int h, int l, |
1547 unsigned_char_dynarr *dst, enum unicode_type type, | 1547 unsigned_char_dynarr *dst, enum unicode_type type, |
1548 int little_endian) | 1548 int little_endian) |
1549 { | 1549 { |
1550 #ifdef MULE | 1550 #ifdef MULE |
1551 int code = char_to_unicode (MAKE_CHAR (charset, h & 127, l & 127)); | 1551 int code = emchar_to_unicode (make_emchar (charset, h & 127, l & 127)); |
1552 | 1552 |
1553 if (code == -1) | 1553 if (code == -1) |
1554 { | 1554 { |
1555 if (type != UNICODE_UTF_16 && | 1555 if (type != UNICODE_UTF_16 && |
1556 XCHARSET_DIMENSION (charset) == 2 && | 1556 XCHARSET_DIMENSION (charset) == 2 && |
1712 while (n--) | 1712 while (n--) |
1713 { | 1713 { |
1714 Intbyte c = *src++; | 1714 Intbyte c = *src++; |
1715 | 1715 |
1716 #ifdef MULE | 1716 #ifdef MULE |
1717 if (BYTE_ASCII_P (c)) | 1717 if (byte_ascii_p (c)) |
1718 #endif /* MULE */ | 1718 #endif /* MULE */ |
1719 { /* Processing ASCII character */ | 1719 { /* Processing ASCII character */ |
1720 ch = 0; | 1720 ch = 0; |
1721 encode_unicode_char (Vcharset_ascii, c, 0, dst, type, | 1721 encode_unicode_char (Vcharset_ascii, c, 0, dst, type, |
1722 little_endian); | 1722 little_endian); |
1723 | 1723 |
1724 char_boundary = 1; | 1724 char_boundary = 1; |
1725 } | 1725 } |
1726 #ifdef MULE | 1726 #ifdef MULE |
1727 else if (INTBYTE_LEADING_BYTE_P (c) || INTBYTE_LEADING_BYTE_P (ch)) | 1727 else if (intbyte_leading_byte_p (c) || intbyte_leading_byte_p (ch)) |
1728 { /* Processing Leading Byte */ | 1728 { /* Processing Leading Byte */ |
1729 ch = 0; | 1729 ch = 0; |
1730 charset = CHARSET_BY_LEADING_BYTE (c); | 1730 charset = charset_by_leading_byte (c); |
1731 if (LEADING_BYTE_PREFIX_P(c)) | 1731 if (leading_byte_prefix_p(c)) |
1732 ch = c; | 1732 ch = c; |
1733 char_boundary = 0; | 1733 char_boundary = 0; |
1734 } | 1734 } |
1735 else | 1735 else |
1736 { /* Processing Non-ASCII character */ | 1736 { /* Processing Non-ASCII character */ |
1766 dst, type, | 1766 dst, type, |
1767 little_endian); | 1767 little_endian); |
1768 } | 1768 } |
1769 else | 1769 else |
1770 { | 1770 { |
1771 Emchar emch = MAKE_CHAR (Vcharset_composite, | 1771 Emchar emch = make_emchar (Vcharset_composite, |
1772 ch & 0x7F, | 1772 ch & 0x7F, |
1773 c & 0x7F); | 1773 c & 0x7F); |
1774 Lisp_Object lstr = | 1774 Lisp_Object lstr = |
1775 composite_char_string (emch); | 1775 composite_char_string (emch); |
1776 saved_n = n; | 1776 saved_n = n; |
2112 static void | 2112 static void |
2113 unicode_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) | 2113 unicode_print (Lisp_Object cs, Lisp_Object printcharfun, int escapeflag) |
2114 { | 2114 { |
2115 write_fmt_string_lisp (printcharfun, "(%s", 1, unicode_getprop (cs, Qtype)); | 2115 write_fmt_string_lisp (printcharfun, "(%s", 1, unicode_getprop (cs, Qtype)); |
2116 if (XCODING_SYSTEM_UNICODE_LITTLE_ENDIAN (cs)) | 2116 if (XCODING_SYSTEM_UNICODE_LITTLE_ENDIAN (cs)) |
2117 write_c_string (", little-endian", printcharfun); | 2117 write_c_string (printcharfun, ", little-endian"); |
2118 if (XCODING_SYSTEM_UNICODE_NEED_BOM (cs)) | 2118 if (XCODING_SYSTEM_UNICODE_NEED_BOM (cs)) |
2119 write_c_string (", need-bom", printcharfun); | 2119 write_c_string (printcharfun, ", need-bom"); |
2120 write_c_string (")", printcharfun); | 2120 write_c_string (printcharfun, ")"); |
2121 } | 2121 } |
2122 | 2122 |
2123 int | 2123 int |
2124 dfc_coding_system_is_unicode (Lisp_Object codesys) | 2124 dfc_coding_system_is_unicode (Lisp_Object codesys) |
2125 { | 2125 { |