/[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 939 by ph10, Sun Feb 26 15:58:56 2012 UTC revision 940 by ph10, Tue Feb 28 10:30:51 2012 UTC
# Line 1575  for (;;) Line 1575  for (;;)
1575          mstart = md->start_match_ptr;   /* In case \K reset it */          mstart = md->start_match_ptr;   /* In case \K reset it */
1576          break;          break;
1577          }          }
1578          md->mark = save_mark;
1579    
1580          /* A COMMIT failure must fail the entire assertion, without trying any
1581          subsequent branches. */
1582    
1583          if (rrc == MATCH_COMMIT) RRETURN(MATCH_NOMATCH);
1584    
1585        /* PCRE does not allow THEN or COMMIT to escape beyond an assertion; it        /* PCRE does not allow THEN to escape beyond an assertion; it
1586        is treated as NOMATCH. */        is treated as NOMATCH. */
1587    
1588        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN &&        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
           rrc != MATCH_COMMIT) RRETURN(rrc);  
   
1589        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
       md->mark = save_mark;  
1590        }        }
1591      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1592    

Legend:
Removed from v.939  
changed lines
  Added in v.940

  ViewVC Help
Powered by ViewVC 1.1.5