comparison src/search.c @ 853:2b6fa2618f76

[xemacs-hg @ 2002-05-28 08:44:22 by ben] merge my stderr-proc ws make-docfile.c: Fix places where we forget to check for EOF. code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and friends work both ways but Cygwin programs don't like the CRs. code-process.el, multicast.el, process.el: Removed. Improvements to call-process-internal: -- allows a buffer to be specified for input and stderr output -- use it on all systems -- implement C-g as documented -- clean up and comment call-process-region uses new call-process facilities; no temp file. remove duplicate funs in process.el. comment exactly how coding systems work and fix various problems. open-multicast-group now does similar coding-system frobbing to open-network-stream. dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time. xemacs.mak: Add -DSTRICT. ================================================================ ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES ================================================================ Standard output and standard error can be processed separately in a process. Each can have its own buffer, its own mark in that buffer, and its filter function. You can specify a separate buffer for stderr in `start-process' to get things started, or use the new primitives: set-process-stderr-buffer process-stderr-buffer process-stderr-mark set-process-stderr-filter process-stderr-filter Also, process-send-region takes a 4th optional arg, a buffer. Currently always uses a pipe() under Unix to read the error output. (#### Would a PTY be better?) sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c. wait_for_termination() now only needed on a few really old systems. console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for error input. Create Lstreams for reading in the error channel. Many process methods need change. In general the changes are fairly clear as they involve duplicating what's used for reading the normal stdout and changing for stderr -- although tedious, as such changes are required throughout the entire process code. Rewrote the code that reads process output to do two loops, one for stdout and one for stderr. gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr. ================================================================ NEW ERROR-TRAPPING MECHANISM ================================================================ Totally rewrite error trapping code to be unified and support more features. Basic function is call_trapping_problems(), which lets you specify, by means of flags, what sorts of problems you want trapped. these can include -- quit -- errors -- throws past the function -- creation of "display objects" (e.g. buffers) -- deletion of already-existing "display objects" (e.g. buffers) -- modification of already-existing buffers -- entering the debugger -- gc -- errors->warnings (ala suspended errors) etc. All other error funs rewritten in terms of this one. Various older mechanisms removed or rewritten. window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to note_object_created(), for use with trapping_problems mechanism. When deleting, call check_allowed_operation() and note_object deleted(). The trapping-problems code records the objects created since the call-trapping-problems began. Those objects can be deleted, but none others (i.e. previously existing ones). bytecode.c, cmdloop.c: internal_catch takes another arg. eval.c: Add long comments describing the "five lists" used to maintain state (backtrace, gcpro, specbind, etc.) in the Lisp engine. backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or redo in terms of new one. frame.c, gutter.c: Flush out the concept of "critical display section", defined by the in_display() var. Use an internal_bind() to get it reset, rather than just doing it at end, because there may be a non-local exit. event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on old mechanisms. glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay. insdel.c: Protect hooks against deleting existing buffers. frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers. Otherwise we run into stickiness in redisplay because internal_equal() can QUIT. ================================================================ SIGNAL, C-G CHANGES ================================================================ Here we change the way that C-g interacts with event reading. The idea is that a C-g occurring while we're reading a user event should be read as C-g, but elsewhere should be a QUIT. The former code did all sorts of bizarreness -- requiring that no QUIT occurs anywhere in event-reading code (impossible to enforce given the stuff called or Lisp code invoked), and having some weird system involving enqueue/dequeue of a C-g and interaction with Vquit_flag -- and it didn't work. Now, we simply enclose all code where we want C-g read as an event with {begin/end}_dont_check_for_quit(). This completely turns off the mechanism that checks (and may remove or alter) C-g in the read-ahead queues, so we just get the C-g normal. Signal.c documents this very carefully. cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old out-of-date comments. event-stream.c: Fix C-g handling to actually work. device-x.c: Disable quit checking when err out. signal.c: Cleanup. Add large descriptive comment. process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT. It's not necessary to use REALLY_QUIT and just confuses the issue. lisp.h: Comment quit handlers. ================================================================ CONS CHANGES ================================================================ free_cons() now takes a Lisp_Object not the result of XCONS(). car and cdr have been renamed so that they don't get used directly; go through XCAR(), XCDR() instead. alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object, not Lisp_Cons chartab.c: Eliminate direct use of ->car, ->cdr, should be black box. callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons. ================================================================ USE INTERNAL-BIND-* ================================================================ eval.c: Cleanups of these funs. alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object() in place of whatever varied and cumbersome mechanisms were formerly there. ================================================================ SPECBIND SANITY ================================================================ backtrace.h: - Improved comments backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity checking code each time the catchlist or specbind stack change. Removed older prototype of same mechanism. ================================================================ MISC ================================================================ lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship. device-msw.c: Correct bad Unicode-ization. print.c: Be more careful when not initialized or in fatal error handling. search.c: Eliminate running_asynch_code, an FSF holdover. alloc.c: Added comments about gc-cons-threshold. dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value tree, like in menubar-x.c. gui.c: Use Qunbound not Qnil as the default for gethash. lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP(). lisp.h: Use ERROR_CHECK_STRUCTURES to turn on ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK lisp.h: Add assert_with_message. lisp.h: Add macros for gcproing entire arrays. (You could do this before but it required manual twiddling the gcpro structure.) lisp.h: Add prototypes for new functions defined elsewhere.
author ben
date Tue, 28 May 2002 08:45:36 +0000
parents e7ee5f8bde58
children 804517e16990
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
302 REGISTER int i; 302 REGISTER int i;
303 struct re_pattern_buffer *bufp; 303 struct re_pattern_buffer *bufp;
304 struct syntax_cache scache_struct; 304 struct syntax_cache scache_struct;
305 struct syntax_cache *scache = &scache_struct; 305 struct syntax_cache *scache = &scache_struct;
306 306
307 if (running_asynch_code)
308 save_search_regs ();
309
310 CHECK_STRING (string); 307 CHECK_STRING (string);
311 bufp = compile_pattern (string, &search_regs, 308 bufp = compile_pattern (string, &search_regs,
312 (!NILP (buf->case_fold_search) 309 (!NILP (buf->case_fold_search)
313 ? XCASE_TABLE_DOWNCASE (buf->case_table) : Qnil), 310 ? XCASE_TABLE_DOWNCASE (buf->case_table) : Qnil),
314 wrap_buffer (buf), buf, posix, ERROR_ME); 311 wrap_buffer (buf), buf, posix, ERROR_ME);
391 { 388 {
392 Bytecount val; 389 Bytecount val;
393 Charcount s; 390 Charcount s;
394 struct re_pattern_buffer *bufp; 391 struct re_pattern_buffer *bufp;
395 392
396 if (running_asynch_code) 393 /* Some FSF junk with running_asynch_code, to preserve the match
397 save_search_regs (); 394 data. Not necessary because we don't call process filters
395 asynchronously (i.e. from within QUIT). */
398 396
399 CHECK_STRING (regexp); 397 CHECK_STRING (regexp);
400 CHECK_STRING (string); 398 CHECK_STRING (string);
401 399
402 if (NILP (start)) 400 if (NILP (start))
1191 REGISTER EMACS_INT i, j; 1189 REGISTER EMACS_INT i, j;
1192 Bytebpos p1, p2; 1190 Bytebpos p1, p2;
1193 Bytecount s1, s2; 1191 Bytecount s1, s2;
1194 Bytebpos pos, lim; 1192 Bytebpos pos, lim;
1195 1193
1196 if (running_asynch_code) 1194 /* Some FSF junk with running_asynch_code, to preserve the match
1197 save_search_regs (); 1195 data. Not necessary because we don't call process filters
1196 asynchronously (i.e. from within QUIT). */
1198 1197
1199 /* Null string is found at starting position. */ 1198 /* Null string is found at starting position. */
1200 if (len == 0) 1199 if (len == 0)
1201 { 1200 {
1202 set_search_regs (buf, charbpos, 0); 1201 set_search_regs (buf, charbpos, 0);
2233 { 2232 {
2234 Dynarr_free (get_opaque_ptr (XCAR (cons))); 2233 Dynarr_free (get_opaque_ptr (XCAR (cons)));
2235 Dynarr_free (get_opaque_ptr (XCDR (cons))); 2234 Dynarr_free (get_opaque_ptr (XCDR (cons)));
2236 free_opaque_ptr (XCAR (cons)); 2235 free_opaque_ptr (XCAR (cons));
2237 free_opaque_ptr (XCDR (cons)); 2236 free_opaque_ptr (XCDR (cons));
2238 free_cons (XCONS (cons)); 2237 free_cons (cons);
2239 return Qnil; 2238 return Qnil;
2240 } 2239 }
2241 2240
2242 DEFUN ("replace-match", Freplace_match, 1, 5, 0, /* 2241 DEFUN ("replace-match", Freplace_match, 1, 5, 0, /*
2243 Replace text matched by last search with REPLACEMENT. 2242 Replace text matched by last search with REPLACEMENT.
2848 REGISTER int i; 2847 REGISTER int i;
2849 REGISTER Lisp_Object marker; 2848 REGISTER Lisp_Object marker;
2850 int num_regs; 2849 int num_regs;
2851 int length; 2850 int length;
2852 2851
2853 if (running_asynch_code) 2852 /* Some FSF junk with running_asynch_code, to preserve the match
2854 save_search_regs (); 2853 data. Not necessary because we don't call process filters
2854 asynchronously (i.e. from within QUIT). */
2855 2855
2856 CONCHECK_LIST (list); 2856 CONCHECK_LIST (list);
2857 2857
2858 /* Unless we find a marker with a buffer in LIST, assume that this 2858 /* Unless we find a marker with a buffer in LIST, assume that this
2859 match data came from a string. */ 2859 match data came from a string. */