/[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 1078 by chpe, Tue Oct 16 15:55:00 2012 UTC revision 1120 by chpe, Tue Oct 16 15:57:38 2012 UTC
# Line 1854  for (;;) Line 1854  for (;;)
1854      case OP_NOTI:      case OP_NOTI:
1855      branchlength++;      branchlength++;
1856      cc += 2;      cc += 2;
1857  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
1858      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1859  #endif  #endif
1860      break;      break;
# Line 1868  for (;;) Line 1868  for (;;)
1868      case OP_NOTEXACTI:      case OP_NOTEXACTI:
1869      branchlength += (int)GET2(cc,1);      branchlength += (int)GET2(cc,1);
1870      cc += 2 + IMM2_SIZE;      cc += 2 + IMM2_SIZE;
1871  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
1872      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);      if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
1873  #endif  #endif
1874      break;      break;
# Line 3725  dynamically as we process the pattern. * Line 3725  dynamically as we process the pattern. *
3725  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
3726  /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */  /* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
3727  BOOL utf = (options & PCRE_UTF8) != 0;  BOOL utf = (options & PCRE_UTF8) != 0;
3728    #ifndef COMPILE_PCRE32
3729  pcre_uchar utf_chars[6];  pcre_uchar utf_chars[6];
3730    #endif
3731  #else  #else
3732  BOOL utf = FALSE;  BOOL utf = FALSE;
3733  #endif  #endif
# Line 4115  for (;; ptr++) Line 4117  for (;; ptr++)
4117        {        {
4118        const pcre_uchar *oldptr;        const pcre_uchar *oldptr;
4119    
4120  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
4121        if (utf && HAS_EXTRALEN(c))        if (utf && HAS_EXTRALEN(c))
4122          {                           /* Braces are required because the */          {                           /* Braces are required because the */
4123          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */          GETCHARLEN(c, ptr, ptr);    /* macro generates multiple statements */
# Line 5505  for (;; ptr++) Line 5507  for (;; ptr++)
5507        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)        else if (*tempcode == OP_EXACT || *tempcode == OP_NOTEXACT)
5508          {          {
5509          tempcode += PRIV(OP_lengths)[*tempcode];          tempcode += PRIV(OP_lengths)[*tempcode];
5510  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
5511          if (utf && HAS_EXTRALEN(tempcode[-1]))          if (utf && HAS_EXTRALEN(tempcode[-1]))
5512            tempcode += GET_EXTRALEN(tempcode[-1]);            tempcode += GET_EXTRALEN(tempcode[-1]);
5513  #endif  #endif
# Line 6949  for (;; ptr++) Line 6951  for (;; ptr++)
6951      mclength = 1;      mclength = 1;
6952      mcbuffer[0] = c;      mcbuffer[0] = c;
6953    
6954  #if defined SUPPORT_UTF && !defined COMPILE_PCRE32  #ifdef SUPPORT_UTF
6955      if (utf && HAS_EXTRALEN(c))      if (utf && HAS_EXTRALEN(c))
6956        ACROSSCHAR(TRUE, ptr[1], mcbuffer[mclength++] = *(++ptr));        ACROSSCHAR(TRUE, ptr[1], mcbuffer[mclength++] = *(++ptr));
6957  #endif  #endif
# Line 7643  do { Line 7645  do {
7645               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;               *code == OP_CBRAPOS || *code == OP_SCBRAPOS)? IMM2_SIZE:0;
7646     const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,     const pcre_uchar *scode = first_significant_code(code + 1+LINK_SIZE + xl,
7647       TRUE);       TRUE);
7648     register int op = *scode;     register pcre_uchar op = *scode;
7649    
7650     switch(op)     switch(op)
7651       {       {

Legend:
Removed from v.1078  
changed lines
  Added in v.1120

  ViewVC Help
Powered by ViewVC 1.1.5