X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fsearch.c;h=7c5f4473380e6ee37a2d532176ae89fad10d7617;hp=a66abc06ffe4a093c8dfff7809700ec4d2c24867;hb=1a5e625ffcc6b2e9a9828a89763c062a0b09b361;hpb=ea1ea793fe6e244ef5555ed983423a204101af13 diff --git a/src/search.c b/src/search.c index a66abc0..82e27ca 100644 --- a/src/search.c +++ b/src/search.c @@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA. */ #include "lisp.h" #include "buffer.h" +#include "commands.h" #include "insdel.h" #include "opaque.h" #ifdef REGION_CACHE_NEEDS_WORK @@ -54,10 +55,10 @@ struct regexp_cache { }; /* The instances of that struct. */ -static struct regexp_cache searchbufs[REGEXP_CACHE_SIZE]; +struct regexp_cache searchbufs[REGEXP_CACHE_SIZE]; /* The head of the linked list; points to the most recently used buffer. */ -static struct regexp_cache *searchbuf_head; +struct regexp_cache *searchbuf_head; /* Every call to re_match, etc., must pass &search_regs as the regs @@ -683,75 +684,31 @@ scan_buffer (struct buffer *buf, Emchar target, Bufpos start, Bufpos end, } Bytind -bi_find_next_newline_no_quit (struct buffer *buf, Bytind from, int count) +bi_find_next_newline_no_quit (struct buffer *buf, Bytind from, int cnt) { - return bi_scan_buffer (buf, '\n', from, 0, count, 0, 0); + return bi_scan_buffer (buf, '\n', from, 0, cnt, 0, 0); } Bufpos -find_next_newline_no_quit (struct buffer *buf, Bufpos from, int count) +find_next_newline_no_quit (struct buffer *buf, Bufpos from, int cnt) { - return scan_buffer (buf, '\n', from, 0, count, 0, 0); + return scan_buffer (buf, '\n', from, 0, cnt, 0, 0); } Bufpos -find_next_newline (struct buffer *buf, Bufpos from, int count) +find_next_newline (struct buffer *buf, Bufpos from, int cnt) { - return scan_buffer (buf, '\n', from, 0, count, 0, 1); -} - -Bytind -bi_find_next_emchar_in_string (struct Lisp_String* str, Emchar target, Bytind st, - EMACS_INT count) -{ - /* This function has been Mule-ized. */ - Bytind lim = string_length (str) -1; - Bufbyte* s = string_data (str); - - assert (count >= 0); - -#ifdef MULE - /* Due to the Mule representation of characters in a buffer, - we can simply search for characters in the range 0 - 127 - directly. For other characters, we do it the "hard" way. - Note that this way works for all characters but the other - way is faster. */ - if (target >= 0200) - { - while (st < lim && count > 0) - { - if (string_char (str, st) == target) - count--; - INC_CHARBYTIND (s, st); - } - } - else -#endif - { - while (st < lim && count > 0) - { - Bufbyte *bufptr = (Bufbyte *) memchr (charptr_n_addr (s, st), - (int) target, lim - st); - if (bufptr) - { - count--; - st = (Bytind)(bufptr - s) + 1; - } - else - st = lim; - } - } - return st; + return scan_buffer (buf, '\n', from, 0, cnt, 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 count) +find_before_next_newline (struct buffer *buf, Bufpos from, Bufpos to, int cnt) { EMACS_INT shortage; - Bufpos pos = scan_buffer (buf, '\n', from, to, count, &shortage, 1); + Bufpos pos = scan_buffer (buf, '\n', from, to, cnt, &shortage, 1); if (shortage == 0) pos--; @@ -773,21 +730,20 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp, REGISTER int i; struct Lisp_Char_Table *syntax_table = XCHAR_TABLE (buf->mirror_syntax_table); - Bufpos limit; + + CHECK_STRING (string); if (NILP (lim)) - limit = forwardp ? BUF_ZV (buf) : BUF_BEGV (buf); + XSETINT (lim, forwardp ? BUF_ZV (buf) : BUF_BEGV (buf)); else - { - CHECK_INT_COERCE_MARKER (lim); - limit = XINT (lim); + CHECK_INT_COERCE_MARKER (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); - } + /* 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)); - CHECK_STRING (string); p = XSTRING_DATA (string); pend = p + XSTRING_LENGTH (string); memset (fastmap, 0, sizeof (fastmap)); @@ -872,7 +828,7 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp, to worry about */ if (forwardp) { - while (BUF_PT (buf) < limit + while (BUF_PT (buf) < XINT (lim) && fastmap[(unsigned char) syntax_code_spec [(int) SYNTAX (syntax_table, @@ -882,7 +838,7 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp, } else { - while (BUF_PT (buf) > limit + while (BUF_PT (buf) > XINT (lim) && fastmap[(unsigned char) syntax_code_spec [(int) SYNTAX (syntax_table, @@ -895,7 +851,7 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp, { if (forwardp) { - while (BUF_PT (buf) < limit) + while (BUF_PT (buf) < XINT (lim)) { Emchar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf)); if ((ch < 0400) ? fastmap[ch] : @@ -910,7 +866,7 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp, } else { - while (BUF_PT (buf) > limit) + while (BUF_PT (buf) > XINT (lim)) { Emchar ch = BUF_FETCH_CHAR (buf, BUF_PT (buf) - 1); if ((ch < 0400) ? fastmap[ch] : @@ -1427,7 +1383,7 @@ search_buffer (struct buffer *buf, Lisp_Object string, Bufpos bufpos, (EMACS_UINT) p_limit) cursor += BM_tab[*cursor]; } - /* If you are here, cursor is beyond the end of the searched region. */ +/* 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 */ @@ -1881,7 +1837,7 @@ and you do not need to specify it.) 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)) @@ -2007,7 +1963,7 @@ and you do not need to specify it.) Charcount subend = -1; c = string_char (XSTRING (newtext), strpos); - if (c == '\\' && strpos < stlen - 1) + if (c == '\\') { c = string_char (XSTRING (newtext), ++strpos); if (c == '&') @@ -2153,7 +2109,7 @@ and you do not need to specify it.) Charcount offset = BUF_PT (buf) - search_regs.start[0]; c = string_char (XSTRING (newtext), strpos); - if (c == '\\' && strpos < stlen - 1) + if (c == '\\') { c = string_char (XSTRING (newtext), ++strpos); if (c == '&') @@ -2263,7 +2219,7 @@ match_limit (Lisp_Object num, int beginningp) 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]); @@ -2354,7 +2310,7 @@ to hold all the values, and if INTEGERS is non-nil, no consing is done. /* If REUSE is a list, store as many value elements as will fit into the elements of REUSE. */ - for (prev = Qnil, i = 0, tail = reuse; CONSP (tail); i++, tail = XCDR (tail)) + for (i = 0, tail = reuse; CONSP (tail); i++, tail = XCDR (tail)) { if (i < 2 * len + 2) XCAR (tail) = data[i]; @@ -2574,12 +2530,9 @@ syms_of_search (void) } void -reinit_vars_of_search (void) +vars_of_search (void) { - int i; - - last_thing_searched = Qnil; - staticpro_nodump (&last_thing_searched); + REGISTER int i; for (i = 0; i < REGEXP_CACHE_SIZE; ++i) { @@ -2587,16 +2540,13 @@ reinit_vars_of_search (void) searchbufs[i].buf.buffer = (unsigned char *) xmalloc (100); searchbufs[i].buf.fastmap = searchbufs[i].fastmap; searchbufs[i].regexp = Qnil; - staticpro_nodump (&searchbufs[i].regexp); + staticpro (&searchbufs[i].regexp); searchbufs[i].next = (i == REGEXP_CACHE_SIZE-1 ? 0 : &searchbufs[i+1]); } searchbuf_head = &searchbufs[0]; -} -void -vars_of_search (void) -{ - reinit_vars_of_search (); + last_thing_searched = Qnil; + staticpro (&last_thing_searched); DEFVAR_LISP ("forward-word-regexp", &Vforward_word_regexp /* *Regular expression to be used in `forward-word'.