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

Diff of /code/trunk/pcre_dfa_exec.c

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

revision 1319 by ph10, Wed Feb 27 15:41:22 2013 UTC revision 1320 by ph10, Wed May 1 16:39:35 2013 UTC
# Line 1119  for (;;) Line 1119  for (;;)
1119              if (c == *cp++) { OK = TRUE; break; }              if (c == *cp++) { OK = TRUE; break; }
1120              }              }
1121            break;            break;
1122    
1123            case PT_UCNC:            case PT_UCNC:
1124            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
1125                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
1126                 c >= 0xe000;                 c >= 0xe000;
1127            break;            break;
1128    
1129            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
1130    
# Line 1372  for (;;) Line 1372  for (;;)
1372    
1373            case PT_UCNC:            case PT_UCNC:
1374            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
1375                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
1376                 c >= 0xe000;                 c >= 0xe000;
1377            break;            break;
1378    
1379            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
1380    
# Line 1616  for (;;) Line 1616  for (;;)
1616    
1617            case PT_UCNC:            case PT_UCNC:
1618            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
1619                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
1620                 c >= 0xe000;                 c >= 0xe000;
1621            break;            break;
1622    
1623            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
1624    
# Line 1885  for (;;) Line 1885  for (;;)
1885    
1886            case PT_UCNC:            case PT_UCNC:
1887            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||            OK = c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
1888                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||                 c == CHAR_GRAVE_ACCENT || (c >= 0xa0 && c <= 0xd7ff) ||
1889                 c >= 0xe000;                 c >= 0xe000;
1890            break;            break;
1891    
1892            /* Should never occur, but keep compilers from grumbling. */            /* Should never occur, but keep compilers from grumbling. */
1893    
# Line 3561  for (;;) Line 3561  for (;;)
3561    /* Anything other than "no match" means we are done, always; otherwise, carry    /* Anything other than "no match" means we are done, always; otherwise, carry
3562    on only if not anchored. */    on only if not anchored. */
3563    
3564    if (rc != PCRE_ERROR_NOMATCH || anchored)    if (rc != PCRE_ERROR_NOMATCH || anchored)
3565      {      {
3566      if (rc == PCRE_ERROR_PARTIAL && offsetcount >= 2)      if (rc == PCRE_ERROR_PARTIAL && offsetcount >= 2)
3567        {        {
3568        offsets[0] = (int)(md->start_used_ptr - (PCRE_PUCHAR)subject);        offsets[0] = (int)(md->start_used_ptr - (PCRE_PUCHAR)subject);
3569        offsets[1] = (int)(end_subject - (PCRE_PUCHAR)subject);        offsets[1] = (int)(end_subject - (PCRE_PUCHAR)subject);
3570        if (offsetcount > 2)        if (offsetcount > 2)
3571          offsets[2] = (int)(current_subject - (PCRE_PUCHAR)subject);          offsets[2] = (int)(current_subject - (PCRE_PUCHAR)subject);
3572        }        }
3573      return rc;      return rc;
3574      }      }
3575    
3576    /* Advance to the next subject character unless we are at the end of a line    /* Advance to the next subject character unless we are at the end of a line
3577    and firstline is set. */    and firstline is set. */

Legend:
Removed from v.1319  
changed lines
  Added in v.1320

  ViewVC Help
Powered by ViewVC 1.1.5