/[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 1376 by ph10, Sat Oct 12 18:02:11 2013 UTC revision 1397 by ph10, Mon Nov 11 18:33:23 2013 UTC
# Line 107  because the offset vector is always a mu Line 107  because the offset vector is always a mu
107    
108  /* Min and max values for the common repeats; for the maxima, 0 => infinity */  /* Min and max values for the common repeats; for the maxima, 0 => infinity */
109    
110  static const char rep_min[] = { 0, 0, 1, 1, 0, 0 };  static const char rep_min[] = { 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, };
111  static const char rep_max[] = { 0, 0, 0, 0, 1, 1 };  static const char rep_max[] = { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, };
112    
113  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
114  /*************************************************  /*************************************************
# Line 1173  for (;;) Line 1173  for (;;)
1173            ecode = md->start_code + code_offset;            ecode = md->start_code + code_offset;
1174            save_capture_last = md->capture_last;            save_capture_last = md->capture_last;
1175            matched_once = TRUE;            matched_once = TRUE;
1176              mstart = md->start_match_ptr;    /* In case \K changed it */
1177            continue;            continue;
1178            }            }
1179    
# Line 1245  for (;;) Line 1246  for (;;)
1246          eptr = md->end_match_ptr;          eptr = md->end_match_ptr;
1247          ecode = md->start_code + code_offset;          ecode = md->start_code + code_offset;
1248          matched_once = TRUE;          matched_once = TRUE;
1249            mstart = md->start_match_ptr;   /* In case \K reset it */
1250          continue;          continue;
1251          }          }
1252    
# Line 2007  for (;;) Line 2009  for (;;)
2009    
2010      if (*ecode == OP_KETRPOS)      if (*ecode == OP_KETRPOS)
2011        {        {
2012          md->start_match_ptr = mstart;    /* In case \K reset it */
2013        md->end_match_ptr = eptr;        md->end_match_ptr = eptr;
2014        md->end_offset_top = offset_top;        md->end_offset_top = offset_top;
2015        RRETURN(MATCH_KETRPOS);        RRETURN(MATCH_KETRPOS);
# Line 2864  for (;;) Line 2867  for (;;)
2867          case OP_CRMINPLUS:          case OP_CRMINPLUS:
2868          case OP_CRQUERY:          case OP_CRQUERY:
2869          case OP_CRMINQUERY:          case OP_CRMINQUERY:
2870            case OP_CRPOSSTAR:
2871            case OP_CRPOSPLUS:
2872            case OP_CRPOSQUERY:
2873          c = *ecode++ - OP_CRSTAR;          c = *ecode++ - OP_CRSTAR;
2874          minimize = (c & 1) != 0;          if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
2875            else possessive = TRUE;
2876          min = rep_min[c];                 /* Pick up values from tables; */          min = rep_min[c];                 /* Pick up values from tables; */
2877          max = rep_max[c];                 /* zero for max => infinity */          max = rep_max[c];                 /* zero for max => infinity */
2878          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
# Line 2873  for (;;) Line 2880  for (;;)
2880    
2881          case OP_CRRANGE:          case OP_CRRANGE:
2882          case OP_CRMINRANGE:          case OP_CRMINRANGE:
2883            case OP_CRPOSRANGE:
2884          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
2885            possessive = (*ecode == OP_CRPOSRANGE);
2886          min = GET2(ecode, 1);          min = GET2(ecode, 1);
2887          max = GET2(ecode, 1 + IMM2_SIZE);          max = GET2(ecode, 1 + IMM2_SIZE);
2888          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
# Line 3015  for (;;) Line 3024  for (;;)
3024                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3025              eptr += len;              eptr += len;
3026              }              }
3027    
3028              if (possessive) continue;    /* No backtracking */
3029    
3030            for (;;)            for (;;)
3031              {              {
3032              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
# Line 3045  for (;;) Line 3057  for (;;)
3057                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;                if ((BYTE_MAP[c/8] & (1 << (c&7))) == 0) break;
3058              eptr++;              eptr++;
3059              }              }
3060    
3061              if (possessive) continue;    /* No backtracking */
3062    
3063            while (eptr >= pp)            while (eptr >= pp)
3064              {              {
3065              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);              RMATCH(eptr, ecode, offset_top, md, eptrb, RM19);
# Line 3078  for (;;) Line 3093  for (;;)
3093          case OP_CRMINPLUS:          case OP_CRMINPLUS:
3094          case OP_CRQUERY:          case OP_CRQUERY:
3095          case OP_CRMINQUERY:          case OP_CRMINQUERY:
3096            case OP_CRPOSSTAR:
3097            case OP_CRPOSPLUS:
3098            case OP_CRPOSQUERY:
3099          c = *ecode++ - OP_CRSTAR;          c = *ecode++ - OP_CRSTAR;
3100          minimize = (c & 1) != 0;          if (c < OP_CRPOSSTAR - OP_CRSTAR) minimize = (c & 1) != 0;
3101            else possessive = TRUE;
3102          min = rep_min[c];                 /* Pick up values from tables; */          min = rep_min[c];                 /* Pick up values from tables; */
3103          max = rep_max[c];                 /* zero for max => infinity */          max = rep_max[c];                 /* zero for max => infinity */
3104          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
# Line 3087  for (;;) Line 3106  for (;;)
3106    
3107          case OP_CRRANGE:          case OP_CRRANGE:
3108          case OP_CRMINRANGE:          case OP_CRMINRANGE:
3109            case OP_CRPOSRANGE:
3110          minimize = (*ecode == OP_CRMINRANGE);          minimize = (*ecode == OP_CRMINRANGE);
3111            possessive = (*ecode == OP_CRPOSRANGE);
3112          min = GET2(ecode, 1);          min = GET2(ecode, 1);
3113          max = GET2(ecode, 1 + IMM2_SIZE);          max = GET2(ecode, 1 + IMM2_SIZE);
3114          if (max == 0) max = INT_MAX;          if (max == 0) max = INT_MAX;
# Line 3159  for (;;) Line 3180  for (;;)
3180            if (!PRIV(xclass)(c, data, utf)) break;            if (!PRIV(xclass)(c, data, utf)) break;
3181            eptr += len;            eptr += len;
3182            }            }
3183    
3184            if (possessive) continue;    /* No backtracking */
3185    
3186          for(;;)          for(;;)
3187            {            {
3188            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);

Legend:
Removed from v.1376  
changed lines
  Added in v.1397

  ViewVC Help
Powered by ViewVC 1.1.5