comparison src/macros.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 a5954632b187
children 79c6ff3eef26
comparison
equal deleted inserted replaced
852:d83885ef293b 853:2b6fa2618f76
242 else 242 else
243 Fexecute_kbd_macro (con->last_kbd_macro, prefix); 243 Fexecute_kbd_macro (con->last_kbd_macro, prefix);
244 return Qnil; 244 return Qnil;
245 } 245 }
246 246
247 /* Restore Vexecuting_macro and executing_macro_index - called when
248 the unwind-protect in Fexecute_kbd_macro gets invoked. */
249 static Lisp_Object
250 pop_kbd_macro (Lisp_Object info)
251 {
252 Vexecuting_macro = Fcar (info);
253 executing_macro_index = XINT (Fcdr (info));
254 return Qnil;
255 }
256
257 DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, 1, 2, 0, /* 247 DEFUN ("execute-kbd-macro", Fexecute_kbd_macro, 1, 2, 0, /*
258 Execute MACRO as string of editor command characters. 248 Execute MACRO as string of editor command characters.
259 If MACRO is a symbol, its function definition is used. 249 If MACRO is a symbol, its function definition is used.
260 COUNT is a repeat count, or nil for once, or 0 for infinite loop. 250 COUNT is a repeat count, or nil for once, or 0 for infinite loop.
261 */ 251 */
262 (macro, count)) 252 (macro, count))
263 { 253 {
264 /* This function can GC */ 254 /* This function can GC */
265 Lisp_Object final; 255 Lisp_Object final;
266 Lisp_Object tem;
267 int speccount = specpdl_depth (); 256 int speccount = specpdl_depth ();
268 int repeat = 1; 257 int repeat = 1;
269 struct gcpro gcpro1; 258 struct gcpro gcpro1;
270 struct console *con = XCONSOLE (Vselected_console); 259 struct console *con = XCONSOLE (Vselected_console);
271 260
277 266
278 final = indirect_function (macro, 1); 267 final = indirect_function (macro, 1);
279 if (!STRINGP (final) && !VECTORP (final)) 268 if (!STRINGP (final) && !VECTORP (final))
280 invalid_argument ("Keyboard macros must be strings or vectors", Qunbound); 269 invalid_argument ("Keyboard macros must be strings or vectors", Qunbound);
281 270
282 tem = Fcons (Vexecuting_macro, make_int (executing_macro_index)); 271 internal_bind_lisp_object (&Vexecuting_macro, Vexecuting_macro);
283 record_unwind_protect (pop_kbd_macro, tem); 272 internal_bind_int (&executing_macro_index, executing_macro_index);
284 273
285 GCPRO1 (final); 274 GCPRO1 (final);
286 do 275 do
287 { 276 {
288 Vexecuting_macro = final; 277 Vexecuting_macro = final;
289 executing_macro_index = 0; 278 executing_macro_index = 0;
290 con->prefix_arg = Qnil; 279 con->prefix_arg = Qnil;
291 internal_catch (Qexecute_kbd_macro, call_command_loop, 280 internal_catch (Qexecute_kbd_macro, call_command_loop,
292 Qnil, 0); 281 Qnil, 0, 0);
293 } 282 }
294 while (--repeat != 0 283 while (--repeat != 0
295 && (STRINGP (Vexecuting_macro) || 284 && (STRINGP (Vexecuting_macro) ||
296 VECTORP (Vexecuting_macro))); 285 VECTORP (Vexecuting_macro)));
297 286