/[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 220 by ph10, Thu Aug 16 13:29:39 2007 UTC revision 223 by ph10, Mon Aug 20 11:07:53 2007 UTC
# Line 1317  for (;;) Line 1317  for (;;)
1317        case OP_TYPEMINPLUS:        case OP_TYPEMINPLUS:
1318        case OP_TYPEQUERY:        case OP_TYPEQUERY:
1319        case OP_TYPEMINQUERY:        case OP_TYPEMINQUERY:
       case OP_TYPEUPTO:  
       case OP_TYPEMINUPTO:  
       case OP_TYPEEXACT:  
1320        case OP_TYPEPOSSTAR:        case OP_TYPEPOSSTAR:
1321        case OP_TYPEPOSPLUS:        case OP_TYPEPOSPLUS:
1322        case OP_TYPEPOSQUERY:        case OP_TYPEPOSQUERY:
       case OP_TYPEPOSUPTO:  
1323        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1324        break;        break;
1325    
1326          case OP_TYPEUPTO:
1327          case OP_TYPEMINUPTO:
1328          case OP_TYPEEXACT:
1329          case OP_TYPEPOSUPTO:
1330          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1331          break;
1332        }        }
1333    
1334      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 1407  for (;;) Line 1410  for (;;)
1410        case OP_TYPEMINPLUS:        case OP_TYPEMINPLUS:
1411        case OP_TYPEQUERY:        case OP_TYPEQUERY:
1412        case OP_TYPEMINQUERY:        case OP_TYPEMINQUERY:
       case OP_TYPEUPTO:  
       case OP_TYPEMINUPTO:  
       case OP_TYPEEXACT:  
1413        case OP_TYPEPOSSTAR:        case OP_TYPEPOSSTAR:
1414        case OP_TYPEPOSPLUS:        case OP_TYPEPOSPLUS:
1415        case OP_TYPEPOSQUERY:        case OP_TYPEPOSQUERY:
       case OP_TYPEPOSUPTO:  
1416        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;        if (code[1] == OP_PROP || code[1] == OP_NOTPROP) code += 2;
1417        break;        break;
1418    
1419          case OP_TYPEPOSUPTO:
1420          case OP_TYPEUPTO:
1421          case OP_TYPEMINUPTO:
1422          case OP_TYPEEXACT:
1423          if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1424          break;
1425        }        }
1426    
1427      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 3170  for (;; ptr++) Line 3176  for (;; ptr++)
3176        }        }
3177    
3178      /* If class_charcount is 1, we saw precisely one character whose value is      /* If class_charcount is 1, we saw precisely one character whose value is
3179      less than 256. In non-UTF-8 mode we can always optimize. In UTF-8 mode, we      less than 256. As long as there were no characters >= 128 and there was no
3180      can optimize the negative case only if there were no characters >= 128      use of \p or \P, in other words, no use of any XCLASS features, we can
3181      because OP_NOT and the related opcodes like OP_NOTSTAR operate on      optimize.
3182      single-bytes only. This is an historical hangover. Maybe one day we can  
3183      tidy these opcodes to handle multi-byte characters.      In UTF-8 mode, we can optimize the negative case only if there were no
3184        characters >= 128 because OP_NOT and the related opcodes like OP_NOTSTAR
3185        operate on single-bytes only. This is an historical hangover. Maybe one day
3186        we can tidy these opcodes to handle multi-byte characters.
3187    
3188      The optimization throws away the bit map. We turn the item into a      The optimization throws away the bit map. We turn the item into a
3189      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note      1-character OP_CHAR[NC] if it's positive, or OP_NOT if it's negative. Note
# Line 3184  for (;; ptr++) Line 3193  for (;; ptr++)
3193      reqbyte, save the previous value for reinstating. */      reqbyte, save the previous value for reinstating. */
3194    
3195  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3196      if (class_charcount == 1 &&      if (class_charcount == 1 && !class_utf8 &&
3197            (!utf8 ||        (!utf8 || !negate_class || class_lastchar < 128))
           (!class_utf8 && (!negate_class || class_lastchar < 128))))  
   
3198  #else  #else
3199      if (class_charcount == 1)      if (class_charcount == 1)
3200  #endif  #endif

Legend:
Removed from v.220  
changed lines
  Added in v.223

  ViewVC Help
Powered by ViewVC 1.1.5