/[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 1364 by ph10, Sat Oct 5 15:45:11 2013 UTC revision 1376 by ph10, Sat Oct 12 18:02:11 2013 UTC
# Line 1274  for (;;) Line 1274  for (;;)
1274    
1275      /* Control never reaches here. */      /* Control never reaches here. */
1276    
1277      /* Conditional group: compilation checked that there are no more than      /* Conditional group: compilation checked that there are no more than two
1278      two branches. If the condition is false, skipping the first branch takes us      branches. If the condition is false, skipping the first branch takes us
1279      past the end if there is only one branch, but that's OK because that is      past the end of the item if there is only one branch, but that's exactly
1280      exactly what going to the ket would do. */      what we want. */
1281    
1282      case OP_COND:      case OP_COND:
1283      case OP_SCOND:      case OP_SCOND:
1284      codelink = GET(ecode, 1);  
1285        /* The variable codelink will be added to ecode when the condition is
1286        false, to get to the second branch. Setting it to the offset to the ALT
1287        or KET, then incrementing ecode achieves this effect. We now have ecode
1288        pointing to the condition or callout. */
1289    
1290        codelink = GET(ecode, 1);   /* Offset to the second branch */
1291        ecode += 1 + LINK_SIZE;     /* From this opcode */
1292    
1293      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
1294      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
1295    
1296      if (ecode[LINK_SIZE+1] == OP_CALLOUT)      if (*ecode == OP_CALLOUT)
1297        {        {
1298        if (PUBL(callout) != NULL)        if (PUBL(callout) != NULL)
1299          {          {
1300          PUBL(callout_block) cb;          PUBL(callout_block) cb;
1301          cb.version          = 2;   /* Version 1 of the callout block */          cb.version          = 2;   /* Version 1 of the callout block */
1302          cb.callout_number   = ecode[LINK_SIZE+2];          cb.callout_number   = ecode[1];
1303          cb.offset_vector    = md->offset_vector;          cb.offset_vector    = md->offset_vector;
1304  #if defined COMPILE_PCRE8  #if defined COMPILE_PCRE8
1305          cb.subject          = (PCRE_SPTR)md->start_subject;          cb.subject          = (PCRE_SPTR)md->start_subject;
# Line 1304  for (;;) Line 1311  for (;;)
1311          cb.subject_length   = (int)(md->end_subject - md->start_subject);          cb.subject_length   = (int)(md->end_subject - md->start_subject);
1312          cb.start_match      = (int)(mstart - md->start_subject);          cb.start_match      = (int)(mstart - md->start_subject);
1313          cb.current_position = (int)(eptr - md->start_subject);          cb.current_position = (int)(eptr - md->start_subject);
1314          cb.pattern_position = GET(ecode, LINK_SIZE + 3);          cb.pattern_position = GET(ecode, 2);
1315          cb.next_item_length = GET(ecode, 3 + 2*LINK_SIZE);          cb.next_item_length = GET(ecode, 2 + LINK_SIZE);
1316          cb.capture_top      = offset_top/2;          cb.capture_top      = offset_top/2;
1317          cb.capture_last     = md->capture_last & CAPLMASK;          cb.capture_last     = md->capture_last & CAPLMASK;
1318          /* Internal change requires this for API compatibility. */          /* Internal change requires this for API compatibility. */
# Line 1315  for (;;) Line 1322  for (;;)
1322          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);          if ((rrc = (*PUBL(callout))(&cb)) > 0) RRETURN(MATCH_NOMATCH);
1323          if (rrc < 0) RRETURN(rrc);          if (rrc < 0) RRETURN(rrc);
1324          }          }
1325    
1326          /* Advance ecode past the callout, so it now points to the condition. We
1327          must adjust codelink so that the value of ecode+codelink is unchanged. */
1328    
1329        ecode += PRIV(OP_lengths)[OP_CALLOUT];        ecode += PRIV(OP_lengths)[OP_CALLOUT];
1330        codelink -= PRIV(OP_lengths)[OP_CALLOUT];        codelink -= PRIV(OP_lengths)[OP_CALLOUT];
1331        }        }
1332    
1333      condcode = ecode[LINK_SIZE+1];      /* Test the various possible conditions */
1334    
1335      /* Now see what the actual condition is */      condition = FALSE;
1336        switch(condcode = *ecode)
     if (condcode == OP_RREF || condcode == OP_NRREF)    /* Recursion test */  
1337        {        {
1338        if (md->recursive == NULL)                /* Not recursing => FALSE */        case OP_RREF:         /* Numbered group recursion test */
1339          if (md->recursive != NULL)     /* Not recursing => FALSE */
1340          {          {
1341          condition = FALSE;          unsigned int recno = GET2(ecode, 1);   /* Recursion group number*/
         ecode += GET(ecode, 1);  
         }  
       else  
         {  
         unsigned int recno = GET2(ecode, LINK_SIZE + 2);   /* Recursion group number*/  
1342          condition = (recno == RREF_ANY || recno == md->recursive->group_num);          condition = (recno == RREF_ANY || recno == md->recursive->group_num);
1343            }
1344          break;
1345    
1346          /* If the test is for recursion into a specific subpattern, and it is        case OP_DNRREF:       /* Duplicate named group recursion test */
1347          false, but the test was set up by name, scan the table to see if the        if (md->recursive != NULL)
1348          name refers to any other numbers, and test them. The condition is true          {
1349          if any one is set. */          int count = GET2(ecode, 1 + IMM2_SIZE);
1350            pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
1351          if (!condition && condcode == OP_NRREF)          while (count-- > 0)
1352            {            {
1353            pcre_uchar *slotA = md->name_table;            unsigned int recno = GET2(slot, 0);
1354            for (i = 0; i < md->name_count; i++)            condition = recno == md->recursive->group_num;
1355              {            if (condition) break;
1356              if (GET2(slotA, 0) == recno) break;            slot += md->name_entry_size;
             slotA += md->name_entry_size;  
             }  
   
           /* Found a name for the number - there can be only one; duplicate  
           names for different numbers are allowed, but not vice versa. First  
           scan down for duplicates. */  
   
           if (i < md->name_count)  
             {  
             pcre_uchar *slotB = slotA;  
             while (slotB > md->name_table)  
               {  
               slotB -= md->name_entry_size;  
               if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)  
                 {  
                 condition = GET2(slotB, 0) == md->recursive->group_num;  
                 if (condition) break;  
                 }  
               else break;  
               }  
   
             /* Scan up for duplicates */  
   
             if (!condition)  
               {  
               slotB = slotA;  
               for (i++; i < md->name_count; i++)  
                 {  
                 slotB += md->name_entry_size;  
                 if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)  
                   {  
                   condition = GET2(slotB, 0) == md->recursive->group_num;  
                   if (condition) break;  
                   }  
                 else break;  
                 }  
               }  
             }  
1357            }            }
   
         /* Chose branch according to the condition */  
   
         ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);  
1358          }          }
1359        }        break;
1360    
1361      else if (condcode == OP_CREF || condcode == OP_NCREF)  /* Group used test */        case OP_CREF:         /* Numbered group used test */
1362        {        offset = GET2(ecode, 1) << 1;  /* Doubled ref number */
       offset = GET2(ecode, LINK_SIZE+2) << 1;  /* Doubled ref number */  
1363        condition = offset < offset_top && md->offset_vector[offset] >= 0;        condition = offset < offset_top && md->offset_vector[offset] >= 0;
1364          break;
1365    
1366        /* If the numbered capture is unset, but the reference was by name,        case OP_DNCREF:      /* Duplicate named group used test */
       scan the table to see if the name refers to any other numbers, and test  
       them. The condition is true if any one is set. This is tediously similar  
       to the code above, but not close enough to try to amalgamate. */  
   
       if (!condition && condcode == OP_NCREF)  
1367          {          {
1368          unsigned int refno = offset >> 1;          int count = GET2(ecode, 1 + IMM2_SIZE);
1369          pcre_uchar *slotA = md->name_table;          pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
1370            while (count-- > 0)
1371          for (i = 0; i < md->name_count; i++)            {
1372            {            offset = GET2(slot, 0) << 1;
1373            if (GET2(slotA, 0) == refno) break;            condition = offset < offset_top && md->offset_vector[offset] >= 0;
1374            slotA += md->name_entry_size;            if (condition) break;
1375            }            slot += md->name_entry_size;
   
         /* Found a name for the number - there can be only one; duplicate names  
         for different numbers are allowed, but not vice versa. First scan down  
         for duplicates. */  
   
         if (i < md->name_count)  
           {  
           pcre_uchar *slotB = slotA;  
           while (slotB > md->name_table)  
             {  
             slotB -= md->name_entry_size;  
             if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)  
               {  
               offset = GET2(slotB, 0) << 1;  
               condition = offset < offset_top &&  
                 md->offset_vector[offset] >= 0;  
               if (condition) break;  
               }  
             else break;  
             }  
   
           /* Scan up for duplicates */  
   
           if (!condition)  
             {  
             slotB = slotA;  
             for (i++; i < md->name_count; i++)  
               {  
               slotB += md->name_entry_size;  
               if (STRCMP_UC_UC(slotA + IMM2_SIZE, slotB + IMM2_SIZE) == 0)  
                 {  
                 offset = GET2(slotB, 0) << 1;  
                 condition = offset < offset_top &&  
                   md->offset_vector[offset] >= 0;  
                 if (condition) break;  
                 }  
               else break;  
               }  
             }  
1376            }            }
1377          }          }
1378          break;
1379    
1380        /* Chose branch according to the condition */        case OP_DEF:     /* DEFINE - always false */
1381          break;
       ecode += condition? 1 + IMM2_SIZE : GET(ecode, 1);  
       }  
   
     else if (condcode == OP_DEF)     /* DEFINE - always false */  
       {  
       condition = FALSE;  
       ecode += GET(ecode, 1);  
       }  
1382    
1383      /* The condition is an assertion. Call match() to evaluate it - setting        /* The condition is an assertion. Call match() to evaluate it - setting
1384      md->match_function_type to MATCH_CONDASSERT causes it to stop at the end of        md->match_function_type to MATCH_CONDASSERT causes it to stop at the end
1385      an assertion. */        of an assertion. */
1386    
1387      else        default:
       {  
1388        md->match_function_type = MATCH_CONDASSERT;        md->match_function_type = MATCH_CONDASSERT;
1389        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, NULL, RM3);        RMATCH(eptr, ecode, offset_top, md, NULL, RM3);
1390        if (rrc == MATCH_MATCH)        if (rrc == MATCH_MATCH)
1391          {          {
1392          if (md->end_offset_top > offset_top)          if (md->end_offset_top > offset_top)
1393            offset_top = md->end_offset_top;  /* Captures may have happened */            offset_top = md->end_offset_top;  /* Captures may have happened */
1394          condition = TRUE;          condition = TRUE;
1395          ecode += 1 + LINK_SIZE + GET(ecode, LINK_SIZE + 2);  
1396            /* Advance ecode past the assertion to the start of the first branch,
1397            but adjust it so that the general choosing code below works. */
1398    
1399            ecode += GET(ecode, 1);
1400          while (*ecode == OP_ALT) ecode += GET(ecode, 1);          while (*ecode == OP_ALT) ecode += GET(ecode, 1);
1401            ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];
1402          }          }
1403    
1404        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an        /* PCRE doesn't allow the effect of (*THEN) to escape beyond an
1405        assertion; it is therefore treated as NOMATCH. */        assertion; it is therefore treated as NOMATCH. Any other return is an
1406          error. */
1407    
1408        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)        else if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
1409          {          {
1410          RRETURN(rrc);         /* Need braces because of following else */          RRETURN(rrc);         /* Need braces because of following else */
1411          }          }
1412        else        break;
         {  
         condition = FALSE;  
         ecode += codelink;  
         }  
1413        }        }
1414    
1415      /* We are now at the branch that is to be obeyed. As there is only one, can      /* Choose branch according to the condition */
1416      use tail recursion to avoid using another stack frame, except when there is  
1417      unlimited repeat of a possibly empty group. In the latter case, a recursive      ecode += condition? PRIV(OP_lengths)[condcode] : codelink;
1418      call to match() is always required, unless the second alternative doesn't  
1419      exist, in which case we can just plough on. Note that, for compatibility      /* We are now at the branch that is to be obeyed. As there is only one, we
1420      with Perl, the | in a conditional group is NOT treated as creating two      can use tail recursion to avoid using another stack frame, except when
1421      alternatives. If a THEN is encountered in the branch, it propagates out to      there is unlimited repeat of a possibly empty group. In the latter case, a
1422      the enclosing alternative (unless nested in a deeper set of alternatives,      recursive call to match() is always required, unless the second alternative
1423      of course). */      doesn't exist, in which case we can just plough on. Note that, for
1424        compatibility with Perl, the | in a conditional group is NOT treated as
1425        creating two alternatives. If a THEN is encountered in the branch, it
1426        propagates out to the enclosing alternative (unless nested in a deeper set
1427        of alternatives, of course). */
1428    
1429      if (condition || *ecode == OP_ALT)      if (condition || ecode[-(1+LINK_SIZE)] == OP_ALT)
1430        {        {
1431        if (op != OP_SCOND)        if (op != OP_SCOND)
1432          {          {
         ecode += 1 + LINK_SIZE;  
1433          goto TAIL_RECURSE;          goto TAIL_RECURSE;
1434          }          }
1435    
1436        md->match_function_type = MATCH_CBEGROUP;        md->match_function_type = MATCH_CBEGROUP;
1437        RMATCH(eptr, ecode + 1 + LINK_SIZE, offset_top, md, eptrb, RM49);        RMATCH(eptr, ecode, offset_top, md, eptrb, RM49);
1438        RRETURN(rrc);        RRETURN(rrc);
1439        }        }
1440    
# Line 1523  for (;;) Line 1442  for (;;)
1442    
1443      else      else
1444        {        {
       ecode += 1 + LINK_SIZE;  
1445        }        }
1446      break;      break;
1447    
# Line 2659  for (;;) Line 2577  for (;;)
2577          /* Perl space used to exclude VT, but from Perl 5.18 it is included,          /* Perl space used to exclude VT, but from Perl 5.18 it is included,
2578          which means that Perl space and POSIX space are now identical. PCRE          which means that Perl space and POSIX space are now identical. PCRE
2579          was changed at release 8.34. */          was changed at release 8.34. */
2580    
2581          case PT_SPACE:    /* Perl space */          case PT_SPACE:    /* Perl space */
2582          case PT_PXSPACE:  /* POSIX space */          case PT_PXSPACE:  /* POSIX space */
2583          if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z ||          switch(c)
2584               c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||            {
2585               c == CHAR_FF || c == CHAR_CR)            HSPACE_CASES:
2586                 == (op == OP_NOTPROP))            VSPACE_CASES:
2587            RRETURN(MATCH_NOMATCH);            if (op == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
2588              break;
2589    
2590              default:
2591              if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) ==
2592                (op == OP_NOTPROP)) RRETURN(MATCH_NOMATCH);
2593              break;
2594              }
2595          break;          break;
2596    
2597          case PT_WORD:          case PT_WORD:
# Line 2751  for (;;) Line 2676  for (;;)
2676    
2677      Otherwise, set the length to the length of what was matched by the      Otherwise, set the length to the length of what was matched by the
2678      referenced subpattern.      referenced subpattern.
2679    
2680      The OP_REF and OP_REFI opcodes are used for a reference to a numbered group      The OP_REF and OP_REFI opcodes are used for a reference to a numbered group
2681      or to a non-duplicated named group. For a duplicated named group, OP_DNREF      or to a non-duplicated named group. For a duplicated named group, OP_DNREF
2682      and OP_DNREFI are used. In this case we must scan the list of groups to      and OP_DNREFI are used. In this case we must scan the list of groups to
2683      which the name refers, and use the first one that is set. */      which the name refers, and use the first one that is set. */
2684    
2685      case OP_DNREF:      case OP_DNREF:
2686      case OP_DNREFI:      case OP_DNREFI:
2687      caseless = op == OP_DNREFI;      caseless = op == OP_DNREFI;
2688        {        {
2689        int count = GET2(ecode, 1+IMM2_SIZE);        int count = GET2(ecode, 1+IMM2_SIZE);
2690        pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;        pcre_uchar *slot = md->name_table + GET2(ecode, 1) * md->name_entry_size;
2691        ecode += 1 + 2*IMM2_SIZE;        ecode += 1 + 2*IMM2_SIZE;
2692    
2693        while (count-- > 0)        while (count-- > 0)
2694          {          {
2695          offset = GET2(slot, 0) << 1;          offset = GET2(slot, 0) << 1;
2696          if (offset < offset_top && md->offset_vector[offset] >= 0) break;          if (offset < offset_top && md->offset_vector[offset] >= 0) break;
2697          slot += md->name_entry_size;          slot += md->name_entry_size;
2698          }          }
2699        if (count < 0)        if (count < 0)
2700          length = (md->jscript_compat)? 0 : -1;          length = (md->jscript_compat)? 0 : -1;
2701        else        else
2702          length = md->offset_vector[offset+1] - md->offset_vector[offset];          length = md->offset_vector[offset+1] - md->offset_vector[offset];
# Line 2783  for (;;) Line 2708  for (;;)
2708      caseless = op == OP_REFI;      caseless = op == OP_REFI;
2709      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */      offset = GET2(ecode, 1) << 1;               /* Doubled ref number */
2710      ecode += 1 + IMM2_SIZE;      ecode += 1 + IMM2_SIZE;
   
   
2711      if (offset >= offset_top || md->offset_vector[offset] < 0)      if (offset >= offset_top || md->offset_vector[offset] < 0)
2712        length = (md->jscript_compat)? 0 : -1;        length = (md->jscript_compat)? 0 : -1;
2713      else      else
# Line 4284  for (;;) Line 4207  for (;;)
4207            /* Perl space used to exclude VT, but from Perl 5.18 it is included,            /* Perl space used to exclude VT, but from Perl 5.18 it is included,
4208            which means that Perl space and POSIX space are now identical. PCRE            which means that Perl space and POSIX space are now identical. PCRE
4209            was changed at release 8.34. */            was changed at release 8.34. */
4210    
4211            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
4212            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
4213            for (i = 1; i <= min; i++)            for (i = 1; i <= min; i++)
# Line 4295  for (;;) Line 4218  for (;;)
4218                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4219                }                }
4220              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4221              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              switch(c)
4222                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                {
4223                     == prop_fail_result)                HSPACE_CASES:
4224                RRETURN(MATCH_NOMATCH);                VSPACE_CASES:
4225                  if (prop_fail_result) RRETURN(MATCH_NOMATCH);
4226                  break;
4227    
4228                  default:
4229                  if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
4230                    RRETURN(MATCH_NOMATCH);
4231                  break;
4232                  }
4233              }              }
4234            break;            break;
4235    
# Line 5021  for (;;) Line 4952  for (;;)
4952            /* Perl space used to exclude VT, but from Perl 5.18 it is included,            /* Perl space used to exclude VT, but from Perl 5.18 it is included,
4953            which means that Perl space and POSIX space are now identical. PCRE            which means that Perl space and POSIX space are now identical. PCRE
4954            was changed at release 8.34. */            was changed at release 8.34. */
4955    
4956            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
4957            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
4958            for (fi = min;; fi++)            for (fi = min;; fi++)
# Line 5035  for (;;) Line 4966  for (;;)
4966                RRETURN(MATCH_NOMATCH);                RRETURN(MATCH_NOMATCH);
4967                }                }
4968              GETCHARINCTEST(c, eptr);              GETCHARINCTEST(c, eptr);
4969              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              switch(c)
4970                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                {
4971                     == prop_fail_result)                HSPACE_CASES:
4972                RRETURN(MATCH_NOMATCH);                VSPACE_CASES:
4973                  if (prop_fail_result) RRETURN(MATCH_NOMATCH);
4974                  break;
4975    
4976                  default:
4977                  if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
4978                    RRETURN(MATCH_NOMATCH);
4979                  break;
4980                  }
4981              }              }
4982            /* Control never gets here */            /* Control never gets here */
4983    
# Line 5525  for (;;) Line 5464  for (;;)
5464            /* Perl space used to exclude VT, but from Perl 5.18 it is included,            /* Perl space used to exclude VT, but from Perl 5.18 it is included,
5465            which means that Perl space and POSIX space are now identical. PCRE            which means that Perl space and POSIX space are now identical. PCRE
5466            was changed at release 8.34. */            was changed at release 8.34. */
5467    
5468            case PT_SPACE:    /* Perl space */            case PT_SPACE:    /* Perl space */
5469            case PT_PXSPACE:  /* POSIX space */            case PT_PXSPACE:  /* POSIX space */
5470            for (i = min; i < max; i++)            for (i = min; i < max; i++)
# Line 5537  for (;;) Line 5476  for (;;)
5476                break;                break;
5477                }                }
5478              GETCHARLENTEST(c, eptr, len);              GETCHARLENTEST(c, eptr, len);
5479              if ((UCD_CATEGORY(c) == ucp_Z || c == CHAR_HT || c == CHAR_NL ||              switch(c)
5480                   c == CHAR_VT || c == CHAR_FF || c == CHAR_CR)                {
5481                   == prop_fail_result)                HSPACE_CASES:
5482                  VSPACE_CASES:
5483                  if (prop_fail_result) goto ENDLOOP99;  /* Break the loop */
5484                  break;
5485    
5486                  default:
5487                  if ((UCD_CATEGORY(c) == ucp_Z) == prop_fail_result)
5488                    goto ENDLOOP99;   /* Break the loop */
5489                break;                break;
5490                  }
5491              eptr+= len;              eptr+= len;
5492              }              }
5493              ENDLOOP99:
5494            break;            break;
5495    
5496            case PT_WORD:            case PT_WORD:
# Line 5656  for (;;) Line 5604  for (;;)
5604          /* eptr is now past the end of the maximum run */          /* eptr is now past the end of the maximum run */
5605    
5606          if (possessive) continue;    /* No backtracking */          if (possessive) continue;    /* No backtracking */
5607    
5608          for(;;)          for(;;)
5609            {            {
5610            int lgb, rgb;            int lgb, rgb;
5611            PCRE_PUCHAR fptr;            PCRE_PUCHAR fptr;
5612    
5613            if (eptr == pp) goto TAIL_RECURSE;   /* At start of char run */            if (eptr == pp) goto TAIL_RECURSE;   /* At start of char run */
5614            RMATCH(eptr, ecode, offset_top, md, eptrb, RM45);            RMATCH(eptr, ecode, offset_top, md, eptrb, RM45);
5615            if (rrc != MATCH_NOMATCH) RRETURN(rrc);            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
# Line 5669  for (;;) Line 5617  for (;;)
5617            /* Backtracking over an extended grapheme cluster involves inspecting            /* Backtracking over an extended grapheme cluster involves inspecting
5618            the previous two characters (if present) to see if a break is            the previous two characters (if present) to see if a break is
5619            permitted between them. */            permitted between them. */
5620    
5621            eptr--;            eptr--;
5622            if (!utf) c = *eptr; else            if (!utf) c = *eptr; else
5623              {              {
# Line 5687  for (;;) Line 5635  for (;;)
5635                BACKCHAR(fptr);                BACKCHAR(fptr);
5636                GETCHAR(c, fptr);                GETCHAR(c, fptr);
5637                }                }
5638              lgb = UCD_GRAPHBREAK(c);              lgb = UCD_GRAPHBREAK(c);
5639              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;              if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break;
5640              eptr = fptr;              eptr = fptr;
5641              rgb = lgb;              rgb = lgb;
# Line 6211  for (;;) Line 6159  for (;;)
6159                eptr[-1] == CHAR_CR) eptr--;                eptr[-1] == CHAR_CR) eptr--;
6160            }            }
6161          }          }
6162    
6163        /* Control never gets here */        /* Control never gets here */
6164        }        }
6165    

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

  ViewVC Help
Powered by ViewVC 1.1.5