comparison src/search.c @ 58348:623ffd21f0ff

(Vsearch_spaces_regexp): Renamed from Vsearch_whitespace_regexp. All uses changed.

58347:25b8b4e18c9a

/* error condition signaled when regexp compile_pattern fails */

Lisp_Object Qinvalid_regexp;

Lisp_Object Vsearch_whitespace_regexp;

static void set_search_regs ();
static void save_search_regs ();
static int simple_search ();
static int boyer_moore ();

   for this pattern.  0 means backtrack only enough to get a valid match.
   MULTIBYTE is nonzero if we want to handle multibyte characters in
   PATTERN.  0 means all multibyte characters are recognized just as
   sequences of binary data.

   The behavior also depends on Vsearch_whitespace_regexp.  */

static void
compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
     struct regexp_cache *cp;
     Lisp_Object pattern;

  cp->regexp = Qnil;
  cp->buf.translate = (! NILP (translate) ? translate : make_number (0));
  cp->posix = posix;
  cp->buf.multibyte = multibyte;
  cp->whitespace_regexp = Vsearch_whitespace_regexp;
  BLOCK_INPUT;
  old = re_set_syntax (RE_SYNTAX_EMACS
		       | (posix ? 0 : RE_NO_POSIX_BACKTRACKING));

  re_set_whitespace_regexp (NILP (Vsearch_whitespace_regexp) ? NULL
			    : SDATA (Vsearch_whitespace_regexp));

  val = (char *) re_compile_pattern ((char *)raw_pattern,
				     raw_pattern_size, &cp->buf);

  re_set_whitespace_regexp (NULL);

	  && STRING_MULTIBYTE (cp->regexp) == STRING_MULTIBYTE (pattern)
	  && !NILP (Fstring_equal (cp->regexp, pattern))
	  && EQ (cp->buf.translate, (! NILP (translate) ? translate : make_number (0)))
	  && cp->posix == posix
	  && cp->buf.multibyte == multibyte
	  && !NILP (Fequal (cp->whitespace_regexp, Vsearch_whitespace_regexp)))
	break;

      /* If we're at the end of the cache, compile into the nil cell
	 we found, or the last (least recently used) cell with a
	 string value.  */

    {
      set_search_regs (pos_byte, 0);
      return pos;
    }

  if (RE && !(trivial_regexp_p (string) && NILP (Vsearch_whitespace_regexp)))
    {
      unsigned char *p1, *p2;
      int s1, s2;
      struct re_pattern_buffer *bufp;

  staticpro (&last_thing_searched);

  saved_last_thing_searched = Qnil;
  staticpro (&saved_last_thing_searched);

  DEFVAR_LISP ("search-whitespace-regexp", &Vsearch_whitespace_regexp,
      /* doc: Regexp to substitute for bunches of spaces in regexp search.
Some commands use this for user-specified regexps.
Spaces that occur inside character classes or repetition operators
or other such regexp constructs are not replaced with this.
A value of nil (which is the normal value) means treat spaces literally.  */);
  Vsearch_whitespace_regexp = Qnil;

  defsubr (&Slooking_at);
  defsubr (&Sposix_looking_at);
  defsubr (&Sstring_match);
  defsubr (&Sposix_string_match);

58348:623ffd21f0ff

/* error condition signaled when regexp compile_pattern fails */

Lisp_Object Qinvalid_regexp;

Lisp_Object Vsearch_spaces_regexp;

static void set_search_regs ();
static void save_search_regs ();
static int simple_search ();
static int boyer_moore ();

   for this pattern.  0 means backtrack only enough to get a valid match.
   MULTIBYTE is nonzero if we want to handle multibyte characters in
   PATTERN.  0 means all multibyte characters are recognized just as
   sequences of binary data.

   The behavior also depends on Vsearch_spaces_regexp.  */

static void
compile_pattern_1 (cp, pattern, translate, regp, posix, multibyte)
     struct regexp_cache *cp;
     Lisp_Object pattern;

  cp->regexp = Qnil;
  cp->buf.translate = (! NILP (translate) ? translate : make_number (0));
  cp->posix = posix;
  cp->buf.multibyte = multibyte;
  cp->whitespace_regexp = Vsearch_spaces_regexp;
  BLOCK_INPUT;
  old = re_set_syntax (RE_SYNTAX_EMACS
		       | (posix ? 0 : RE_NO_POSIX_BACKTRACKING));

  re_set_whitespace_regexp (NILP (Vsearch_spaces_regexp) ? NULL
			    : SDATA (Vsearch_spaces_regexp));

  val = (char *) re_compile_pattern ((char *)raw_pattern,
				     raw_pattern_size, &cp->buf);

  re_set_whitespace_regexp (NULL);

	  && STRING_MULTIBYTE (cp->regexp) == STRING_MULTIBYTE (pattern)
	  && !NILP (Fstring_equal (cp->regexp, pattern))
	  && EQ (cp->buf.translate, (! NILP (translate) ? translate : make_number (0)))
	  && cp->posix == posix
	  && cp->buf.multibyte == multibyte
	  && !NILP (Fequal (cp->whitespace_regexp, Vsearch_spaces_regexp)))
	break;

      /* If we're at the end of the cache, compile into the nil cell
	 we found, or the last (least recently used) cell with a
	 string value.  */

    {
      set_search_regs (pos_byte, 0);
      return pos;
    }

  if (RE && !(trivial_regexp_p (string) && NILP (Vsearch_spaces_regexp)))
    {
      unsigned char *p1, *p2;
      int s1, s2;
      struct re_pattern_buffer *bufp;

  staticpro (&last_thing_searched);

  saved_last_thing_searched = Qnil;
  staticpro (&saved_last_thing_searched);

  DEFVAR_LISP ("search-spaces-regexp", &Vsearch_spaces_regexp,
      /* doc: Regexp to substitute for bunches of spaces in regexp search.
Some commands use this for user-specified regexps.
Spaces that occur inside character classes or repetition operators
or other such regexp constructs are not replaced with this.
A value of nil (which is the normal value) means treat spaces literally.  */);
  Vsearch_spaces_regexp = Qnil;

  defsubr (&Slooking_at);
  defsubr (&Sposix_looking_at);
  defsubr (&Sstring_match);
  defsubr (&Sposix_string_match);