/[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 1538 by ph10, Sun Mar 29 11:22:24 2015 UTC revision 1539 by ph10, Sun Mar 29 15:44:40 2015 UTC
# Line 2497  for (code = first_significant_code(code Line 2497  for (code = first_significant_code(code
2497        empty_branch = FALSE;        empty_branch = FALSE;
2498        do        do
2499          {          {
2500          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd,          if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd,
2501            recurses)) empty_branch = TRUE;            recurses)) empty_branch = TRUE;
2502          code += GET(code, 1);          code += GET(code, 1);
2503          }          }
# Line 6476  for (;; ptr++) Line 6476  for (;; ptr++)
6476    
6477      /* First deal with comments. Putting this code right at the start ensures      /* First deal with comments. Putting this code right at the start ensures
6478      that comments have no bad side effects. */      that comments have no bad side effects. */
6479    
6480      if (ptr[0] == CHAR_QUESTION_MARK && ptr[1] == CHAR_NUMBER_SIGN)      if (ptr[0] == CHAR_QUESTION_MARK && ptr[1] == CHAR_NUMBER_SIGN)
6481        {        {
6482        ptr += 2;        ptr += 2;
6483        while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;        while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
6484        if (*ptr == CHAR_NULL)        if (*ptr == CHAR_NULL)
6485          {          {
6486          *errorcodeptr = ERR18;          *errorcodeptr = ERR18;
6487          goto FAILED;          goto FAILED;
6488          }          }
6489        continue;        continue;
6490        }        }
6491    
6492      /* Now deal with various "verbs" that can be introduced by '*'. */      /* Now deal with various "verbs" that can be introduced by '*'. */
6493    
# Line 6679  for (;; ptr++) Line 6679  for (;; ptr++)
6679          if (tempptr[1] == CHAR_QUESTION_MARK &&          if (tempptr[1] == CHAR_QUESTION_MARK &&
6680                (tempptr[2] == CHAR_EQUALS_SIGN ||                (tempptr[2] == CHAR_EQUALS_SIGN ||
6681                 tempptr[2] == CHAR_EXCLAMATION_MARK ||                 tempptr[2] == CHAR_EXCLAMATION_MARK ||
6682                 tempptr[2] == CHAR_LESS_THAN_SIGN))                   (tempptr[2] == CHAR_LESS_THAN_SIGN &&
6683                       (tempptr[3] == CHAR_EQUALS_SIGN ||
6684                        tempptr[3] == CHAR_EXCLAMATION_MARK))))
6685            {            {
6686            cd->iscondassert = TRUE;            cd->iscondassert = TRUE;
6687            break;            break;

Legend:
Removed from v.1538  
changed lines
  Added in v.1539

  ViewVC Help
Powered by ViewVC 1.1.5