xemacs-beta: src/search.c comparison

comparison src/search.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	cc15677e0335
children	aabb7f5b1c81

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"
-#include "commands.h"
 #include "insdel.h"
 #include "opaque.h"
 #ifdef REGION_CACHE_NEEDS_WORK
 #include "region-cache.h"
 #endif
 			      shortage, allow_quit);
 return bytind_to_bufpos (buf, bi_retval);
 }
 Bytind
-bi_find_next_newline_no_quit (struct buffer *buf, Bytind from, int cnt)
+bi_find_next_newline_no_quit (struct buffer *buf, Bytind from, int count)
 {
-return bi_scan_buffer (buf, '\n', from, 0, cnt, 0, 0);
+return bi_scan_buffer (buf, '\n', from, 0, count, 0, 0);
 }
 Bufpos
-find_next_newline_no_quit (struct buffer *buf, Bufpos from, int cnt)
+find_next_newline_no_quit (struct buffer *buf, Bufpos from, int count)
 {
-return scan_buffer (buf, '\n', from, 0, cnt, 0, 0);
+return scan_buffer (buf, '\n', from, 0, count, 0, 0);
 }
 Bufpos
-find_next_newline (struct buffer *buf, Bufpos from, int cnt)
+find_next_newline (struct buffer *buf, Bufpos from, int count)
 {
-return scan_buffer (buf, '\n', from, 0, cnt, 0, 1);
+return scan_buffer (buf, '\n', from, 0, count, 0, 1);
 }
 /* Like find_next_newline, but returns position before the newline,
 not after, and only search up to TO.  This isn't just
 find_next_newline (...)-1, because you might hit TO.  */
 Bufpos
-find_before_next_newline (struct buffer *buf, Bufpos from, Bufpos to, int cnt)
+find_before_next_newline (struct buffer *buf, Bufpos from, Bufpos to, int count)
 {
 EMACS_INT shortage;
-Bufpos pos = scan_buffer (buf, '\n', from, to, cnt, &shortage, 1);
+Bufpos pos = scan_buffer (buf, '\n', from, to, count, &shortage, 1);
 if (shortage == 0)
 pos--;
 return pos;
 unsigned char fastmap[0400];
 int negate = 0;
 REGISTER int i;
 struct Lisp_Char_Table *syntax_table =
 XCHAR_TABLE (buf->mirror_syntax_table);
+Bufpos limit;
+if (NILP (lim))
+limit = forwardp ? BUF_ZV (buf) : BUF_BEGV (buf);
+else
+{
+CHECK_INT_COERCE_MARKER (lim);
+limit = XINT (lim);
+/* In any case, don't allow scan outside bounds of buffer.  */
+if (limit > BUF_ZV   (buf)) limit = BUF_ZV   (buf);
+if (limit < BUF_BEGV (buf)) limit = BUF_BEGV (buf);
+}
 CHECK_STRING (string);
-if (NILP (lim))
-XSETINT (lim, forwardp ? BUF_ZV (buf) : BUF_BEGV (buf));
-else
-CHECK_INT_COERCE_MARKER (lim);
-/* In any case, don't allow scan outside bounds of buffer.  */
-if (XINT (lim) > BUF_ZV (buf))
-lim = make_int (BUF_ZV (buf));
-if (XINT (lim) < BUF_BEGV (buf))
-lim = make_int (BUF_BEGV (buf));
 p = XSTRING_DATA (string);
 pend = p + XSTRING_LENGTH (string);
 memset (fastmap, 0, sizeof (fastmap));
 Fclear_range_table (Vskip_chars_range_table);
 {
 	/* All syntax designators are normal chars so nothing strange
 	   to worry about */
 	if (forwardp)
 	  {
-	    while (BUF_PT (buf) < XINT (lim)
+	    while (BUF_PT (buf) < limit
 		   && fastmap[(unsigned char)
 syntax_code_spec
 			      [(int) SYNTAX (syntax_table,
 					     BUF_FETCH_CHAR
 					     (buf, BUF_PT (buf)))]])
 	      BUF_SET_PT (buf, BUF_PT (buf) + 1);
 	  }
 	else
 	  {
-	    while (BUF_PT (buf) > XINT (lim)
+	    while (BUF_PT (buf) > limit
 		   && fastmap[(unsigned char)
 syntax_code_spec
 			      [(int) SYNTAX (syntax_table,
 					     BUF_FETCH_CHAR
 					     (buf, BUF_PT (buf) - 1))]])
 }
 else
 {
 	if (forwardp)
 	  {
-	    while (BUF_PT (buf) < XINT (lim))
+	    while (BUF_PT (buf) < limit)
 	      {
 		Emchar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf));
 		if ((ch < 0400) ? fastmap[ch] :
 		    (NILP (Fget_range_table (make_int (ch),
 					     Vskip_chars_range_table,
 		  break;
 	      }
 	  }
 	else
 	  {
-	    while (BUF_PT (buf) > XINT (lim))
+	    while (BUF_PT (buf) > limit)
 	      {
 		Emchar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1);
 		if ((ch < 0400) ? fastmap[ch] :
 		    (NILP (Fget_range_table (make_int (ch),
 					     Vskip_chars_range_table,
 		      else
 			while ((EMACS_UINT) cursor >=
 			       (EMACS_UINT) p_limit)
 			  cursor += BM_tab[*cursor];
 		    }
 /* If you are here, cursor is beyond the end of the searched region. */
 /* This can happen if you match on the far character of the pattern, */
 /* because the "stride" of that character is infinity, a number able */
 /* to throw you well beyond the end of the search.  It can also */
 /* happen if you fail to match within the permitted region and would */
 /* otherwise try a character beyond that region */
 syntax_table = XCHAR_TABLE (buf->mirror_syntax_table);
 case_action = nochange;	/* We tried an initialization */
 				/* but some C compilers blew it */
-if (search_regs.num_regs <= 0)
+if (search_regs.num_regs == 0)
 error ("replace-match called before any match found");
 if (NILP (string))
 {
 if (search_regs.start[0] < BUF_BEGV (buf)
 CHECK_INT (num);
 n = XINT (num);
 if (n < 0 || n >= search_regs.num_regs)
 args_out_of_range (num, make_int (search_regs.num_regs));
-if (search_regs.num_regs <= 0 ||
+if (search_regs.num_regs == 0 ||
 search_regs.start[n] < 0)
 return Qnil;
 return make_int (beginningp ? search_regs.start[n] : search_regs.end[n]);
 }
 if (!CONSP (reuse))
 return Flist (2 * len + 2, data);
 /* If REUSE is a list, store as many value elements as will fit
 into the elements of REUSE.  */
-for (i = 0, tail = reuse; CONSP (tail); i++, tail = XCDR (tail))
+for (prev = Qnil, i = 0, tail = reuse; CONSP (tail); i++, tail = XCDR (tail))
 {
 if (i < 2 * len + 2)
 	XCAR (tail) = data[i];
 else
 	XCAR (tail) = Qnil;

Mercurial > hg > xemacs-beta

comparison src/search.c @ 380:8626e4521993 r21-2-5