xemacs-beta: src/search.c comparison

comparison src/search.c @ 771:943eaba38521

[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.

author	ben
date	Wed, 13 Mar 2002 08:54:06 +0000
parents	a307f9a2021d
children	e38acbeb1cae

comparison

equal deleted inserted replaced

-:336a418893b5
+:943eaba38521
 /* String search routines for XEmacs.
 Copyright (C) 1985, 1986, 1987, 1992-1995 Free Software Foundation, Inc.
 Copyright (C) 1995 Sun Microsystems, Inc.
+Copyright (C) 2001 Ben Wing.
 This file is part of XEmacs.
 XEmacs is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 static Charbpos search_buffer (struct buffer *buf, Lisp_Object str,
 			     Charbpos charbpos, Charbpos buflim, EMACS_INT n, int RE,
 			     Lisp_Object trt, Lisp_Object inverse_trt,
 			     int posix);
+struct regex_reentrancy
+{
+struct syntax_cache cache;
+struct buffer *regex_emacs_buffer;
+Lisp_Object regex_match_object;
+};
+typedef struct
+{
+Dynarr_declare (struct regex_reentrancy);
+} regex_reentrancy_dynarr;
+static regex_reentrancy_dynarr *the_regex_reentrancy_dynarr;
+static Lisp_Object
+restore_regex_reentrancy (Lisp_Object dummy)
+{
+struct regex_reentrancy rr = Dynarr_pop (the_regex_reentrancy_dynarr);
+syntax_cache = rr.cache;
+regex_emacs_buffer = rr.regex_emacs_buffer;
+regex_match_object = rr.regex_match_object;
+return Qnil;
+}
+static int
+begin_regex_reentrancy (void)
+{
+/* #### there is still a potential problem with the regex cache --
+the compiled regex could be overwritten.  we'd need 20-fold
+reentrancy, though. */
+struct regex_reentrancy rr;
+rr.cache = syntax_cache;
+rr.regex_emacs_buffer = regex_emacs_buffer;
+rr.regex_match_object = regex_match_object;
+if (!the_regex_reentrancy_dynarr)
+the_regex_reentrancy_dynarr = Dynarr_new2 (regex_reentrancy_dynarr,
+					       struct regex_reentrancy);
+Dynarr_add (the_regex_reentrancy_dynarr, rr);
+return record_unwind_protect (restore_regex_reentrancy, Qnil);
+}
 static void
 matcher_overflow (void)
 {
 stack_overflow ("Stack overflow in regexp matcher", Qunbound);
 }
 for (i = 0; i < num_regs; i++)
 {
 if (search_regs.start[i] > 0)
 	{
 	  search_regs.start[i] =
-	    bytecount_to_charcount (XSTRING_DATA (string),
+	    XSTRING_INDEX_BYTE_TO_CHAR (string, search_regs.start[i]);
-				    search_regs.start[i]);
 	}
 if (search_regs.end[i] > 0)
 	{
 	  search_regs.end[i] =
-	    bytecount_to_charcount (XSTRING_DATA (string),
+	    XSTRING_INDEX_BYTE_TO_CHAR (string, search_regs.end[i]);
-				    search_regs.end[i]);
 	}
 }
 }
 Lisp_Object val;
 Bytebpos p1, p2;
 Bytecount s1, s2;
 REGISTER int i;
 struct re_pattern_buffer *bufp;
+int count = begin_regex_reentrancy ();
 if (running_asynch_code)
 save_search_regs ();
 CHECK_STRING (string);
 if (i == -2)
 matcher_overflow ();
 val = (0 <= i ? Qt : Qnil);
 if (NILP (val))
-return Qnil;
+return unbind_to (count);
 {
 int num_regs = search_regs.num_regs;
 for (i = 0; i < num_regs; i++)
 if (search_regs.start[i] >= 0)
 	{
 	  search_regs.end[i] += BI_BUF_BEGV (buf);
 	}
 }
 XSETBUFFER (last_thing_searched, buf);
 fixup_search_regs_for_buffer (buf);
-return val;
+return unbind_to_1 (count, val);
 }
 DEFUN ("looking-at", Flooking_at, 1, 2, 0, /*
 Return t if text after point matches regular expression REGEXP.
 This function modifies the match data that `match-beginning',
 {
 /* This function has been Mule-ized, except for the trt table handling. */
 Bytecount val;
 Charcount s;
 struct re_pattern_buffer *bufp;
+int count = begin_regex_reentrancy ();
 if (running_asynch_code)
 save_search_regs ();
 CHECK_STRING (regexp);
 			  (!NILP (buf->case_fold_search)
 			   ? XCASE_TABLE_DOWNCASE (buf->case_table) : Qnil),
 			  0, ERROR_ME);
 QUIT;
 {
-Bytecount bis = charcount_to_bytecount (XSTRING_DATA (string), s);
+Bytecount bis = XSTRING_INDEX_CHAR_TO_BYTE (string, s);
 regex_match_object = string;
 regex_emacs_buffer = buf;
 val = re_search (bufp, (char *) XSTRING_DATA (string),
 		     XSTRING_LENGTH (string), bis,
 		     XSTRING_LENGTH (string) - bis,
 		     &search_regs);
 }
 if (val == -2)
 matcher_overflow ();
-if (val < 0) return Qnil;
+if (val < 0) return unbind_to (count);
 last_thing_searched = Qt;
 fixup_search_regs_for_string (string);
-return make_int (bytecount_to_charcount (XSTRING_DATA (string), val));
+return
+unbind_to_1 (count,
+	       make_int (XSTRING_INDEX_BYTE_TO_CHAR (string, val)));
 }
 DEFUN ("string-match", Fstring_match, 2, 4, 0, /*
 Return index of start of first match for REGEXP in STRING, or nil.
 If third arg START is non-nil, start search at that index in STRING.
 {
 /* This function has been Mule-ized, except for the trt table handling. */
 Bytecount val;
 Intbyte *newnonreloc = (Intbyte *) nonreloc;
 struct re_pattern_buffer *bufp;
+int count;
 bufp = compile_pattern (regexp, 0,
 			  (case_fold_search
-			   ? XCASE_TABLE_DOWNCASE (current_buffer->case_table)
+			   ? XCASE_TABLE_DOWNCASE (Vstandard_case_table)
 			   : Qnil),
 			  0, errb);
 if (!bufp)
 return -1; /* will only do this when errb != ERROR_ME */
 if (!no_quit)
 else
 no_quit_in_re_search = 1;
 fixup_internal_substring (nonreloc, reloc, offset, &length);
+/* Don't need to protect against GC inside of re_search() due to QUIT;
+QUIT is GC-inhibited. */
 if (!NILP (reloc))
-{
+newnonreloc = XSTRING_DATA (reloc);
-if (no_quit)
-	newnonreloc = XSTRING_DATA (reloc);
+count = begin_regex_reentrancy ();
-else
-	{
-	  /* QUIT could relocate RELOC.  Therefore we must alloca()
-	     and copy.  No way around this except some serious
-	     rewriting of re_search(). */
-	  newnonreloc = (Intbyte *) alloca (length);
-	  memcpy (newnonreloc, XSTRING_DATA (reloc), length);
-	}
-}
 /* #### evil current-buffer dependency */
 regex_match_object = reloc;
 regex_emacs_buffer = current_buffer;
 val = re_search (bufp, (char *) newnonreloc + offset, length, 0,
 		   length, 0);
 no_quit_in_re_search = 0;
+unbind_to (count);
 return val;
 }
 Bytecount
 fast_lisp_string_match (Lisp_Object regex, Lisp_Object string)
 Intbyte *base_pat = XSTRING_DATA (string);
 REGISTER EMACS_INT i, j;
 Bytebpos p1, p2;
 Bytecount s1, s2;
 Bytebpos pos, lim;
+int count;
 if (running_asynch_code)
 save_search_regs ();
 /* Null string is found at starting position.  */
 pos = charbpos_to_bytebpos (buf, charbpos);
 lim = charbpos_to_bytebpos (buf, buflim);
 if (RE && !trivial_regexp_p (string))
 {
 struct re_pattern_buffer *bufp;
+count = begin_regex_reentrancy ();
 bufp = compile_pattern (string, &search_regs, trt, posix,
 			      ERROR_ME);
 /* Get pointers and sizes of the two strings
 	      /* And charbpos too. */
 	      charbpos = search_regs.start[0];
 	    }
 	  else
 	    {
+	      unbind_to (count);
 	      return n;
 	    }
 	  n++;
 	}
 while (n > 0)
 	      /* And charbpos too. */
 	      charbpos = search_regs.end[0];
 	    }
 	  else
 	    {
+	      unbind_to (count);
 	      return 0 - n;
 	    }
 	  n--;
 	}
+unbind_to (count);
 return charbpos;
 }
 else				/* non-RE case */
 {
 int charset_base = -1;
 		    j = (unsigned char) ch;
 		  /* For all the characters that map into CH,
 		     set up simple_translate to map the last byte
 		     into STARTING_J.  */
-		  simple_translate[j] = starting_j;
+		  simple_translate[j] = (Intbyte) starting_j;
 		  if (ch == starting_ch)
 		    break;
 		  BM_tab[j] = dirlen - i;
 		}
 	    }
 		set_string_char (XSTRING (replacement), strpos, newchar);
 	    }
 	}
 /* frees the Dynarrs if necessary. */
-unbind_to (speccount, Qnil);
+unbind_to (speccount);
 return concat3 (before, replacement, after);
 }
 mc_count = begin_multiple_change (buf, search_regs.start[sub],
 				    search_regs.end[sub]);
 	    buffer_replace_char (buf, pos, newchar, 0, 0);
 	}
 }
 /* frees the Dynarrs if necessary. */
-unbind_to (speccount, Qnil);
+unbind_to (speccount);
 end_multiple_change (buf, mc_count);
 return Qnil;
 }

Mercurial > hg > xemacs-beta

comparison src/search.c @ 771:943eaba38521