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

Diff of /code/trunk/pcre_compile.c

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

revision 1370 by ph10, Wed Oct 9 10:18:26 2013 UTC revision 1372 by ph10, Fri Oct 11 17:05:19 2013 UTC
# Line 4254  for (;; ptr++) Line 4254  for (;; ptr++)
4254        }        }
4255      }      }
4256    
   /* Fill in length of a previous callout, except when the next thing is  
   a quantifier. */  
   
4257    is_quantifier =    is_quantifier =
4258      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||      c == CHAR_ASTERISK || c == CHAR_PLUS || c == CHAR_QUESTION_MARK ||
4259      (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));      (c == CHAR_LEFT_CURLY_BRACKET && is_counted_repeat(ptr+1));
4260    
4261    if (!is_quantifier && previous_callout != NULL &&    /* Fill in length of a previous callout, except when the next thing is a
4262      quantifier or when processing a property substitution string in UCP mode. */
4263    
4264      if (!is_quantifier && previous_callout != NULL && nestptr == NULL &&
4265         after_manual_callout-- <= 0)         after_manual_callout-- <= 0)
4266      {      {
4267      if (lengthptr == NULL)      /* Don't attempt in pre-compile phase */      if (lengthptr == NULL)      /* Don't attempt in pre-compile phase */
# Line 4292  for (;; ptr++) Line 4292  for (;; ptr++)
4292        }        }
4293      }      }
4294    
4295    /* No auto callout for quantifiers. */    /* No auto callout for quantifiers, or while processing property strings that
4296      are substituted for \w etc in UCP mode. */
4297    
4298    if ((options & PCRE_AUTO_CALLOUT) != 0 && !is_quantifier)    if ((options & PCRE_AUTO_CALLOUT) != 0 && !is_quantifier && nestptr == NULL)
4299      {      {
4300      previous_callout = code;      previous_callout = code;
4301      code = auto_callout(code, ptr, cd);      code = auto_callout(code, ptr, cd);

Legend:
Removed from v.1370  
changed lines
  Added in v.1372

  ViewVC Help
Powered by ViewVC 1.1.5