/[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 882 by ph10, Sun Jan 15 18:45:27 2012 UTC revision 891 by ph10, Wed Jan 18 16:26:18 2012 UTC
# Line 1530  for (;;) Line 1530  for (;;)
1530    
1531      case OP_ASSERT:      case OP_ASSERT:
1532      case OP_ASSERTBACK:      case OP_ASSERTBACK:
1533        save_mark = md->mark;
1534      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1535        {        {
1536        condassert = TRUE;        condassert = TRUE;
# Line 1551  for (;;) Line 1552  for (;;)
1552    
1553        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);        if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc);
1554        ecode += GET(ecode, 1);        ecode += GET(ecode, 1);
1555          md->mark = save_mark;
1556        }        }
1557      while (*ecode == OP_ALT);      while (*ecode == OP_ALT);
1558    
# Line 1574  for (;;) Line 1576  for (;;)
1576    
1577      case OP_ASSERT_NOT:      case OP_ASSERT_NOT:
1578      case OP_ASSERTBACK_NOT:      case OP_ASSERTBACK_NOT:
1579        save_mark = md->mark;
1580      if (md->match_function_type == MATCH_CONDASSERT)      if (md->match_function_type == MATCH_CONDASSERT)
1581        {        {
1582        condassert = TRUE;        condassert = TRUE;
# Line 1584  for (;;) Line 1587  for (;;)
1587      do      do
1588        {        {
1589        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM5);
1590          md->mark = save_mark;
1591        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);        if (rrc == MATCH_MATCH || rrc == MATCH_ACCEPT) RRETURN(MATCH_NOMATCH);
1592        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)        if (rrc == MATCH_SKIP || rrc == MATCH_PRUNE || rrc == MATCH_COMMIT)
1593          {          {
# Line 3715  for (;;) Line 3719  for (;;)
3719              if (fc == d || foc == d) break;              if (fc == d || foc == d) break;
3720              eptr += len;              eptr += len;
3721              }              }
3722          if (possessive) continue;            if (possessive) continue;
3723          for(;;)            for(;;)
3724              {              {
3725              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM30);
3726              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);

Legend:
Removed from v.882  
changed lines
  Added in v.891

  ViewVC Help
Powered by ViewVC 1.1.5