comparison src/regex.c @ 49600:23a1cea22d13

Trailing whitespace deleted.

49599:5ade352e8d1c

/* Actually extend the space in WORK_AREA.  */

static void
extend_range_table_work_area (work_area)
     struct range_table_work_area *work_area;
{									
  work_area->allocated += 16 * sizeof (int);
  if (work_area->table)
    work_area->table
      = (int *) realloc (work_area->table, work_area->allocated);
  else

     each of which has two case-equivalent forms.
     This includes all ASCII letters.

     `strange' indicates a character that has more than one
     case-equivalent.  */
     
  enum case_type {one_case, two_case, strange};

  /* Describe the run that is in progress,
     which the next character can try to extend.
     If run_type is strange, that means there really is no run.

	      work_area->table[work_area->used++]
		= RE_TRANSLATE (eqv_table, run_end);
	    }
	  run_type = strange;
	}
	      
      if (this_type == strange)
	{
	  /* For a strange character, add each of its equivalents, one
	     by one.  Don't start a range.  */
	  do

		    re_opcode_t ofj =
		      /* Check if the loop can match the empty string.  */
		      (simple || !analyse_first (laststart, b, NULL, 0))
		      ? on_failure_jump : on_failure_jump_loop;
		    assert (skip_one_char (laststart) <= b);
		    
		    if (!zero_times_ok && simple)
		      { /* Since simple * loops can be made faster by using
		    	   on_failure_keep_string_jump, we turn simple P+
		    	   into PP* if P is simple.  */
		    	unsigned char *p1, *p2;

	  p += 4;
	  /* jump_n can either jump or fall through.  The (backward) jump
	     case has already been handled, so we only need to look at the
	     fallthrough case.  */
	  continue;
	  
	case succeed_n:
	  /* If N == 0, it should be an on_failure_jump_loop instead.  */
	  DEBUG_STATEMENT (EXTRACT_NUMBER (j, p + 2); assert (j > 0));
	  p += 4;
	  /* We only care about one iteration of the loop, so we don't

{
  switch (SWITCH_ENUM_CAST (*p++))
    {
    case anychar:
      break;
      
    case exactn:
      p += *p + 1;
      break;

    case charset_not:

	  p = CHARSET_RANGE_TABLE_END (p, mcnt);
	}
      else
	p += 1 + CHARSET_BITMAP_SIZE (p - 1);
      break;
      
    case syntaxspec:
    case notsyntaxspec:
#ifdef emacs
    case categoryspec:
    case notcategoryspec:

	{
	  DEBUG_PRINT1 ("  End of pattern: fast loop.\n");
	  return 1;
	}
      break;
      
    case endline:
    case exactn:
      {
	register re_wchar_t c
	  = (re_opcode_t) *p2 == endline ? '\n'

		  }
	      }
	  }
      }
      break;
      
    case charset_not:
      switch (SWITCH_ENUM_CAST (*p1))
	{
	case exactn:
	case charset:

	case stop_memory:
	  DEBUG_PRINT2 ("EXECUTING stop_memory %d:\n", *p);

	  assert (!REG_UNSET (regstart[*p]));
	  /* Strictly speaking, there should be code such as:
	     
		assert (REG_UNSET (regend[*p]));
		PUSH_FAILURE_REGSTOP ((unsigned int)*p);

	     But the only info to be pushed is regend[*p] and it is known to
	     be UNSET, so there really isn't anything to push.

	      UPDATE_SYNTAX_TABLE (charpos);
#endif
	      PREFETCH ();
	      c2 = RE_STRING_CHAR (d, dend - d);
	      s2 = SYNTAX (c2);
	
	      /* Case 2: S2 is not Sword. */
	      if (s2 != Sword)
		goto fail;

	      /* Case 3: D is not at the beginning of string ... */

49600:23a1cea22d13

/* Actually extend the space in WORK_AREA.  */

static void
extend_range_table_work_area (work_area)
     struct range_table_work_area *work_area;
{
  work_area->allocated += 16 * sizeof (int);
  if (work_area->table)
    work_area->table
      = (int *) realloc (work_area->table, work_area->allocated);
  else

     each of which has two case-equivalent forms.
     This includes all ASCII letters.

     `strange' indicates a character that has more than one
     case-equivalent.  */

  enum case_type {one_case, two_case, strange};

  /* Describe the run that is in progress,
     which the next character can try to extend.
     If run_type is strange, that means there really is no run.

	      work_area->table[work_area->used++]
		= RE_TRANSLATE (eqv_table, run_end);
	    }
	  run_type = strange;
	}

      if (this_type == strange)
	{
	  /* For a strange character, add each of its equivalents, one
	     by one.  Don't start a range.  */
	  do

		    re_opcode_t ofj =
		      /* Check if the loop can match the empty string.  */
		      (simple || !analyse_first (laststart, b, NULL, 0))
		      ? on_failure_jump : on_failure_jump_loop;
		    assert (skip_one_char (laststart) <= b);

		    if (!zero_times_ok && simple)
		      { /* Since simple * loops can be made faster by using
		    	   on_failure_keep_string_jump, we turn simple P+
		    	   into PP* if P is simple.  */
		    	unsigned char *p1, *p2;

	  p += 4;
	  /* jump_n can either jump or fall through.  The (backward) jump
	     case has already been handled, so we only need to look at the
	     fallthrough case.  */
	  continue;

	case succeed_n:
	  /* If N == 0, it should be an on_failure_jump_loop instead.  */
	  DEBUG_STATEMENT (EXTRACT_NUMBER (j, p + 2); assert (j > 0));
	  p += 4;
	  /* We only care about one iteration of the loop, so we don't

{
  switch (SWITCH_ENUM_CAST (*p++))
    {
    case anychar:
      break;

    case exactn:
      p += *p + 1;
      break;

    case charset_not:

	  p = CHARSET_RANGE_TABLE_END (p, mcnt);
	}
      else
	p += 1 + CHARSET_BITMAP_SIZE (p - 1);
      break;

    case syntaxspec:
    case notsyntaxspec:
#ifdef emacs
    case categoryspec:
    case notcategoryspec:

	{
	  DEBUG_PRINT1 ("  End of pattern: fast loop.\n");
	  return 1;
	}
      break;

    case endline:
    case exactn:
      {
	register re_wchar_t c
	  = (re_opcode_t) *p2 == endline ? '\n'

		  }
	      }
	  }
      }
      break;

    case charset_not:
      switch (SWITCH_ENUM_CAST (*p1))
	{
	case exactn:
	case charset:

	case stop_memory:
	  DEBUG_PRINT2 ("EXECUTING stop_memory %d:\n", *p);

	  assert (!REG_UNSET (regstart[*p]));
	  /* Strictly speaking, there should be code such as:

		assert (REG_UNSET (regend[*p]));
		PUSH_FAILURE_REGSTOP ((unsigned int)*p);

	     But the only info to be pushed is regend[*p] and it is known to
	     be UNSET, so there really isn't anything to push.

	      UPDATE_SYNTAX_TABLE (charpos);
#endif
	      PREFETCH ();
	      c2 = RE_STRING_CHAR (d, dend - d);
	      s2 = SYNTAX (c2);

	      /* Case 2: S2 is not Sword. */
	      if (s2 != Sword)
		goto fail;

	      /* Case 3: D is not at the beginning of string ... */