/[pcre]/code/trunk/pcre_exec.c
ViewVC logotype

Diff of /code/trunk/pcre_exec.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 538 by ph10, Wed Jun 9 19:30:57 2010 UTC revision 543 by ph10, Tue Jun 15 16:33:29 2010 UTC
# Line 6069  for(;;) Line 6069  for(;;)
6069    
6070    switch(rc)    switch(rc)
6071      {      {
6072      /* NOMATCH and PRUNE advance by one character. If MATCH_SKIP_ARG reaches      /* SKIP passes back the next starting point explicitly, but if it is the
6073      this level it means that a MARK that matched the SKIP's arg was not found.      same as the match we have just done, treat it as NOMATCH. */
6074      We treat this as NOMATCH. THEN at this level acts exactly like PRUNE. */  
6075        case MATCH_SKIP:
6076        if (md->start_match_ptr != start_match)
6077          {
6078          new_start_match = md->start_match_ptr;
6079          break;
6080          }
6081        /* Fall through */
6082    
6083        /* If MATCH_SKIP_ARG reaches this level it means that a MARK that matched
6084        the SKIP's arg was not found. We also treat this as NOMATCH. */
6085    
6086        case MATCH_SKIP_ARG:
6087        /* Fall through */
6088    
6089        /* NOMATCH and PRUNE advance by one character. THEN at this level acts
6090        exactly like PRUNE. */
6091    
6092      case MATCH_NOMATCH:      case MATCH_NOMATCH:
6093      case MATCH_PRUNE:      case MATCH_PRUNE:
     case MATCH_SKIP_ARG:  
6094      case MATCH_THEN:      case MATCH_THEN:
6095      new_start_match = start_match + 1;      new_start_match = start_match + 1;
6096  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
# Line 6085  for(;;) Line 6100  for(;;)
6100  #endif  #endif
6101      break;      break;
6102    
     /* SKIP passes back the next starting point explicitly. */  
   
     case MATCH_SKIP:  
     new_start_match = md->start_match_ptr;  
     break;  
   
6103      /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */      /* COMMIT disables the bumpalong, but otherwise behaves as NOMATCH. */
6104    
6105      case MATCH_COMMIT:      case MATCH_COMMIT:

Legend:
Removed from v.538  
changed lines
  Added in v.543

  ViewVC Help
Powered by ViewVC 1.1.5