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

Diff of /code/trunk/pcre_study.c

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

revision 470 by ph10, Mon Oct 19 14:38:48 2009 UTC revision 471 by ph10, Fri Dec 11 15:11:55 2009 UTC
# Line 96  for (;;) Line 96  for (;;)
96    
97    switch (op)    switch (op)
98      {      {
99        case OP_COND:
100        case OP_SCOND:
101    
102        /* If there is only one branch in a condition, the implied branch has zero
103        length, so we don't add anything. This covers the DEFINE "condition"
104        automatically. */
105    
106        cs = cc + GET(cc, 1);
107        if (*cs != OP_ALT)
108          {
109          cc = cs + 1 + LINK_SIZE;
110          break;
111          }
112    
113        /* Otherwise we can fall through and treat it the same as any other
114        subpattern. */
115    
116      case OP_CBRA:      case OP_CBRA:
117      case OP_SCBRA:      case OP_SCBRA:
118      case OP_BRA:      case OP_BRA:
119      case OP_SBRA:      case OP_SBRA:
120      case OP_ONCE:      case OP_ONCE:
     case OP_COND:  
     case OP_SCOND:  
121      d = find_minlength(cc, startcode, options);      d = find_minlength(cc, startcode, options);
122      if (d < 0) return d;      if (d < 0) return d;
123      branchlength += d;      branchlength += d;
Legend:
Removed from v.470  
changed lines
  Added in v.471
  ViewVC Help
Powered by ViewVC 1.1.5