comparison src/search.c @ 872:79c6ff3eef26

[xemacs-hg @ 2002-06-20 21:18:01 by ben] font changes etc.; some 21.4 changes mule/mule-msw-init-late.el: Specify charset->windows-registry conversion. mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c. cl-macs.el: Document better. font-lock.el: Move Lisp function regexp to lisp-mode.el. lisp-mode.el: Various indentation fixes: Handle flet functions better. Handle argument lists in defuns and flets. Handle quoted lists, e.g. property lists -- don't indent like function calls. Distinguish between lambdas and other lists. lisp-mode.el: Handle this form. faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code: -- Fix lots of bogus code in msw-faces.el, msw-font-menu.el, font-menu.el that was "truenaming" font specs -- i.e. in the process of frobbing a particular field in a general user-specified font spec with wildcarded fields, sticking in particular values for all the remaining wildcarded fields. This bug was rampant everywhere except in x-faces.el (the oldest and only correctly written code). This also means that we need to work with font names at all times and not font instances, because a font instance is essentially a truenamed font. -- Total rewrite of extremely junky code in msw-faces.el. Work with names as well as font instances, and return names; stop truenaming when canonicalizing and frobbing; fix handling of the combined style field, i.e. weight/slant (also fixed in font.el). -- Totally rewrite the frobbing functions in faces.el. This time, we frob all the instantiators rather than just computing a single instance value and working backwards. That way, e.g., `bold' will work for all charsets that have bold available, rather than only for whatever charset was part of the computed font instance (another example of the truename virus). Also fix up code to look at the fallbacks (all of them) when no global value present, so we don't need to put something in the global value. Intelligently handle a request to frob a buffer locale, rather than signalling an error. When frobbing instantiators, try hard to figure out what device type is associated with them, and frob each according to its own proper device type. Correctly handle inheritance vectors given as instantiators. Preserve existing tags when putting back frobbed instantiators. Extract out general specifier-frobbing code into specifier.el. Document everything cleanly. Do lots of other things better, etc. -- Don't duplicatively set a global specification for the default font -- it's already in the fallback and we no longer need a default global specification present. Delete various code in x-faces.el and msw-faces.el that duplicated the lists of fonts in faces.c. -- init-global-faces was not being called at all under MS Windows! Major bogosity. That caused device-specific values to get stuck into all the fonts, making it very hard to change them -- setting global specs caused nothing to happen. -- Correct weight names in font.el. -- Lots more font fixups in objects*.c. Printer.el: Warning fix. specifier.el: Add more args to map-specifier. Add various "heuristic" specifier functions to aid in creation of specifier-munging code such as in faces.el. subr.el: New functions. lwlib.c: Fix warning. config.inc.samp: Clean up, add args to control fastcall (not yet supported! the changes needed are in another ws of mine), profile support, vc6 support, union-type. xemacs.dsp, xemacs.mak: Semi-major overhaul. Fix bug where dump-id was always getting recomputed, forcing a redump even when nothing changed. Add support for fastcall. Support edit-and-continue (on by default) with vc6. Use incremental linking when doing a debug compilation. Add support for profiling. Consolidate the various debug flags. Partial support for "batch-compiling" -- compiling many files on a single invocation of the compiler. Doesn't seem to help that much for me, so it's not finished or enabled by default. Remove HAVE_MSW_C_DIRED, we always do. Correct some sloppy use of directories. s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine HAVE_MMAP). s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32 variants (Cygwin, native, MinGW). Both of these are properly used in another ws. alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made: (1) Separation of various header files into an external and an internal version, similar to the existing separation of process.h and procimpl.h. Eventually this should be done for all Lisp objects. The external version has the same name as currently; the internal adds -impl. The external file has XFOO() macros for objects, but the structure is opaque and defined only in the internal file. It's now reasonable to move all prototypes in lisp.h into the appropriate external file, and this should be done. Currently, separation has been done on extents.h, objects*.h, console.h, device.h, frame.h, and window.h. For c/d/f/w, the most basic properties are available in the external header file, with the macros resolving to functions. In the internal header file, the macros are redefined to directly access the structure. Also, the global MARK_FOO_CHANGED macros have been made into functions so that they can be accessed without needing to include lots of -impl headers -- they are used in almost exclusively in non-time-critical functions, and take up enough time that the function overhead will be negligible. Similarly, the function overhead from making the basic properties mentioned above into functions is negligible, and code that does heavy accessing of c/d/f/w structures inevitably ends up needing the internal header files, anyway. (2) More face changes. -- Major rewrite of objects-msw.c. Now handles wildcard specs properly, rather than "truenaming" (or even worse, signalling an error, which previously happened with some of the fallbacks if you tried to use them in make-font-instance!). -- Split charset matching of fonts into two stages -- one to find a font specifically designed for a particular charset (by examining its registry), the second to find a Unicode font that can support the charset. This needs to proceed as two complete, separate instantiations in order to work properly (otherwise many of the fonts in the HELLO page look wrong). This should also make it easy to support iso10646 (Unicode) fonts under X. -- All default values for fonts are now completely specified in the fallbacks. Stuff from mule-x-init.el has all been moved here, merged with the existing specs, and totally rethought so you get sensible results. (HELLO now looks much better!). -- Generalize the "default X/GTK device" stuff into a per-device-type "default device". -- Add mswindows-{set-}charset-registry. In time, charset<->code-page conversion functions will be removed. -- Wrap protective code around calls to compute device specifier tags, and do this computation before calling the face initialization code because the latter may need these tags to be correctly updated. (3) Other changes. EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes. config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of #ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside! eval.c: Let detailed backtraces be detailed. specifier.c: Don't override user's print-string-length/print-length settings. glyphs.c: New function image-instance-instantiator. config.h.in, sysdep.c: Changes for fastcall. sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP NEEDS TO GO IN, TOO. search.c: Fix *evil* crash due to incorrect synching of syntax-cache code with 21.1. THIS SHOULD GO INTO 21.4.
author ben
date Thu, 20 Jun 2002 21:19:10 +0000
parents 804517e16990
children f809bc97829a
comparison
equal deleted inserted replaced
871:732270854293 872:79c6ff3eef26
109 109
110 /* range table for use with skip_chars. Only needed for Mule. */ 110 /* range table for use with skip_chars. Only needed for Mule. */
111 Lisp_Object Vskip_chars_range_table; 111 Lisp_Object Vskip_chars_range_table;
112 112
113 static void set_search_regs (struct buffer *buf, Charbpos beg, Charcount len); 113 static void set_search_regs (struct buffer *buf, Charbpos beg, Charcount len);
114 static void save_search_regs (void);
115 static Charbpos simple_search (struct buffer *buf, Ibyte *base_pat, 114 static Charbpos simple_search (struct buffer *buf, Ibyte *base_pat,
116 Bytecount len, Bytebpos pos, Bytebpos lim, 115 Bytecount len, Bytebpos pos, Bytebpos lim,
117 EMACS_INT n, Lisp_Object trt); 116 EMACS_INT n, Lisp_Object trt);
118 static Charbpos boyer_moore (struct buffer *buf, Ibyte *base_pat, 117 static Charbpos boyer_moore (struct buffer *buf, Ibyte *base_pat,
119 Bytecount len, Bytebpos pos, Bytebpos lim, 118 Bytecount len, Bytebpos pos, Bytebpos lim,
597 596
598 If ALLOW_QUIT is non-zero, call QUIT periodically. */ 597 If ALLOW_QUIT is non-zero, call QUIT periodically. */
599 598
600 static Bytebpos 599 static Bytebpos
601 byte_scan_buffer (struct buffer *buf, Ichar target, Bytebpos st, Bytebpos en, 600 byte_scan_buffer (struct buffer *buf, Ichar target, Bytebpos st, Bytebpos en,
602 EMACS_INT count, EMACS_INT *shortage, int allow_quit) 601 EMACS_INT count, EMACS_INT *shortage, int allow_quit)
603 { 602 {
604 Bytebpos lim = en > 0 ? en : 603 Bytebpos lim = en > 0 ? en :
605 ((count > 0) ? BYTE_BUF_ZV (buf) : BYTE_BUF_BEGV (buf)); 604 ((count > 0) ? BYTE_BUF_ZV (buf) : BYTE_BUF_BEGV (buf));
606 605
607 /* #### newline cache stuff in this function not yet ported */ 606 /* #### newline cache stuff in this function not yet ported */
828 pos--; 827 pos--;
829 828
830 return pos; 829 return pos;
831 } 830 }
832 831
832 /* This function synched with FSF 21.1 */
833 static Lisp_Object 833 static Lisp_Object
834 skip_chars (struct buffer *buf, int forwardp, int syntaxp, 834 skip_chars (struct buffer *buf, int forwardp, int syntaxp,
835 Lisp_Object string, Lisp_Object lim) 835 Lisp_Object string, Lisp_Object lim)
836 { 836 {
837 REGISTER Ibyte *p, *pend; 837 REGISTER Ibyte *p, *pend;
894 } 894 }
895 if (p != pend && *p == '-') 895 if (p != pend && *p == '-')
896 { 896 {
897 Ichar cend; 897 Ichar cend;
898 898
899 /* Skip over the dash. */
899 p++; 900 p++;
900 if (p == pend) break; 901 if (p == pend) break;
901 cend = itext_ichar (p); 902 cend = itext_ichar (p);
902 while (c <= cend && c < 0400) 903 while (c <= cend && c < 0400)
903 { 904 {
918 Vskip_chars_range_table); 919 Vskip_chars_range_table);
919 } 920 }
920 } 921 }
921 } 922 }
922 923
924 /* #### Not in FSF 21.1 */
923 if (syntaxp && fastmap['-'] != 0) 925 if (syntaxp && fastmap['-'] != 0)
924 fastmap[' '] = 1; 926 fastmap[' '] = 1;
925 927
926 /* If ^ was the first character, complement the fastmap. 928 /* If ^ was the first character, complement the fastmap.
927 We don't complement the range table, however; we just use negate 929 We don't complement the range table, however; we just use negate
931 for (i = 0; i < (int) (sizeof (fastmap)); i++) 933 for (i = 0; i < (int) (sizeof (fastmap)); i++)
932 fastmap[i] ^= 1; 934 fastmap[i] ^= 1;
933 935
934 { 936 {
935 Charbpos start_point = BUF_PT (buf); 937 Charbpos start_point = BUF_PT (buf);
938 Charbpos pos = start_point;
939 Charbpos pos_byte = BYTE_BUF_PT (buf);
936 940
937 if (syntaxp) 941 if (syntaxp)
938 { 942 {
939 scache = setup_buffer_syntax_cache (buf, BUF_PT (buf), 943 scache = setup_buffer_syntax_cache (buf, pos, forwardp ? 1 : -1);
940 forwardp ? 1 : -1);
941 /* All syntax designators are normal chars so nothing strange 944 /* All syntax designators are normal chars so nothing strange
942 to worry about */ 945 to worry about */
943 if (forwardp) 946 if (forwardp)
944 { 947 {
945 while (BUF_PT (buf) < limit 948 if (pos < limit)
946 && fastmap[(unsigned char) 949 while (fastmap[(unsigned char)
947 syntax_code_spec 950 syntax_code_spec
948 [(int) SYNTAX_FROM_CACHE 951 [(int) SYNTAX_FROM_CACHE
949 (scache, BUF_FETCH_CHAR (buf, BUF_PT (buf)))]]) 952 (scache, BYTE_BUF_FETCH_CHAR (buf, pos_byte))]])
950 { 953 {
951 BUF_SET_PT (buf, BUF_PT (buf) + 1); 954 pos++;
952 UPDATE_SYNTAX_CACHE_FORWARD (scache, BUF_PT (buf)); 955 INC_BYTEBPOS (buf, pos_byte);
953 } 956 if (pos >= XINT (lim))
957 break;
958 UPDATE_SYNTAX_CACHE_FORWARD (scache, pos);
959 }
954 } 960 }
955 else 961 else
956 { 962 {
957 while (BUF_PT (buf) > limit 963 while (pos > limit)
958 && fastmap[(unsigned char)
959 syntax_code_spec
960 [(int) SYNTAX_FROM_CACHE
961 (scache,
962 BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1))]])
963 { 964 {
964 BUF_SET_PT (buf, BUF_PT (buf) - 1); 965 Charbpos savepos = pos_byte;
965 UPDATE_SYNTAX_CACHE_BACKWARD (scache, BUF_PT (buf) - 1); 966 pos--;
967 DEC_BYTEBPOS (buf, pos_byte);
968 UPDATE_SYNTAX_CACHE_BACKWARD (scache, pos);
969 if (!fastmap[(unsigned char)
970 syntax_code_spec
971 [(int) SYNTAX_FROM_CACHE
972 (scache, BYTE_BUF_FETCH_CHAR (buf, pos_byte))]])
973 {
974 pos++;
975 pos_byte = savepos;
976 break;
977 }
966 } 978 }
967 } 979 }
968 } 980 }
969 else 981 else
970 { 982 {
971 if (forwardp) 983 if (forwardp)
972 { 984 {
973 while (BUF_PT (buf) < limit) 985 while (pos < limit)
974 { 986 {
975 Ichar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf)); 987 Ichar ch = BYTE_BUF_FETCH_CHAR (buf, pos_byte);
976 if ((ch < 0400) ? fastmap[ch] : 988 if ((ch < 0400) ? fastmap[ch] :
977 (NILP (Fget_range_table (make_int (ch), 989 (NILP (Fget_range_table (make_int (ch),
978 Vskip_chars_range_table, 990 Vskip_chars_range_table,
979 Qnil)) 991 Qnil))
980 == negate)) 992 == negate))
981 BUF_SET_PT (buf, BUF_PT (buf) + 1); 993 {
994 pos++;
995 INC_BYTEBPOS (buf, pos_byte);
996 }
982 else 997 else
983 break; 998 break;
984 } 999 }
985 } 1000 }
986 else 1001 else
987 { 1002 {
988 while (BUF_PT (buf) > limit) 1003 while (pos > limit)
989 { 1004 {
990 Ichar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1); 1005 Charbpos prev_pos_byte = pos_byte;
1006 Ichar ch;
1007
1008 DEC_BYTEBPOS (buf, prev_pos_byte);
1009 ch = BYTE_BUF_FETCH_CHAR (buf, prev_pos_byte);
991 if ((ch < 0400) ? fastmap[ch] : 1010 if ((ch < 0400) ? fastmap[ch] :
992 (NILP (Fget_range_table (make_int (ch), 1011 (NILP (Fget_range_table (make_int (ch),
993 Vskip_chars_range_table, 1012 Vskip_chars_range_table,
994 Qnil)) 1013 Qnil))
995 == negate)) 1014 == negate))
996 BUF_SET_PT (buf, BUF_PT (buf) - 1); 1015 {
1016 pos--;
1017 pos_byte = prev_pos_byte;
1018 }
997 else 1019 else
998 break; 1020 break;
999 } 1021 }
1000 } 1022 }
1001 } 1023 }
1002 QUIT; 1024 QUIT;
1025 BOTH_BUF_SET_PT (buf, pos, pos_byte);
1003 return make_int (BUF_PT (buf) - start_point); 1026 return make_int (BUF_PT (buf) - start_point);
1004 } 1027 }
1005 } 1028 }
1006 1029
1007 DEFUN ("skip-chars-forward", Fskip_chars_forward, 1, 3, 0, /* 1030 DEFUN ("skip-chars-forward", Fskip_chars_forward, 1, 3, 0, /*
2912 } 2935 }
2913 2936
2914 return Qnil; 2937 return Qnil;
2915 } 2938 }
2916 2939
2917 /* If non-zero the match data have been saved in saved_search_regs
2918 during the execution of a sentinel or filter. */
2919 static int search_regs_saved;
2920 static struct re_registers saved_search_regs;
2921
2922 /* Called from Flooking_at, Fstring_match, search_buffer, Fstore_match_data
2923 if asynchronous code (filter or sentinel) is running. */
2924 static void
2925 save_search_regs (void)
2926 {
2927 if (!search_regs_saved)
2928 {
2929 saved_search_regs.num_regs = search_regs.num_regs;
2930 saved_search_regs.start = search_regs.start;
2931 saved_search_regs.end = search_regs.end;
2932 search_regs.num_regs = 0;
2933 search_regs.start = 0;
2934 search_regs.end = 0;
2935
2936 search_regs_saved = 1;
2937 }
2938 }
2939
2940 /* Called upon exit from filters and sentinels. */
2941 void
2942 restore_match_data (void)
2943 {
2944 if (search_regs_saved)
2945 {
2946 if (search_regs.num_regs > 0)
2947 {
2948 xfree (search_regs.start);
2949 xfree (search_regs.end);
2950 }
2951 search_regs.num_regs = saved_search_regs.num_regs;
2952 search_regs.start = saved_search_regs.start;
2953 search_regs.end = saved_search_regs.end;
2954
2955 search_regs_saved = 0;
2956 }
2957 }
2958
2959 /* Quote a string to inactivate reg-expr chars */ 2940 /* Quote a string to inactivate reg-expr chars */
2960 2941
2961 DEFUN ("regexp-quote", Fregexp_quote, 1, 1, 0, /* 2942 DEFUN ("regexp-quote", Fregexp_quote, 1, 1, 0, /*
2962 Return a regexp string which matches exactly STRING and nothing else. 2943 Return a regexp string which matches exactly STRING and nothing else.
2963 */ 2944 */