/[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 1185 by chpe, Sun Oct 21 16:53:51 2012 UTC revision 1186 by ph10, Sun Oct 28 17:57:32 2012 UTC
# Line 667  find_error_text(int n) Line 667  find_error_text(int n)
667  const char *s = error_texts;  const char *s = error_texts;
668  for (; n > 0; n--)  for (; n > 0; n--)
669    {    {
670    while (*s++ != 0) {};    while (*s++ != CHAR_NULL) {};
671    if (*s == 0) return "Error text not found (please report)";    if (*s == CHAR_NULL) return "Error text not found (please report)";
672    }    }
673  return s;  return s;
674  }  }
# Line 788  ptr--;                            /* Set Line 788  ptr--;                            /* Set
788    
789  /* If backslash is at the end of the pattern, it's an error. */  /* If backslash is at the end of the pattern, it's an error. */
790    
791  if (c == 0) *errorcodeptr = ERR1;  if (c == CHAR_NULL) *errorcodeptr = ERR1;
792    
793  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup  /* Non-alphanumerics are literals. For digits or letters, do an initial lookup
794  in a table. A non-zero result is something that can be returned immediately.  in a table. A non-zero result is something that can be returned immediately.
# Line 898  else Line 898  else
898      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)      if (ptr[1] == CHAR_LEFT_CURLY_BRACKET)
899        {        {
900        const pcre_uchar *p;        const pcre_uchar *p;
901        for (p = ptr+2; *p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET; p++)        for (p = ptr+2; *p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET; p++)
902          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;          if (*p != CHAR_MINUS && !IS_DIGIT(*p)) break;
903        if (*p != 0 && *p != CHAR_RIGHT_CURLY_BRACKET)        if (*p != CHAR_NULL && *p != CHAR_RIGHT_CURLY_BRACKET)
904          {          {
905          escape = ESC_k;          escape = ESC_k;
906          break;          break;
# Line 1134  else Line 1134  else
1134    
1135      case CHAR_c:      case CHAR_c:
1136      c = *(++ptr);      c = *(++ptr);
1137      if (c == 0)      if (c == CHAR_NULL)
1138        {        {
1139        *errorcodeptr = ERR2;        *errorcodeptr = ERR2;
1140        break;        break;
# Line 1220  const pcre_uchar *ptr = *ptrptr; Line 1220  const pcre_uchar *ptr = *ptrptr;
1220  pcre_uchar name[32];  pcre_uchar name[32];
1221    
1222  c = *(++ptr);  c = *(++ptr);
1223  if (c == 0) goto ERROR_RETURN;  if (c == CHAR_NULL) goto ERROR_RETURN;
1224    
1225  *negptr = FALSE;  *negptr = FALSE;
1226    
# Line 1237  if (c == CHAR_LEFT_CURLY_BRACKET) Line 1237  if (c == CHAR_LEFT_CURLY_BRACKET)
1237    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)    for (i = 0; i < (int)(sizeof(name) / sizeof(pcre_uchar)) - 1; i++)
1238      {      {
1239      c = *(++ptr);      c = *(++ptr);
1240      if (c == 0) goto ERROR_RETURN;      if (c == CHAR_NULL) goto ERROR_RETURN;
1241      if (c == CHAR_RIGHT_CURLY_BRACKET) break;      if (c == CHAR_RIGHT_CURLY_BRACKET) break;
1242      name[i] = c;      name[i] = c;
1243      }      }
# Line 1432  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1432  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1432    
1433    else if (ptr[2] == CHAR_NUMBER_SIGN)    else if (ptr[2] == CHAR_NUMBER_SIGN)
1434      {      {
1435      for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;      for (ptr += 3; *ptr != CHAR_NULL; ptr++)
1436          if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1437      goto FAIL_EXIT;      goto FAIL_EXIT;
1438      }      }
1439    
# Line 1445  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1446  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1446      ptr += 2;      ptr += 2;
1447      if (ptr[1] != CHAR_QUESTION_MARK)      if (ptr[1] != CHAR_QUESTION_MARK)
1448        {        {
1449        while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;        while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
1450        if (*ptr != 0) ptr++;        if (*ptr != CHAR_NULL) ptr++;
1451        }        }
1452      }      }
1453    
# Line 1489  for (; ptr < cd->end_pattern; ptr++) Line 1490  for (; ptr < cd->end_pattern; ptr++)
1490    
1491    if (*ptr == CHAR_BACKSLASH)    if (*ptr == CHAR_BACKSLASH)
1492      {      {
1493      if (*(++ptr) == 0) goto FAIL_EXIT;      if (*(++ptr) == CHAR_NULL) goto FAIL_EXIT;
1494      if (*ptr == CHAR_Q) for (;;)      if (*ptr == CHAR_Q) for (;;)
1495        {        {
1496        while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};        while (*(++ptr) != CHAR_NULL && *ptr != CHAR_BACKSLASH) {};
1497        if (*ptr == 0) goto FAIL_EXIT;        if (*ptr == CHAR_NULL) goto FAIL_EXIT;
1498        if (*(++ptr) == CHAR_E) break;        if (*(++ptr) == CHAR_E) break;
1499        }        }
1500      continue;      continue;
# Line 1537  for (; ptr < cd->end_pattern; ptr++) Line 1538  for (; ptr < cd->end_pattern; ptr++)
1538    
1539      while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)      while (*(++ptr) != CHAR_RIGHT_SQUARE_BRACKET)
1540        {        {
1541        if (*ptr == 0) return -1;        if (*ptr == CHAR_NULL) return -1;
1542        if (*ptr == CHAR_BACKSLASH)        if (*ptr == CHAR_BACKSLASH)
1543          {          {
1544          if (*(++ptr) == 0) goto FAIL_EXIT;          if (*(++ptr) == CHAR_NULL) goto FAIL_EXIT;
1545          if (*ptr == CHAR_Q) for (;;)          if (*ptr == CHAR_Q) for (;;)
1546            {            {
1547            while (*(++ptr) != 0 && *ptr != CHAR_BACKSLASH) {};            while (*(++ptr) != CHAR_NULL && *ptr != CHAR_BACKSLASH) {};
1548            if (*ptr == 0) goto FAIL_EXIT;            if (*ptr == CHAR_NULL) goto FAIL_EXIT;
1549            if (*(++ptr) == CHAR_E) break;            if (*(++ptr) == CHAR_E) break;
1550            }            }
1551          continue;          continue;
# Line 1558  for (; ptr < cd->end_pattern; ptr++) Line 1559  for (; ptr < cd->end_pattern; ptr++)
1559    if (xmode && *ptr == CHAR_NUMBER_SIGN)    if (xmode && *ptr == CHAR_NUMBER_SIGN)
1560      {      {
1561      ptr++;      ptr++;
1562      while (*ptr != 0)      while (*ptr != CHAR_NULL)
1563        {        {
1564        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }        if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
1565        ptr++;        ptr++;
# Line 1566  for (; ptr < cd->end_pattern; ptr++) Line 1567  for (; ptr < cd->end_pattern; ptr++)
1567        if (utf) FORWARDCHAR(ptr);        if (utf) FORWARDCHAR(ptr);
1568  #endif  #endif
1569        }        }
1570      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == CHAR_NULL) goto FAIL_EXIT;
1571      continue;      continue;
1572      }      }
1573    
# Line 1576  for (; ptr < cd->end_pattern; ptr++) Line 1577  for (; ptr < cd->end_pattern; ptr++)
1577      {      {
1578      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);      int rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, count);
1579      if (rc > 0) return rc;      if (rc > 0) return rc;
1580      if (*ptr == 0) goto FAIL_EXIT;      if (*ptr == CHAR_NULL) goto FAIL_EXIT;
1581      }      }
1582    
1583    else if (*ptr == CHAR_RIGHT_PARENTHESIS)    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
# Line 1641  matching closing parens. That is why we Line 1642  matching closing parens. That is why we
1642  for (;;)  for (;;)
1643    {    {
1644    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);    rc = find_parens_sub(&ptr, cd, name, lorn, xmode, utf, &count);
1645    if (rc > 0 || *ptr++ == 0) break;    if (rc > 0 || *ptr++ == CHAR_NULL) break;
1646    }    }
1647    
1648  return rc;  return rc;
# Line 2717  check_posix_syntax(const pcre_uchar *ptr Line 2718  check_posix_syntax(const pcre_uchar *ptr
2718  {  {
2719  pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */  pcre_uchar terminator;          /* Don't combine these lines; the Solaris cc */
2720  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */  terminator = *(++ptr);   /* compiler warns about "non-constant" initializer. */
2721  for (++ptr; *ptr != 0; ptr++)  for (++ptr; *ptr != CHAR_NULL; ptr++)
2722    {    {
2723    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)    if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET)
2724      ptr++;      ptr++;
# Line 3074  if ((options & PCRE_EXTENDED) != 0) Line 3075  if ((options & PCRE_EXTENDED) != 0)
3075      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3076        {        {
3077        ptr++;        ptr++;
3078        while (*ptr != 0)        while (*ptr != CHAR_NULL)
3079          {          {
3080          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3081          ptr++;          ptr++;
# Line 3117  if ((options & PCRE_EXTENDED) != 0) Line 3118  if ((options & PCRE_EXTENDED) != 0)
3118      if (*ptr == CHAR_NUMBER_SIGN)      if (*ptr == CHAR_NUMBER_SIGN)
3119        {        {
3120        ptr++;        ptr++;
3121        while (*ptr != 0)        while (*ptr != CHAR_NULL)
3122          {          {
3123          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen; break; }
3124          ptr++;          ptr++;
# Line 3811  for (;; ptr++) Line 3812  for (;; ptr++)
3812    /* If we are at the end of a nested substitution, revert to the outer level    /* If we are at the end of a nested substitution, revert to the outer level
3813    string. Nesting only happens one level deep. */    string. Nesting only happens one level deep. */
3814    
3815    if (c == 0 && nestptr != NULL)    if (c == CHAR_NULL && nestptr != NULL)
3816      {      {
3817      ptr = nestptr;      ptr = nestptr;
3818      nestptr = NULL;      nestptr = NULL;
# Line 3886  for (;; ptr++) Line 3887  for (;; ptr++)
3887    
3888    /* If in \Q...\E, check for the end; if not, we have a literal */    /* If in \Q...\E, check for the end; if not, we have a literal */
3889    
3890    if (inescq && c != 0)    if (inescq && c != CHAR_NULL)
3891      {      {
3892      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)      if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
3893        {        {
# Line 3934  for (;; ptr++) Line 3935  for (;; ptr++)
3935      if (c == CHAR_NUMBER_SIGN)      if (c == CHAR_NUMBER_SIGN)
3936        {        {
3937        ptr++;        ptr++;
3938        while (*ptr != 0)        while (*ptr != CHAR_NULL)
3939          {          {
3940          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }          if (IS_NEWLINE(ptr)) { ptr += cd->nllen - 1; break; }
3941          ptr++;          ptr++;
# Line 3942  for (;; ptr++) Line 3943  for (;; ptr++)
3943          if (utf) FORWARDCHAR(ptr);          if (utf) FORWARDCHAR(ptr);
3944  #endif  #endif
3945          }          }
3946        if (*ptr != 0) continue;        if (*ptr != CHAR_NULL) continue;
3947    
3948        /* Else fall through to handle end of string */        /* Else fall through to handle end of string */
3949        c = 0;        c = 0;
# Line 4120  for (;; ptr++) Line 4121  for (;; ptr++)
4121      means that an initial ] is taken as a data character. At the start of the      means that an initial ] is taken as a data character. At the start of the
4122      loop, c contains the first byte of the character. */      loop, c contains the first byte of the character. */
4123    
4124      if (c != 0) do      if (c != CHAR_NULL) do
4125        {        {
4126        const pcre_uchar *oldptr;        const pcre_uchar *oldptr;
4127    
# Line 4458  for (;; ptr++) Line 4459  for (;; ptr++)
4459          /* Minus (hyphen) at the end of a class is treated as a literal, so put          /* Minus (hyphen) at the end of a class is treated as a literal, so put
4460          back the pointer and jump to handle the character that preceded it. */          back the pointer and jump to handle the character that preceded it. */
4461    
4462          if (*ptr == 0 || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))          if (*ptr == CHAR_NULL || (!inescq && *ptr == CHAR_RIGHT_SQUARE_BRACKET))
4463            {            {
4464            ptr = oldptr;            ptr = oldptr;
4465            goto CLASS_SINGLE_CHARACTER;            goto CLASS_SINGLE_CHARACTER;
# Line 4613  for (;; ptr++) Line 4614  for (;; ptr++)
4614      If we are at the end of an internal nested string, revert to the outer      If we are at the end of an internal nested string, revert to the outer
4615      string. */      string. */
4616    
4617      while (((c = *(++ptr)) != 0 ||      while (((c = *(++ptr)) != CHAR_NULL ||
4618             (nestptr != NULL &&             (nestptr != NULL &&
4619               (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != 0)) &&               (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != CHAR_NULL)) &&
4620             (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));             (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
4621    
4622      /* Check for missing terminating ']' */      /* Check for missing terminating ']' */
4623    
4624      if (c == 0)      if (c == CHAR_NULL)
4625        {        {
4626        *errorcodeptr = ERR6;        *errorcodeptr = ERR6;
4627        goto FAILED;        goto FAILED;
# Line 5610  for (;; ptr++) Line 5611  for (;; ptr++)
5611        if (*ptr == CHAR_COLON)        if (*ptr == CHAR_COLON)
5612          {          {
5613          arg = ++ptr;          arg = ++ptr;
5614          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;          while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
5615          arglen = (int)(ptr - arg);          arglen = (int)(ptr - arg);
5616          if ((unsigned int)arglen > MAX_MARK)          if ((unsigned int)arglen > MAX_MARK)
5617            {            {
# Line 5724  for (;; ptr++) Line 5725  for (;; ptr++)
5725          {          {
5726          case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */          case CHAR_NUMBER_SIGN:                 /* Comment; skip to ket */
5727          ptr++;          ptr++;
5728          while (*ptr != 0 && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;          while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
5729          if (*ptr == 0)          if (*ptr == CHAR_NULL)
5730            {            {
5731            *errorcodeptr = ERR18;            *errorcodeptr = ERR18;
5732            goto FAILED;            goto FAILED;
# Line 5801  for (;; ptr++) Line 5802  for (;; ptr++)
5802            }            }
5803          else          else
5804            {            {
5805            terminator = 0;            terminator = CHAR_NULL;
5806            if (ptr[1] == CHAR_MINUS || ptr[1] == CHAR_PLUS) refsign = *(++ptr);            if (ptr[1] == CHAR_MINUS || ptr[1] == CHAR_PLUS) refsign = *(++ptr);
5807            }            }
5808    
# Line 5891  for (;; ptr++) Line 5892  for (;; ptr++)
5892            code[1+LINK_SIZE]++;            code[1+LINK_SIZE]++;
5893            }            }
5894    
5895          /* If terminator == 0 it means that the name followed directly after          /* If terminator == CHAR_NULL it means that the name followed directly
5896          the opening parenthesis [e.g. (?(abc)...] and in this case there are          after the opening parenthesis [e.g. (?(abc)...] and in this case there
5897          some further alternatives to try. For the cases where terminator != 0          are some further alternatives to try. For the cases where terminator !=
5898          [things like (?(<name>... or (?('name')... or (?(R&name)... ] we have          0 [things like (?(<name>... or (?('name')... or (?(R&name)... ] we have
5899          now checked all the possibilities, so give an error. */          now checked all the possibilities, so give an error. */
5900    
5901          else if (terminator != 0)          else if (terminator != CHAR_NULL)
5902            {            {
5903            *errorcodeptr = ERR15;            *errorcodeptr = ERR15;
5904            goto FAILED;            goto FAILED;
# Line 6794  for (;; ptr++) Line 6795  for (;; ptr++)
6795          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)          if (ptr[1] != CHAR_PLUS && ptr[1] != CHAR_MINUS)
6796            {            {
6797            BOOL is_a_number = TRUE;            BOOL is_a_number = TRUE;
6798            for (p = ptr + 1; *p != 0 && *p != (pcre_uchar)terminator; p++)            for (p = ptr + 1; *p != CHAR_NULL && *p != (pcre_uchar)terminator; p++)
6799              {              {
6800              if (!MAX_255(*p)) { is_a_number = FALSE; break; }              if (!MAX_255(*p)) { is_a_number = FALSE; break; }
6801              if ((cd->ctypes[*p] & ctype_digit) == 0) is_a_number = FALSE;              if ((cd->ctypes[*p] & ctype_digit) == 0) is_a_number = FALSE;
# Line 8118  if (cd->had_accept) Line 8119  if (cd->had_accept)
8119    
8120  /* If not reached end of pattern on success, there's an excess bracket. */  /* If not reached end of pattern on success, there's an excess bracket. */
8121    
8122  if (errorcode == 0 && *ptr != 0) errorcode = ERR22;  if (errorcode == 0 && *ptr != CHAR_NULL) errorcode = ERR22;
8123    
8124  /* Fill in the terminating state and check for disastrous overflow, but  /* Fill in the terminating state and check for disastrous overflow, but
8125  if debugging, leave the test till after things are printed out. */  if debugging, leave the test till after things are printed out. */

Legend:
Removed from v.1185  
changed lines
  Added in v.1186

  ViewVC Help
Powered by ViewVC 1.1.5