comparison src/regex.c @ 32823:2a7f61d7ae12

(IMMEDIATE_QUIT_CHECK): New macro, which does QUIT on NT-Emacs only. (re_match_2_internal): Use IMMEDIATE_QUIT_CHECK instead of QUIT, so that re_search functions only quit when callers expect them to.

32822:2b3e80a729bd

    case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: return 0;
    }
}
#endif

/* QUIT is only used on NTemacs.  */
#if !defined WINDOWSNT || !defined emacs || !defined QUIT
# undef QUIT
# define QUIT
#endif

#ifndef MATCH_MAY_ALLOCATE

/* If we cannot allocate large objects within re_match_2_internal,

	   Repeats start with an on_failure_jump that points past both
	   the repetition text and either the following jump or
	   pop_failure_jump back to this on_failure_jump.  */
	case on_failure_jump:
	  QUIT;
	  EXTRACT_NUMBER_AND_INCR (mcnt, p);
	  DEBUG_PRINT3 ("EXECUTING on_failure_jump %d (to %p):\n",
			mcnt, p + mcnt);

	  PUSH_FAILURE_POINT (p -3, d);

	   is nothing that they would both match, i.e., that we
	   would have to backtrack because of (as in, e.g., `a*a')
	   then we can use a non-backtracking loop based on
	   on_failure_keep_string_jump instead of on_failure_jump.  */
	case on_failure_jump_smart:
	  QUIT;
	  EXTRACT_NUMBER_AND_INCR (mcnt, p);
	  DEBUG_PRINT3 ("EXECUTING on_failure_jump_smart %d (to %p).\n",
			mcnt, p + mcnt);
	  {
	    unsigned char *p1 = p; /* Next operation.  */

	  break;

	/* Unconditionally jump (without popping any failure points).  */
	case jump:
	unconditional_jump:
	  QUIT;
	  EXTRACT_NUMBER_AND_INCR (mcnt, p);	/* Get the amount to jump.  */
	  DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
	  p += mcnt;				/* Do the jump.	 */
	  DEBUG_PRINT2 ("(to %p).\n", p);
	  break;

      continue;  /* Successfully executed one pattern command; keep going.  */


    /* We goto here if a matching operation fails. */
    fail:
      QUIT;
      if (!FAIL_STACK_EMPTY ())
	{
	  re_char *str;
	  unsigned char *pat;
	  /* A restart point is known.  Restore to that state.  */

32823:2a7f61d7ae12

    case RECC_BLANK: case RECC_UNIBYTE: case RECC_ERROR: return 0;
    }
}
#endif

/* Explicit quit checking is only used on NTemacs.  */
#if defined WINDOWSNT && defined emacs && defined QUIT
extern int immediate_quit;
# define IMMEDIATE_QUIT_CHECK			\
    do {					\
      if (immediate_quit) QUIT;			\
    } while (0)
#else
# define IMMEDIATE_QUIT_CHECK    (0)
#endif

#ifndef MATCH_MAY_ALLOCATE

/* If we cannot allocate large objects within re_match_2_internal,

	   Repeats start with an on_failure_jump that points past both
	   the repetition text and either the following jump or
	   pop_failure_jump back to this on_failure_jump.  */
	case on_failure_jump:
	  IMMEDIATE_QUIT_CHECK;
	  EXTRACT_NUMBER_AND_INCR (mcnt, p);
	  DEBUG_PRINT3 ("EXECUTING on_failure_jump %d (to %p):\n",
			mcnt, p + mcnt);

	  PUSH_FAILURE_POINT (p -3, d);

	   is nothing that they would both match, i.e., that we
	   would have to backtrack because of (as in, e.g., `a*a')
	   then we can use a non-backtracking loop based on
	   on_failure_keep_string_jump instead of on_failure_jump.  */
	case on_failure_jump_smart:
	  IMMEDIATE_QUIT_CHECK;
	  EXTRACT_NUMBER_AND_INCR (mcnt, p);
	  DEBUG_PRINT3 ("EXECUTING on_failure_jump_smart %d (to %p).\n",
			mcnt, p + mcnt);
	  {
	    unsigned char *p1 = p; /* Next operation.  */

	  break;

	/* Unconditionally jump (without popping any failure points).  */
	case jump:
	unconditional_jump:
	  IMMEDIATE_QUIT_CHECK;
	  EXTRACT_NUMBER_AND_INCR (mcnt, p);	/* Get the amount to jump.  */
	  DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
	  p += mcnt;				/* Do the jump.	 */
	  DEBUG_PRINT2 ("(to %p).\n", p);
	  break;

      continue;  /* Successfully executed one pattern command; keep going.  */


    /* We goto here if a matching operation fails. */
    fail:
      IMMEDIATE_QUIT_CHECK;
      if (!FAIL_STACK_EMPTY ())
	{
	  re_char *str;
	  unsigned char *pat;
	  /* A restart point is known.  Restore to that state.  */