/[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 226 by ph10, Tue Aug 21 11:46:08 2007 UTC revision 244 by ph10, Fri Sep 14 09:14:24 2007 UTC
# Line 43  pattern matching using an NFA algorithm, Line 43  pattern matching using an NFA algorithm,
43  possible. There are also some static supporting functions. */  possible. There are also some static supporting functions. */
44    
45  #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
46  #include <config.h>  #include "config.h"
47  #endif  #endif
48    
49  #define NLBLOCK md             /* Block containing newline information */  #define NLBLOCK md             /* Block containing newline information */
# Line 1526  for (;;) Line 1526  for (;;)
1526        case 0x000d:        case 0x000d:
1527        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;        if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
1528        break;        break;
1529    
1530        case 0x000a:        case 0x000a:
1531          break;
1532    
1533        case 0x000b:        case 0x000b:
1534        case 0x000c:        case 0x000c:
1535        case 0x0085:        case 0x0085:
1536        case 0x2028:        case 0x2028:
1537        case 0x2029:        case 0x2029:
1538          if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
1539        break;        break;
1540        }        }
1541      ecode++;      ecode++;
# Line 2954  for (;;) Line 2958  for (;;)
2958              case 0x000d:              case 0x000d:
2959              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
2960              break;              break;
2961    
2962              case 0x000a:              case 0x000a:
2963                break;
2964    
2965              case 0x000b:              case 0x000b:
2966              case 0x000c:              case 0x000c:
2967              case 0x0085:              case 0x0085:
2968              case 0x2028:              case 0x2028:
2969              case 0x2029:              case 0x2029:
2970                if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
2971              break;              break;
2972              }              }
2973            }            }
# Line 3172  for (;;) Line 3180  for (;;)
3180              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;              if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3181              break;              break;
3182              case 0x000a:              case 0x000a:
3183                break;
3184    
3185              case 0x000b:              case 0x000b:
3186              case 0x000c:              case 0x000c:
3187              case 0x0085:              case 0x0085:
3188                if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
3189              break;              break;
3190              }              }
3191            }            }
# Line 3426  for (;;) Line 3437  for (;;)
3437                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3438                break;                break;
3439                case 0x000a:                case 0x000a:
3440                  break;
3441    
3442                case 0x000b:                case 0x000b:
3443                case 0x000c:                case 0x000c:
3444                case 0x0085:                case 0x0085:
3445                case 0x2028:                case 0x2028:
3446                case 0x2029:                case 0x2029:
3447                  if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
3448                break;                break;
3449                }                }
3450              break;              break;
# Line 3582  for (;;) Line 3596  for (;;)
3596                case 0x000d:                case 0x000d:
3597                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;                if (eptr < md->end_subject && *eptr == 0x0a) eptr++;
3598                break;                break;
3599    
3600                case 0x000a:                case 0x000a:
3601                  break;
3602    
3603                case 0x000b:                case 0x000b:
3604                case 0x000c:                case 0x000c:
3605                case 0x0085:                case 0x0085:
3606                  if (md->bsr_anycrlf) RRETURN(MATCH_NOMATCH);
3607                break;                break;
3608                }                }
3609              break;              break;
# Line 3883  for (;;) Line 3901  for (;;)
3901                }                }
3902              else              else
3903                {                {
3904                if (c != 0x000a && c != 0x000b && c != 0x000c &&                if (c != 0x000a &&
3905                    c != 0x0085 && c != 0x2028 && c != 0x2029)                    (md->bsr_anycrlf ||
3906                       (c != 0x000b && c != 0x000c &&
3907                        c != 0x0085 && c != 0x2028 && c != 0x2029)))
3908                  break;                  break;
3909                eptr += len;                eptr += len;
3910                }                }
# Line 4074  for (;;) Line 4094  for (;;)
4094                }                }
4095              else              else
4096                {                {
4097                if (c != 0x000a && c != 0x000b && c != 0x000c && c != 0x0085)                if (c != 0x000a &&
4098                      (md->bsr_anycrlf ||
4099                        (c != 0x000b && c != 0x000c && c != 0x0085)))
4100                  break;                  break;
4101                eptr++;                eptr++;
4102                }                }
# Line 4224  HEAP_RETURN: Line 4246  HEAP_RETURN:
4246  switch (frame->Xwhere)  switch (frame->Xwhere)
4247    {    {
4248    LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)    LBL( 1) LBL( 2) LBL( 3) LBL( 4) LBL( 5) LBL( 6) LBL( 7) LBL( 8)
4249    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(16)    LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(17)
4250    LBL(17) LBL(18) LBL(19) LBL(20) LBL(21) LBL(22) LBL(23) LBL(24)    LBL(19) LBL(24) LBL(25) LBL(26) LBL(27) LBL(29) LBL(31) LBL(33)
4251    LBL(25) LBL(26) LBL(27) LBL(28) LBL(29) LBL(30) LBL(31) LBL(32)    LBL(35) LBL(43) LBL(47) LBL(48) LBL(49) LBL(50) LBL(51) LBL(52)
4252    LBL(33) LBL(34) LBL(35) LBL(36) LBL(37) LBL(38) LBL(39) LBL(40)    LBL(53) LBL(54)
4253    LBL(41) LBL(42) LBL(43) LBL(44) LBL(45) LBL(46) LBL(47) LBL(48)  #ifdef SUPPORT_UTF8
4254    LBL(49) LBL(50) LBL(51) LBL(52) LBL(53) LBL(54)    LBL(16) LBL(18) LBL(20) LBL(21) LBL(22) LBL(23) LBL(28) LBL(30)
4255      LBL(32) LBL(34) LBL(42) LBL(46)
4256    #ifdef SUPPORT_UCP
4257      LBL(36) LBL(37) LBL(38) LBL(39) LBL(40) LBL(41) LBL(44) LBL(45)
4258    #endif  /* SUPPORT_UCP */
4259    #endif  /* SUPPORT_UTF8 */
4260    default:    default:
4261    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));    DPRINTF(("jump error in pcre match: label %d non-existent\n", frame->Xwhere));
4262    return PCRE_ERROR_INTERNAL;    return PCRE_ERROR_INTERNAL;
# Line 4408  if (re->magic_number != MAGIC_NUMBER) Line 4435  if (re->magic_number != MAGIC_NUMBER)
4435  /* Set up other data */  /* Set up other data */
4436    
4437  anchored = ((re->options | options) & PCRE_ANCHORED) != 0;  anchored = ((re->options | options) & PCRE_ANCHORED) != 0;
4438  startline = (re->options & PCRE_STARTLINE) != 0;  startline = (re->flags & PCRE_STARTLINE) != 0;
4439  firstline = (re->options & PCRE_FIRSTLINE) != 0;  firstline = (re->options & PCRE_FIRSTLINE) != 0;
4440    
4441  /* The code starts after the real_pcre block and the capture name table. */  /* The code starts after the real_pcre block and the capture name table. */
# Line 4435  md->recursive = NULL; Line 4462  md->recursive = NULL;
4462  md->lcc = tables + lcc_offset;  md->lcc = tables + lcc_offset;
4463  md->ctypes = tables + ctypes_offset;  md->ctypes = tables + ctypes_offset;
4464    
4465    /* Handle different \R options. */
4466    
4467    switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
4468      {
4469      case 0:
4470      if ((re->options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE)) != 0)
4471        md->bsr_anycrlf = (re->options & PCRE_BSR_ANYCRLF) != 0;
4472      else
4473    #ifdef BSR_ANYCRLF
4474      md->bsr_anycrlf = TRUE;
4475    #else
4476      md->bsr_anycrlf = FALSE;
4477    #endif
4478      break;
4479    
4480      case PCRE_BSR_ANYCRLF:
4481      md->bsr_anycrlf = TRUE;
4482      break;
4483    
4484      case PCRE_BSR_UNICODE:
4485      md->bsr_anycrlf = FALSE;
4486      break;
4487    
4488      default: return PCRE_ERROR_BADNEWLINE;
4489      }
4490    
4491  /* Handle different types of newline. The three bits give eight cases. If  /* Handle different types of newline. The three bits give eight cases. If
4492  nothing is set at run time, whatever was used at compile time applies. */  nothing is set at run time, whatever was used at compile time applies. */
4493    
4494  switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options : (pcre_uint32)options) &  switch ((((options & PCRE_NEWLINE_BITS) == 0)? re->options :
4495         PCRE_NEWLINE_BITS)          (pcre_uint32)options) & PCRE_NEWLINE_BITS)
4496    {    {
4497    case 0: newline = NEWLINE; break;   /* Compile-time default */    case 0: newline = NEWLINE; break;   /* Compile-time default */
4498    case PCRE_NEWLINE_CR: newline = '\r'; break;    case PCRE_NEWLINE_CR: newline = '\r'; break;
# Line 4478  else Line 4531  else
4531  /* Partial matching is supported only for a restricted set of regexes at the  /* Partial matching is supported only for a restricted set of regexes at the
4532  moment. */  moment. */
4533    
4534  if (md->partial && (re->options & PCRE_NOPARTIAL) != 0)  if (md->partial && (re->flags & PCRE_NOPARTIAL) != 0)
4535    return PCRE_ERROR_BADPARTIAL;    return PCRE_ERROR_BADPARTIAL;
4536    
4537  /* Check a UTF-8 string if required. Unfortunately there's no way of passing  /* Check a UTF-8 string if required. Unfortunately there's no way of passing
# Line 4555  studied, there may be a bitmap of possib Line 4608  studied, there may be a bitmap of possib
4608    
4609  if (!anchored)  if (!anchored)
4610    {    {
4611    if ((re->options & PCRE_FIRSTSET) != 0)    if ((re->flags & PCRE_FIRSTSET) != 0)
4612      {      {
4613      first_byte = re->first_byte & 255;      first_byte = re->first_byte & 255;
4614      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)      if ((first_byte_caseless = ((re->first_byte & REQ_CASELESS) != 0)) == TRUE)
# Line 4570  if (!anchored) Line 4623  if (!anchored)
4623  /* For anchored or unanchored matches, there may be a "last known required  /* For anchored or unanchored matches, there may be a "last known required
4624  character" set. */  character" set. */
4625    
4626  if ((re->options & PCRE_REQCHSET) != 0)  if ((re->flags & PCRE_REQCHSET) != 0)
4627    {    {
4628    req_byte = re->req_byte & 255;    req_byte = re->req_byte & 255;
4629    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;    req_byte_caseless = (re->req_byte & REQ_CASELESS) != 0;
# Line 4785  for(;;) Line 4838  for(;;)
4838    
4839    if (anchored || start_match > end_subject) break;    if (anchored || start_match > end_subject) break;
4840    
4841    /* If we have just passed a CR and we are now at a LF, and the pattern does    /* If we have just passed a CR and we are now at a LF, and the pattern does
4842    not contain any explicit matches for \r or \n, and the newline option is CRLF    not contain any explicit matches for \r or \n, and the newline option is CRLF
4843    or ANY or ANYCRLF, advance the match position by one more character. */    or ANY or ANYCRLF, advance the match position by one more character. */
4844    
4845    if (start_match[-1] == '\r' &&    if (start_match[-1] == '\r' &&
4846        start_match < end_subject &&        start_match < end_subject &&
4847        *start_match == '\n' &&        *start_match == '\n' &&
4848        (re->options & PCRE_HASCRORLF) == 0 &&        (re->flags & PCRE_HASCRORLF) == 0 &&
4849          (md->nltype == NLTYPE_ANY ||          (md->nltype == NLTYPE_ANY ||
4850           md->nltype == NLTYPE_ANYCRLF ||           md->nltype == NLTYPE_ANYCRLF ||
4851           md->nllen == 2))           md->nllen == 2))
Legend:
Removed from v.226  
changed lines
  Added in v.244
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12