/[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 1454 by ph10, Sun Feb 9 18:55:03 2014 UTC revision 1459 by ph10, Tue Mar 4 10:45:15 2014 UTC
# Line 548  static const char error_texts[] = Line 548  static const char error_texts[] =
548    "invalid range in character class\0"    "invalid range in character class\0"
549    "group name must start with a non-digit\0"    "group name must start with a non-digit\0"
550    /* 85 */    /* 85 */
551    "parentheses are too deeply nested (stack check)\0"    "parentheses are too deeply nested (stack check)\0"
552    ;    ;
553    
554  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
# Line 4081  for (c = *cptr; c <= d; c++) Line 4081  for (c = *cptr; c <= d; c++)
4081    
4082  if (c > d) return -1;  /* Reached end of range */  if (c > d) return -1;  /* Reached end of range */
4083    
4084  /* Found a character that has a single other case. Search for the end of the  /* Found a character that has a single other case. Search for the end of the
4085  range, which is either the end of the input range, or a character that has zero  range, which is either the end of the input range, or a character that has zero
4086  or more than one other cases. */  or more than one other cases. */
4087    
4088  *ocptr = othercase;  *ocptr = othercase;
# Line 4146  if ((options & PCRE_CASELESS) != 0) Line 4146  if ((options & PCRE_CASELESS) != 0)
4146    
4147      options &= ~PCRE_CASELESS;   /* Remove for recursive calls */      options &= ~PCRE_CASELESS;   /* Remove for recursive calls */
4148      c = start;      c = start;
4149    
4150      while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)      while ((rc = get_othercase_range(&c, end, &oc, &od)) >= 0)
4151        {        {
4152        /* Handle a single character that has more than one other case. */        /* Handle a single character that has more than one other case. */
# Line 4209  for (c = start; c <= classbits_end; c++) Line 4209  for (c = start; c <= classbits_end; c++)
4209  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8  #if defined SUPPORT_UTF || !defined COMPILE_PCRE8
4210  if (start <= 0xff) start = 0xff + 1;  if (start <= 0xff) start = 0xff + 1;
4211    
4212  if (end >= start)  if (end >= start)
4213    {    {
4214    pcre_uchar *uchardata = *uchardptr;    pcre_uchar *uchardata = *uchardptr;
4215  #ifdef SUPPORT_UTF  #ifdef SUPPORT_UTF
# Line 6620  for (;; ptr++) Line 6620  for (;; ptr++)
6620          code[1+LINK_SIZE] = OP_CREF;          code[1+LINK_SIZE] = OP_CREF;
6621          skipbytes = 1+IMM2_SIZE;          skipbytes = 1+IMM2_SIZE;
6622          refsign = -1;     /* => not a number */          refsign = -1;     /* => not a number */
6623          namelen = -1;     /* => not a name; must set to avoid warning */          namelen = -1;     /* => not a name; must set to avoid warning */
6624          name = NULL;      /* Always set to avoid warning */          name = NULL;      /* Always set to avoid warning */
6625          recno = 0;        /* Always set to avoid warning */          recno = 0;        /* Always set to avoid warning */
6626    
6627          /* Check for a test for recursion in a named group. */          /* Check for a test for recursion in a named group. */
6628    
# Line 8042  if (PUBL(stack_guard) != NULL && PUBL(st Line 8042  if (PUBL(stack_guard) != NULL && PUBL(st
8042    *errorcodeptr= ERR85;    *errorcodeptr= ERR85;
8043    return FALSE;    return FALSE;
8044    }    }
8045    
8046  /* Miscellaneous initialization */  /* Miscellaneous initialization */
8047    
8048  bc.outer = bcptr;  bc.outer = bcptr;
8049  bc.current_branch = code;  bc.current_branch = code;

Legend:
Removed from v.1454  
changed lines
  Added in v.1459

  ViewVC Help
Powered by ViewVC 1.1.5