/[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 345 by ph10, Mon Apr 28 15:10:02 2008 UTC revision 349 by ph10, Wed Jul 2 18:42:11 2008 UTC
# Line 2015  get_othercase_range(unsigned int *cptr, Line 2015  get_othercase_range(unsigned int *cptr,
2015  unsigned int c, othercase, next;  unsigned int c, othercase, next;
2016    
2017  for (c = *cptr; c <= d; c++)  for (c = *cptr; c <= d; c++)
2018    { if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR) break; }    { if ((othercase = UCD_OTHERCASE(c)) != c) break; }
2019    
2020  if (c > d) return FALSE;  if (c > d) return FALSE;
2021    
# Line 2024  next = othercase + 1; Line 2024  next = othercase + 1;
2024    
2025  for (++c; c <= d; c++)  for (++c; c <= d; c++)
2026    {    {
2027    if (_pcre_ucp_othercase(c) != next) break;    if (UCD_OTHERCASE(c) != next) break;
2028    next++;    next++;
2029    }    }
2030    
# Line 2152  if (next >= 0) switch(op_code) Line 2152  if (next >= 0) switch(op_code)
2152      unsigned int othercase;      unsigned int othercase;
2153      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2154  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2155      othercase = _pcre_ucp_othercase((unsigned int)next);      othercase = UCD_OTHERCASE((unsigned int)next);
2156  #else  #else
2157      othercase = NOTACHAR;      othercase = NOTACHAR;
2158  #endif  #endif
# Line 2173  if (next >= 0) switch(op_code) Line 2173  if (next >= 0) switch(op_code)
2173      unsigned int othercase;      unsigned int othercase;
2174      if (next < 128) othercase = cd->fcc[next]; else      if (next < 128) othercase = cd->fcc[next]; else
2175  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
2176      othercase = _pcre_ucp_othercase(next);      othercase = UCD_OTHERCASE(next);
2177  #else  #else
2178      othercase = NOTACHAR;      othercase = NOTACHAR;
2179  #endif  #endif
# Line 3339  for (;; ptr++) Line 3339  for (;; ptr++)
3339          if ((options & PCRE_CASELESS) != 0)          if ((options & PCRE_CASELESS) != 0)
3340            {            {
3341            unsigned int othercase;            unsigned int othercase;
3342            if ((othercase = _pcre_ucp_othercase(c)) != NOTACHAR)            if ((othercase = UCD_OTHERCASE(c)) != c)
3343              {              {
3344              *class_utf8data++ = XCL_SINGLE;              *class_utf8data++ = XCL_SINGLE;
3345              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);              class_utf8data += _pcre_ord2utf8(othercase, class_utf8data);

Legend:
Removed from v.345  
changed lines
  Added in v.349

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12