/[pcre]/code/branches/pcre16/pcre_study.c
ViewVC logotype

Diff of /code/branches/pcre16/pcre_study.c

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

revision 794 by zherczeg, Mon Dec 5 20:12:24 2011 UTC revision 795 by zherczeg, Sat Dec 10 02:20:06 2011 UTC
# Line 323  for (;;) Line 323  for (;;)
323    
324      /* Check a class for variable quantification */      /* Check a class for variable quantification */
325    
326  #if defined SUPPORT_UTF8 || !defined COMPILE_PCRE8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
327      case OP_XCLASS:      case OP_XCLASS:
328      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];      cc += GET(cc, 1) - PRIV(OP_lengths)[OP_CLASS];
329      /* Fall through */      /* Fall through */
# Line 824  do Line 824  do
824        case OP_SOM:        case OP_SOM:
825        case OP_THEN:        case OP_THEN:
826        case OP_THEN_ARG:        case OP_THEN_ARG:
827  #if defined SUPPORT_UTF8 || !defined COMPILE_PCRE8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
828        case OP_XCLASS:        case OP_XCLASS:
829  #endif  #endif
830        return SSB_FAIL;        return SSB_FAIL;
# Line 1325  if (re == NULL || re->magic_number != MA Line 1325  if (re == NULL || re->magic_number != MA
1325    return NULL;    return NULL;
1326    }    }
1327    
1328    if ((re->flags & PCRE_MODE) == 0)
1329      {
1330    #ifdef COMPILE_PCRE8
1331      *errorptr = "argument is compiled in 16 bit mode";
1332    #else
1333      *errorptr = "argument is compiled in 8 bit mode";
1334    #endif
1335      return NULL;
1336      }
1337    
1338  if ((options & ~PUBLIC_STUDY_OPTIONS) != 0)  if ((options & ~PUBLIC_STUDY_OPTIONS) != 0)
1339    {    {
1340    *errorptr = "unknown or incorrect option bit(s) set";    *errorptr = "unknown or incorrect option bit(s) set";
# Line 1346  if ((re->options & PCRE_ANCHORED) == 0 & Line 1356  if ((re->options & PCRE_ANCHORED) == 0 &
1356    /* Set the character tables in the block that is passed around */    /* Set the character tables in the block that is passed around */
1357    
1358    tables = re->tables;    tables = re->tables;
1359    
1360    #ifdef COMPILE_PCRE8
1361    if (tables == NULL)    if (tables == NULL)
1362      (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,      (void)pcre_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
1363      (void *)(&tables));      (void *)(&tables));
1364    #else
1365      if (tables == NULL)
1366        (void)pcre16_fullinfo(external_re, NULL, PCRE_INFO_DEFAULT_TABLES,
1367        (void *)(&tables));
1368    #endif
1369    
1370    compile_block.lcc = tables + lcc_offset;    compile_block.lcc = tables + lcc_offset;
1371    compile_block.fcc = tables + fcc_offset;    compile_block.fcc = tables + fcc_offset;
Legend:
Removed from v.794  
changed lines
  Added in v.795
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12