[Emacs-diffs] Changes to emacs/src/regex.c

[Juanma Barranquero]

Index: emacs/src/regex.c
diff -c emacs/src/regex.c:1.184 emacs/src/regex.c:1.185
*** emacs/src/regex.c:1.184     Wed Jan 15 23:31:55 2003
--- emacs/src/regex.c   Tue Feb  4 09:03:13 2003
***************
*** 2065,2071 ****
  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
--- 2065,2071 ----
  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
***************
*** 2104,2110 ****
  
       `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,
--- 2104,2110 ----
  
       `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,
***************
*** 2174,2180 ****
            }
          run_type = strange;
        }
!             
        if (this_type == strange)
        {
          /* For a strange character, add each of its equivalents, one
--- 2174,2180 ----
            }
          run_type = strange;
        }
! 
        if (this_type == strange)
        {
          /* For a strange character, add each of its equivalents, one
***************
*** 2624,2630 ****
                      (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+
--- 2624,2630 ----
                      (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+
***************
*** 3941,3947 ****
             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));
--- 3941,3947 ----
             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));
***************
*** 4424,4430 ****
      {
      case anychar:
        break;
!       
      case exactn:
        p += *p + 1;
        break;
--- 4424,4430 ----
      {
      case anychar:
        break;
! 
      case exactn:
        p += *p + 1;
        break;
***************
*** 4441,4447 ****
        else
        p += 1 + CHARSET_BITMAP_SIZE (p - 1);
        break;
!       
      case syntaxspec:
      case notsyntaxspec:
  #ifdef emacs
--- 4441,4447 ----
        else
        p += 1 + CHARSET_BITMAP_SIZE (p - 1);
        break;
! 
      case syntaxspec:
      case notsyntaxspec:
  #ifdef emacs
***************
*** 4524,4530 ****
          return 1;
        }
        break;
!       
      case endline:
      case exactn:
        {
--- 4524,4530 ----
          return 1;
        }
        break;
! 
      case endline:
      case exactn:
        {
***************
*** 4634,4640 ****
          }
        }
        break;
!       
      case charset_not:
        switch (SWITCH_ENUM_CAST (*p1))
        {
--- 4634,4640 ----
          }
        }
        break;
! 
      case charset_not:
        switch (SWITCH_ENUM_CAST (*p1))
        {
***************
*** 5318,5324 ****
  
          assert (!REG_UNSET (regstart[*p]));
          /* Strictly speaking, there should be code such as:
!            
                assert (REG_UNSET (regend[*p]));
                PUSH_FAILURE_REGSTOP ((unsigned int)*p);
  
--- 5318,5324 ----
  
          assert (!REG_UNSET (regstart[*p]));
          /* Strictly speaking, there should be code such as:
! 
                assert (REG_UNSET (regend[*p]));
                PUSH_FAILURE_REGSTOP ((unsigned int)*p);
  
***************
*** 5735,5741 ****
              PREFETCH ();
              c2 = RE_STRING_CHAR (d, dend - d);
              s2 = SYNTAX (c2);
!       
              /* Case 2: S2 is not Sword. */
              if (s2 != Sword)
                goto fail;
--- 5735,5741 ----
              PREFETCH ();
              c2 = RE_STRING_CHAR (d, dend - d);
              s2 = SYNTAX (c2);
! 
              /* Case 2: S2 is not Sword. */
              if (s2 != Sword)
                goto fail;