comparison lib-src/i.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 abe6d1db359e
children 01c57eb70ae9
comparison
equal deleted inserted replaced
825:eb3bc15a6e0f 826:6728e641994e
1 /* I-connector utility 1 /* I-connector utility
2 Copyright (C) 2000 Kirill M. Katsnelson 2 Copyright (C) 2000 Kirill M. Katsnelson
3 Copyright (C) 2002 Ben Wing.
3 4
4 This file is part of XEmacs. 5 This file is part of XEmacs.
5 6
6 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
7 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
82 DWORD unused; 83 DWORD unused;
83 HANDLE h_thread = CreateThread (NULL, 0, pump, (void*)pi, 0, &unused); 84 HANDLE h_thread = CreateThread (NULL, 0, pump, (void*)pi, 0, &unused);
84 CloseHandle (h_thread); 85 CloseHandle (h_thread);
85 } 86 }
86 87
87 /* 88 static HANDLE external_event;
88 * Get command line, skip over the executable name, return the rest. 89
89 */ 90 static BOOL
91 ctrl_c_handler (unsigned long type)
92 {
93 SetEvent (external_event);
94 return FALSE;
95 }
96
97 /* Skip over the executable name in the given command line. Correctly
98 handles quotes in the name. Return NULL upon error. If
99 REQUIRE_FOLLOWING is non-zero, it's an error if no argument follows the
100 executable name. */
101
90 static LPTSTR 102 static LPTSTR
91 get_command (void) 103 skip_executable_name (LPTSTR cl, int require_following)
92 { 104 {
93 LPTSTR cl = GetCommandLine ();
94 int ix; 105 int ix;
95 106
96 while (1) 107 while (1)
97 { 108 {
98 ix = _tcscspn (cl, _T(" \t\"")); 109 ix = _tcscspn (cl, _T(" \t\""));
105 } 116 }
106 else 117 else
107 { 118 {
108 cl += ix; 119 cl += ix;
109 cl += _tcsspn (cl, _T(" \t")); 120 cl += _tcsspn (cl, _T(" \t"));
121 if (!require_following)
122 return cl;
110 return *cl ? cl : NULL; 123 return *cl ? cl : NULL;
111 } 124 }
112 } 125 }
113 } 126 }
114 127
131 { 144 {
132 STARTUPINFO si; 145 STARTUPINFO si;
133 PROCESS_INFORMATION pi; 146 PROCESS_INFORMATION pi;
134 I_connector I_in, I_out, I_err; 147 I_connector I_in, I_out, I_err;
135 DWORD exit_code; 148 DWORD exit_code;
136 149 LPTSTR command = skip_executable_name (GetCommandLine (), 1);
137 LPTSTR command = get_command (); 150
138 if (command == NULL) 151 if (command == NULL)
139 { 152 {
140 usage (); 153 usage ();
141 return 1; 154 return 1;
142 } 155 }
154 167
155 I_err.drain = GetStdHandle (STD_ERROR_HANDLE); 168 I_err.drain = GetStdHandle (STD_ERROR_HANDLE);
156 CreatePipe (&I_err.source, &si.hStdError, NULL, 0); 169 CreatePipe (&I_err.source, &si.hStdError, NULL, 0);
157 make_inheritable (&si.hStdError); 170 make_inheritable (&si.hStdError);
158 171
159 if (CreateProcess (NULL, command, NULL, NULL, TRUE, 0, 172 {
160 NULL, NULL, &si, &pi) == 0) 173 SECURITY_ATTRIBUTES sa;
161 { 174 LPTSTR new_command =
162 _ftprintf (stderr, _T("Error %d launching `%s'\n"), 175 (LPTSTR) malloc (666 + sizeof (TCHAR) * _tcslen (command));
163 GetLastError (), command); 176 LPTSTR past_exe;
164 return 2; 177
165 } 178 if (!new_command)
166 179 {
167 CloseHandle (pi.hThread); 180 _ftprintf (stderr, _T ("Out of memory when launching `%s'\n"),
181 command);
182 return 2;
183 }
184
185 past_exe = skip_executable_name (command, 0);
186 if (!past_exe)
187 {
188 usage ();
189 return 1;
190 }
191
192 /* Since XEmacs isn't a console application, it can't easily be
193 terminated using ^C. Therefore, we set up a communication path with
194 it so that when a ^C is sent to us (using GenerateConsoleCtrlEvent),
195 we in turn signals it to commit suicide. (This is cleaner than using
196 TerminateProcess()). This makes (e.g.) the "Stop Build" command
197 from VC++ correctly terminate XEmacs.
198
199 #### This will cause problems if i.exe is used for commands other
200 than XEmacs. We need to make behavior this a command-line
201 option. */
202
203 /* Create the event as inheritable so that we can use it to communicate
204 with the child process */
205 sa.nLength = sizeof (sa);
206 sa.bInheritHandle = TRUE;
207 sa.lpSecurityDescriptor = NULL;
208 external_event = CreateEvent (&sa, FALSE, FALSE, NULL);
209 if (!external_event)
210 {
211 _ftprintf (stderr, _T ("Error %d creating signal event for `%s'\n"),
212 GetLastError (), command);
213 return 2;
214 }
215
216 SetConsoleCtrlHandler ((PHANDLER_ROUTINE) ctrl_c_handler, TRUE);
217 _tcsncpy (new_command, command, past_exe - command);
218 _stprintf (new_command + (past_exe - command),
219 /* start with space in case no args past command name */
220 " -mswindows-termination-handle %d ", (long) external_event);
221 _tcscat (new_command, past_exe);
222
223 if (CreateProcess (NULL, new_command, NULL, NULL, TRUE, 0,
224 NULL, NULL, &si, &pi) == 0)
225 {
226 _ftprintf (stderr, _T("Error %d launching `%s'\n"),
227 GetLastError (), command);
228 return 2;
229 }
230
231 CloseHandle (pi.hThread);
232 }
233
168 234
169 /* Start pump in each I-connector */ 235 /* Start pump in each I-connector */
170 start_pump (&I_in); 236 start_pump (&I_in);
171 start_pump (&I_out); 237 start_pump (&I_out);
172 start_pump (&I_err); 238 start_pump (&I_err);