comparison src/search.c @ 578:190b164ddcac

[xemacs-hg @ 2001-05-25 11:26:50 by ben] device-msw.c, eldap.c, emodules.c, hpplay.c, process-unix.c, sound.h, tooltalk.c, win32.c: Revert Martin's attempted compile-warnings fix. It does fix the warnings, but not the right way. We are trying to eliminate the raw use of `char' and `unsigned char' absolutely everywhere. There is never an occasion to reintroduce these. buffer.h: Instead, we fix these macros so they don't care about the type of their lvalues. We already do this for the non-C-string equivalents of these, and it's correct because it should be OK to pass in an SBufbyte *, for example. In any case, we do not need any type-correctness checking here -- errors will be caught for sure as soon as we remove the -Wno-sign-compare switch. mule-charset.c: Use invalid_argument, not generic signal_error (Qerror, ). alloc.c, chartab.c, console-gtk.c, console-msw.c, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console.c, console.h, device-x.c, device.c, elhash.c, eval.c, faces.c, faces.h, fns.c, glyphs.c, glyphs.h, gui.c, gui.h, lisp.h, lread.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, process-unix.c, rangetab.c, search.c, specifier.c, toolbar.c, window.c, window.h: Rename Error_behavior to Error_Behavior, to be consistent with general naming practices (Lisp_Object, Char_Binary, etc.).
author ben
date Fri, 25 May 2001 11:27:01 +0000
parents 183866b06e0b
children b39c14581166
comparison
equal deleted inserted replaced
577:910449c92002 578:190b164ddcac
141 for this pattern. 0 means backtrack only enough to get a valid match. */ 141 for this pattern. 0 means backtrack only enough to get a valid match. */
142 142
143 static int 143 static int
144 compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern, 144 compile_pattern_1 (struct regexp_cache *cp, Lisp_Object pattern,
145 Lisp_Object translate, struct re_registers *regp, int posix, 145 Lisp_Object translate, struct re_registers *regp, int posix,
146 Error_behavior errb) 146 Error_Behavior errb)
147 { 147 {
148 const char *val; 148 const char *val;
149 reg_syntax_t old; 149 reg_syntax_t old;
150 150
151 cp->regexp = Qnil; 151 cp->regexp = Qnil;
179 POSIX is nonzero if we want full backtracking (POSIX style) 179 POSIX is nonzero if we want full backtracking (POSIX style)
180 for this pattern. 0 means backtrack only enough to get a valid match. */ 180 for this pattern. 0 means backtrack only enough to get a valid match. */
181 181
182 struct re_pattern_buffer * 182 struct re_pattern_buffer *
183 compile_pattern (Lisp_Object pattern, struct re_registers *regp, 183 compile_pattern (Lisp_Object pattern, struct re_registers *regp,
184 Lisp_Object translate, int posix, Error_behavior errb) 184 Lisp_Object translate, int posix, Error_Behavior errb)
185 { 185 {
186 struct regexp_cache *cp, **cpp; 186 struct regexp_cache *cp, **cpp;
187 187
188 for (cpp = &searchbuf_head; ; cpp = &cp->next) 188 for (cpp = &searchbuf_head; ; cpp = &cp->next)
189 { 189 {
459 459
460 Bytecount 460 Bytecount
461 fast_string_match (Lisp_Object regexp, const Bufbyte *nonreloc, 461 fast_string_match (Lisp_Object regexp, const Bufbyte *nonreloc,
462 Lisp_Object reloc, Bytecount offset, 462 Lisp_Object reloc, Bytecount offset,
463 Bytecount length, int case_fold_search, 463 Bytecount length, int case_fold_search,
464 Error_behavior errb, int no_quit) 464 Error_Behavior errb, int no_quit)
465 { 465 {
466 /* This function has been Mule-ized, except for the trt table handling. */ 466 /* This function has been Mule-ized, except for the trt table handling. */
467 Bytecount val; 467 Bytecount val;
468 Bufbyte *newnonreloc = (Bufbyte *) nonreloc; 468 Bufbyte *newnonreloc = (Bufbyte *) nonreloc;
469 struct re_pattern_buffer *bufp; 469 struct re_pattern_buffer *bufp;