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

Diff of /code/trunk/pcre_jit_compile.c

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

revision 1531 by zherczeg, Fri Mar 6 07:44:16 2015 UTC revision 1533 by zherczeg, Tue Mar 24 08:22:29 2015 UTC
# Line 6997  cc += GET(cc, 1); Line 6997  cc += GET(cc, 1);
6997    
6998  has_alternatives = *cc == OP_ALT;  has_alternatives = *cc == OP_ALT;
6999  if (SLJIT_UNLIKELY(opcode == OP_COND || opcode == OP_SCOND))  if (SLJIT_UNLIKELY(opcode == OP_COND || opcode == OP_SCOND))
7000    has_alternatives = (*matchingpath == OP_RREF || *matchingpath == OP_DNRREF) ? FALSE : TRUE;    has_alternatives = (*matchingpath == OP_RREF || *matchingpath == OP_DNRREF || *matchingpath == OP_FAIL) ? FALSE : TRUE;
7001    
7002  if (SLJIT_UNLIKELY(opcode == OP_COND) && (*cc == OP_KETRMAX || *cc == OP_KETRMIN))  if (SLJIT_UNLIKELY(opcode == OP_COND) && (*cc == OP_KETRMAX || *cc == OP_KETRMIN))
7003    opcode = OP_SCOND;    opcode = OP_SCOND;
# Line 7310  if (opcode == OP_COND || opcode == OP_SC Line 7310  if (opcode == OP_COND || opcode == OP_SC
7310            matchingpath = cc;            matchingpath = cc;
7311          }          }
7312      }      }
7313      else if (*matchingpath == OP_FAIL)
7314        {
7315        SLJIT_ASSERT(!has_alternatives);
7316        if (*cc == OP_ALT)
7317          {
7318          matchingpath = cc + 1 + LINK_SIZE;
7319          cc += GET(cc, 1);
7320          }
7321        else
7322          matchingpath = cc;
7323        }
7324    else    else
7325      {      {
7326      SLJIT_ASSERT(has_alternatives && *matchingpath >= OP_ASSERT && *matchingpath <= OP_ASSERTBACK_NOT);      SLJIT_ASSERT(has_alternatives && *matchingpath >= OP_ASSERT && *matchingpath <= OP_ASSERTBACK_NOT);

Legend:
Removed from v.1531  
changed lines
  Added in v.1533

  ViewVC Help
Powered by ViewVC 1.1.5