/[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 504 by ph10, Mon Mar 8 08:57:04 2010 UTC revision 550 by ph10, Sun Oct 10 16:24:11 2010 UTC
# Line 92  is 4 there is plenty of room. */ Line 92  is 4 there is plenty of room. */
92    
93  #define COMPILE_WORK_SIZE (4096)  #define COMPILE_WORK_SIZE (4096)
94    
95    /* The overrun tests check for a slightly smaller size so that they detect the
96    overrun before it actually does run off the end of the data block. */
97    
98    #define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
99    
100    
101  /* Table for handling escaped characters in the range '0'-'z'. Positive returns  /* Table for handling escaped characters in the range '0'-'z'. Positive returns
102  are simple data values; negative values are for special things like \d and so  are simple data values; negative values are for special things like \d and so
# Line 119  static const short int escapes[] = { Line 124  static const short int escapes[] = {
124       -ESC_H,                  0,       -ESC_H,                  0,
125       0,                       -ESC_K,       0,                       -ESC_K,
126       0,                       0,       0,                       0,
127       0,                       0,       -ESC_N,                  0,
128       -ESC_P,                  -ESC_Q,       -ESC_P,                  -ESC_Q,
129       -ESC_R,                  -ESC_S,       -ESC_R,                  -ESC_S,
130       0,                       0,       0,                       0,
# Line 166  static const short int escapes[] = { Line 171  static const short int escapes[] = {
171  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',  /*  B8 */     0,     0,      0,       0,      0,   ']',    '=',    '-',
172  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,  /*  C0 */   '{',-ESC_A, -ESC_B,  -ESC_C, -ESC_D,-ESC_E,      0, -ESC_G,
173  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,  /*  C8 */-ESC_H,     0,      0,       0,      0,     0,      0,      0,
174  /*  D0 */   '}',     0, -ESC_K,       0,      0,     0,      0, -ESC_P,  /*  D0 */   '}',     0, -ESC_K,       0,      0,-ESC_N,      0, -ESC_P,
175  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,  /*  D8 */-ESC_Q,-ESC_R,      0,       0,      0,     0,      0,      0,
176  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,  /*  E0 */  '\\',     0, -ESC_S,       0,      0,-ESC_V, -ESC_W, -ESC_X,
177  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,  /*  E8 */     0,-ESC_Z,      0,       0,      0,     0,      0,      0,
# Line 183  string is built from string macros so th Line 188  string is built from string macros so th
188  platforms. */  platforms. */
189    
190  typedef struct verbitem {  typedef struct verbitem {
191    int   len;    int   len;                 /* Length of verb name */
192    int   op;    int   op;                  /* Op when no arg, or -1 if arg mandatory */
193      int   op_arg;              /* Op when arg present, or -1 if not allowed */
194  } verbitem;  } verbitem;
195    
196  static const char verbnames[] =  static const char verbnames[] =
197      "\0"                       /* Empty name is a shorthand for MARK */
198      STRING_MARK0
199    STRING_ACCEPT0    STRING_ACCEPT0
200    STRING_COMMIT0    STRING_COMMIT0
201    STRING_F0    STRING_F0
# Line 197  static const char verbnames[] = Line 205  static const char verbnames[] =
205    STRING_THEN;    STRING_THEN;
206    
207  static const verbitem verbs[] = {  static const verbitem verbs[] = {
208    { 6, OP_ACCEPT },    { 0, -1,        OP_MARK },
209    { 6, OP_COMMIT },    { 4, -1,        OP_MARK },
210    { 1, OP_FAIL },    { 6, OP_ACCEPT, -1 },
211    { 4, OP_FAIL },    { 6, OP_COMMIT, -1 },
212    { 5, OP_PRUNE },    { 1, OP_FAIL,   -1 },
213    { 4, OP_SKIP  },    { 4, OP_FAIL,   -1 },
214    { 4, OP_THEN  }    { 5, OP_PRUNE,  OP_PRUNE_ARG },
215      { 4, OP_SKIP,   OP_SKIP_ARG  },
216      { 4, OP_THEN,   OP_THEN_ARG  }
217  };  };
218    
219  static const int verbcount = sizeof(verbs)/sizeof(verbitem);  static const int verbcount = sizeof(verbs)/sizeof(verbitem);
# Line 251  static const int posix_class_maps[] = { Line 261  static const int posix_class_maps[] = {
261    cbit_xdigit,-1,          0              /* xdigit */    cbit_xdigit,-1,          0              /* xdigit */
262  };  };
263    
264    /* Table of substitutes for \d etc when PCRE_UCP is set. The POSIX class
265    substitutes must be in the order of the names, defined above, and there are
266    both positive and negative cases. NULL means no substitute. */
267    
268    #ifdef SUPPORT_UCP
269    static const uschar *substitutes[] = {
270      (uschar *)"\\P{Nd}",    /* \D */
271      (uschar *)"\\p{Nd}",    /* \d */
272      (uschar *)"\\P{Xsp}",   /* \S */       /* NOTE: Xsp is Perl space */
273      (uschar *)"\\p{Xsp}",   /* \s */
274      (uschar *)"\\P{Xwd}",   /* \W */
275      (uschar *)"\\p{Xwd}"    /* \w */
276    };
277    
278    static const uschar *posix_substitutes[] = {
279      (uschar *)"\\p{L}",     /* alpha */
280      (uschar *)"\\p{Ll}",    /* lower */
281      (uschar *)"\\p{Lu}",    /* upper */
282      (uschar *)"\\p{Xan}",   /* alnum */
283      NULL,                   /* ascii */
284      (uschar *)"\\h",        /* blank */
285      NULL,                   /* cntrl */
286      (uschar *)"\\p{Nd}",    /* digit */
287      NULL,                   /* graph */
288      NULL,                   /* print */
289      NULL,                   /* punct */
290      (uschar *)"\\p{Xps}",   /* space */    /* NOTE: Xps is POSIX space */
291      (uschar *)"\\p{Xwd}",   /* word */
292      NULL,                   /* xdigit */
293      /* Negated cases */
294      (uschar *)"\\P{L}",     /* ^alpha */
295      (uschar *)"\\P{Ll}",    /* ^lower */
296      (uschar *)"\\P{Lu}",    /* ^upper */
297      (uschar *)"\\P{Xan}",   /* ^alnum */
298      NULL,                   /* ^ascii */
299      (uschar *)"\\H",        /* ^blank */
300      NULL,                   /* ^cntrl */
301      (uschar *)"\\P{Nd}",    /* ^digit */
302      NULL,                   /* ^graph */
303      NULL,                   /* ^print */
304      NULL,                   /* ^punct */
305      (uschar *)"\\P{Xps}",   /* ^space */   /* NOTE: Xps is POSIX space */
306      (uschar *)"\\P{Xwd}",   /* ^word */
307      NULL                    /* ^xdigit */
308    };
309    #define POSIX_SUBSIZE (sizeof(posix_substitutes)/sizeof(uschar *))
310    #endif
311    
312  #define STRING(a)  # a  #define STRING(a)  # a
313  #define XSTRING(s) STRING(s)  #define XSTRING(s) STRING(s)
# Line 263  the number of relocations needed when a Line 320  the number of relocations needed when a
320  it is now one long string. We cannot use a table of offsets, because the  it is now one long string. We cannot use a table of offsets, because the
321  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we  lengths of inserts such as XSTRING(MAX_NAME_SIZE) are not known. Instead, we
322  simply count through to the one we want - this isn't a performance issue  simply count through to the one we want - this isn't a performance issue
323  because these strings are used only when there is a compilation error.  because these strings are used only when there is a compilation error.
324    
325  Each substring ends with \0 to insert a null character. This includes the final  Each substring ends with \0 to insert a null character. This includes the final
326  substring, so that the whole string ends with \0\0, which can be detected when  substring, so that the whole string ends with \0\0, which can be detected when
327  counting through. */  counting through. */
328    
329  static const char error_texts[] =  static const char error_texts[] =
# Line 314  static const char error_texts[] = Line 371  static const char error_texts[] =
371    /* 35 */    /* 35 */
372    "invalid condition (?(0)\0"    "invalid condition (?(0)\0"
373    "\\C not allowed in lookbehind assertion\0"    "\\C not allowed in lookbehind assertion\0"
374    "PCRE does not support \\L, \\l, \\N, \\U, or \\u\0"    "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0"
375    "number after (?C is > 255\0"    "number after (?C is > 255\0"
376    "closing ) for (?C expected\0"    "closing ) for (?C expected\0"
377    /* 40 */    /* 40 */
# Line 340  static const char error_texts[] = Line 397  static const char error_texts[] =
397    "inconsistent NEWLINE options\0"    "inconsistent NEWLINE options\0"
398    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"    "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0"
399    "a numbered reference must not be zero\0"    "a numbered reference must not be zero\0"
400    "(*VERB) with an argument is not supported\0"    "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0"
401    /* 60 */    /* 60 */
402    "(*VERB) not recognized\0"    "(*VERB) not recognized\0"
403    "number is too big\0"    "number is too big\0"
# Line 348  static const char error_texts[] = Line 405  static const char error_texts[] =
405    "digit expected after (?+\0"    "digit expected after (?+\0"
406    "] is an invalid data character in JavaScript compatibility mode\0"    "] is an invalid data character in JavaScript compatibility mode\0"
407    /* 65 */    /* 65 */
408    "different names for subpatterns of the same number are not allowed\0";    "different names for subpatterns of the same number are not allowed\0"
409      "(*MARK) must have an argument\0"
410      "this version of PCRE is not compiled with PCRE_UCP support\0"
411      ;
412    
413  /* Table to identify digits and hex digits. This is used when compiling  /* Table to identify digits and hex digits. This is used when compiling
414  patterns. Note that the tables in chartables are dependent on the locale, and  patterns. Note that the tables in chartables are dependent on the locale, and
# Line 506  static const char * Line 566  static const char *
566  find_error_text(int n)  find_error_text(int n)
567  {  {
568  const char *s = error_texts;  const char *s = error_texts;
569  for (; n > 0; n--)  for (; n > 0; n--)
570    {    {
571    while (*s++ != 0) {};    while (*s++ != 0) {};
572    if (*s == 0) return "Error text not found (please report)";    if (*s == 0) return "Error text not found (please report)";
573    }    }
574  return s;  return s;
575  }  }
576    
# Line 581  else Line 641  else
641    
642      case CHAR_l:      case CHAR_l:
643      case CHAR_L:      case CHAR_L:
     case CHAR_N:  
644      case CHAR_u:      case CHAR_u:
645      case CHAR_U:      case CHAR_U:
646      *errorcodeptr = ERR37;      *errorcodeptr = ERR37;
# Line 819  else Line 878  else
878      }      }
879    }    }
880    
881    /* Perl supports \N{name} for character names, as well as plain \N for "not
882    newline". PCRE does not support \N{name}. */
883    
884    if (c == -ESC_N && ptr[1] == CHAR_LEFT_CURLY_BRACKET)
885      *errorcodeptr = ERR37;
886    
887    /* If PCRE_UCP is set, we change the values for \d etc. */
888    
889    if ((options & PCRE_UCP) != 0 && c <= -ESC_D && c >= -ESC_w)
890      c -= (ESC_DU - ESC_D);
891    
892    /* Set the pointer to the final character before returning. */
893    
894  *ptrptr = ptr;  *ptrptr = ptr;
895  return c;  return c;
896  }  }
# Line 1057  dealing with. The very first call may no Line 1129  dealing with. The very first call may no
1129    
1130  if (ptr[0] == CHAR_LEFT_PARENTHESIS)  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1131    {    {
1132    if (ptr[1] == CHAR_QUESTION_MARK &&    /* Handle specials such as (*SKIP) or (*UTF8) etc. */
1133        ptr[2] == CHAR_VERTICAL_LINE)  
1134      if (ptr[1] == CHAR_ASTERISK) ptr += 2;
1135    
1136      /* Handle a normal, unnamed capturing parenthesis. */
1137    
1138      else if (ptr[1] != CHAR_QUESTION_MARK)
1139        {
1140        *count += 1;
1141        if (name == NULL && *count == lorn) return *count;
1142        ptr++;
1143        }
1144    
1145      /* All cases now have (? at the start. Remember when we are in a group
1146      where the parenthesis numbers are duplicated. */
1147    
1148      else if (ptr[2] == CHAR_VERTICAL_LINE)
1149      {      {
1150      ptr += 3;      ptr += 3;
1151      dup_parens = TRUE;      dup_parens = TRUE;
1152      }      }
1153    
1154    /* Handle a normal, unnamed capturing parenthesis */    /* Handle comments; all characters are allowed until a ket is reached. */
1155    
1156    else if (ptr[1] != CHAR_QUESTION_MARK && ptr[1] != CHAR_ASTERISK)    else if (ptr[2] == CHAR_NUMBER_SIGN)
1157      {      {
1158      *count += 1;      for (ptr += 3; *ptr != 0; ptr++) if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
1159      if (name == NULL && *count == lorn) return *count;      goto FAIL_EXIT;
     ptr++;  
1160      }      }
1161    
1162    /* Handle a condition. If it is an assertion, just carry on so that it    /* Handle a condition. If it is an assertion, just carry on so that it
1163    is processed as normal. If not, skip to the closing parenthesis of the    is processed as normal. If not, skip to the closing parenthesis of the
1164    condition (there can't be any nested parens. */    condition (there can't be any nested parens). */
1165    
1166    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)    else if (ptr[2] == CHAR_LEFT_PARENTHESIS)
1167      {      {
# Line 1087  if (ptr[0] == CHAR_LEFT_PARENTHESIS) Line 1173  if (ptr[0] == CHAR_LEFT_PARENTHESIS)
1173        }        }
1174      }      }
1175    
1176    /* We have either (? or (* and not a condition */    /* Start with (? but not a condition. */
1177    
1178    else    else
1179      {      {
# Line 1209  for (; *ptr != 0; ptr++) Line 1295  for (; *ptr != 0; ptr++)
1295    else if (*ptr == CHAR_RIGHT_PARENTHESIS)    else if (*ptr == CHAR_RIGHT_PARENTHESIS)
1296      {      {
1297      if (dup_parens && *count < hwm_count) *count = hwm_count;      if (dup_parens && *count < hwm_count) *count = hwm_count;
1298      *ptrptr = ptr;      goto FAIL_EXIT;
     return -1;  
1299      }      }
1300    
1301    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)    else if (*ptr == CHAR_VERTICAL_LINE && dup_parens)
# Line 1610  for (;;) Line 1695  for (;;)
1695    
1696    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
1697    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
1698    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
1699      must add in its length. */
1700    
1701    else    else
1702      {      {
# Line 1634  for (;;) Line 1720  for (;;)
1720        case OP_TYPEPOSUPTO:        case OP_TYPEPOSUPTO:
1721        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1722        break;        break;
1723    
1724          case OP_MARK:
1725          case OP_PRUNE_ARG:
1726          case OP_SKIP_ARG:
1727          code += code[1];
1728          break;
1729    
1730          case OP_THEN_ARG:
1731          code += code[1+LINK_SIZE];
1732          break;
1733        }        }
1734    
1735      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 1705  for (;;) Line 1801  for (;;)
1801    
1802    /* Otherwise, we can get the item's length from the table, except that for    /* Otherwise, we can get the item's length from the table, except that for
1803    repeated character types, we have to test for \p and \P, which have an extra    repeated character types, we have to test for \p and \P, which have an extra
1804    two bytes of parameters. */    two bytes of parameters, and for MARK/PRUNE/SKIP/THEN with an argument, we
1805      must add in its length. */
1806    
1807    else    else
1808      {      {
# Line 1729  for (;;) Line 1826  for (;;)
1826        case OP_TYPEEXACT:        case OP_TYPEEXACT:
1827        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;        if (code[3] == OP_PROP || code[3] == OP_NOTPROP) code += 2;
1828        break;        break;
1829    
1830          case OP_MARK:
1831          case OP_PRUNE_ARG:
1832          case OP_SKIP_ARG:
1833          code += code[1];
1834          break;
1835    
1836          case OP_THEN_ARG:
1837          code += code[1+LINK_SIZE];
1838          break;
1839        }        }
1840    
1841      /* Add in the fixed length from the table */      /* Add in the fixed length from the table */
# Line 1802  for (code = first_significant_code(code Line 1909  for (code = first_significant_code(code
1909    const uschar *ccode;    const uschar *ccode;
1910    
1911    c = *code;    c = *code;
1912    
1913    /* Skip over forward assertions; the other assertions are skipped by    /* Skip over forward assertions; the other assertions are skipped by
1914    first_significant_code() with a TRUE final argument. */    first_significant_code() with a TRUE final argument. */
1915    
# Line 1822  for (code = first_significant_code(code Line 1929  for (code = first_significant_code(code
1929      c = *code;      c = *code;
1930      continue;      continue;
1931      }      }
1932    
1933    /* For a recursion/subroutine call, if its end has been reached, which    /* For a recursion/subroutine call, if its end has been reached, which
1934    implies a subroutine call, we can scan it. */    implies a subroutine call, we can scan it. */
1935    
1936    if (c == OP_RECURSE)    if (c == OP_RECURSE)
1937      {      {
1938      BOOL empty_branch = FALSE;      BOOL empty_branch = FALSE;
1939      const uschar *scode = cd->start_code + GET(code, 1);      const uschar *scode = cd->start_code + GET(code, 1);
1940      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
1941      do      do
# Line 1836  for (code = first_significant_code(code Line 1943  for (code = first_significant_code(code
1943        if (could_be_empty_branch(scode, endcode, utf8, cd))        if (could_be_empty_branch(scode, endcode, utf8, cd))
1944          {          {
1945          empty_branch = TRUE;          empty_branch = TRUE;
1946          break;          break;
1947          }          }
1948        scode += GET(scode, 1);        scode += GET(scode, 1);
1949        }        }
1950      while (*scode == OP_ALT);      while (*scode == OP_ALT);
1951      if (!empty_branch) return FALSE;  /* All branches are non-empty */      if (!empty_branch) return FALSE;  /* All branches are non-empty */
1952      continue;      continue;
1953      }      }
1954    
1955    /* For other groups, scan the branches. */    /* For other groups, scan the branches. */
1956    
# Line 1998  for (code = first_significant_code(code Line 2105  for (code = first_significant_code(code
2105      break;      break;
2106  #endif  #endif
2107    
2108        /* MARK, and PRUNE/SKIP/THEN with an argument must skip over the argument
2109        string. */
2110    
2111        case OP_MARK:
2112        case OP_PRUNE_ARG:
2113        case OP_SKIP_ARG:
2114        code += code[1];
2115        break;
2116    
2117        case OP_THEN_ARG:
2118        code += code[1+LINK_SIZE];
2119        break;
2120    
2121      /* None of the remaining opcodes are required to match a character. */      /* None of the remaining opcodes are required to match a character. */
2122    
2123      default:      default:
2124      break;      break;
2125      }      }
2126    }    }
2127    
# Line 2024  Arguments: Line 2144  Arguments:
2144    endcode     points to where to stop (current RECURSE item)    endcode     points to where to stop (current RECURSE item)
2145    bcptr       points to the chain of current (unclosed) branch starts    bcptr       points to the chain of current (unclosed) branch starts
2146    utf8        TRUE if in UTF-8 mode    utf8        TRUE if in UTF-8 mode
2147    cd          pointers to tables etc    cd          pointers to tables etc
2148    
2149  Returns:      TRUE if what is matched could be empty  Returns:      TRUE if what is matched could be empty
2150  */  */
# Line 2218  auto_callout(uschar *code, const uschar Line 2338  auto_callout(uschar *code, const uschar
2338  {  {
2339  *code++ = OP_CALLOUT;  *code++ = OP_CALLOUT;
2340  *code++ = 255;  *code++ = 255;
2341  PUT(code, 0, ptr - cd->start_pattern);  /* Pattern offset */  PUT(code, 0, (int)(ptr - cd->start_pattern));  /* Pattern offset */
2342  PUT(code, LINK_SIZE, 0);                /* Default length */  PUT(code, LINK_SIZE, 0);                       /* Default length */
2343  return code + 2*LINK_SIZE;  return code + 2*LINK_SIZE;
2344  }  }
2345    
# Line 2244  Returns: nothing Line 2364  Returns: nothing
2364  static void  static void
2365  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)  complete_callout(uschar *previous_callout, const uschar *ptr, compile_data *cd)
2366  {  {
2367  int length = ptr - cd->start_pattern - GET(previous_callout, 2);  int length = (int)(ptr - cd->start_pattern - GET(previous_callout, 2));
2368  PUT(previous_callout, 2 + LINK_SIZE, length);  PUT(previous_callout, 2 + LINK_SIZE, length);
2369  }  }
2370    
# Line 2294  for (++c; c <= d; c++) Line 2414  for (++c; c <= d; c++)
2414    
2415  return TRUE;  return TRUE;
2416  }  }
2417    
2418    
2419    
2420    /*************************************************
2421    *        Check a character and a property        *
2422    *************************************************/
2423    
2424    /* This function is called by check_auto_possessive() when a property item
2425    is adjacent to a fixed character.
2426    
2427    Arguments:
2428      c            the character
2429      ptype        the property type
2430      pdata        the data for the type
2431      negated      TRUE if it's a negated property (\P or \p{^)
2432    
2433    Returns:       TRUE if auto-possessifying is OK
2434    */
2435    
2436    static BOOL
2437    check_char_prop(int c, int ptype, int pdata, BOOL negated)
2438    {
2439    const ucd_record *prop = GET_UCD(c);
2440    switch(ptype)
2441      {
2442      case PT_LAMP:
2443      return (prop->chartype == ucp_Lu ||
2444              prop->chartype == ucp_Ll ||
2445              prop->chartype == ucp_Lt) == negated;
2446    
2447      case PT_GC:
2448      return (pdata == _pcre_ucp_gentype[prop->chartype]) == negated;
2449    
2450      case PT_PC:
2451      return (pdata == prop->chartype) == negated;
2452    
2453      case PT_SC:
2454      return (pdata == prop->script) == negated;
2455    
2456      /* These are specials */
2457    
2458      case PT_ALNUM:
2459      return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2460              _pcre_ucp_gentype[prop->chartype] == ucp_N) == negated;
2461    
2462      case PT_SPACE:    /* Perl space */
2463      return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2464              c == CHAR_HT || c == CHAR_NL || c == CHAR_FF || c == CHAR_CR)
2465              == negated;
2466    
2467      case PT_PXSPACE:  /* POSIX space */
2468      return (_pcre_ucp_gentype[prop->chartype] == ucp_Z ||
2469              c == CHAR_HT || c == CHAR_NL || c == CHAR_VT ||
2470              c == CHAR_FF || c == CHAR_CR)
2471              == negated;
2472    
2473      case PT_WORD:
2474      return (_pcre_ucp_gentype[prop->chartype] == ucp_L ||
2475              _pcre_ucp_gentype[prop->chartype] == ucp_N ||
2476              c == CHAR_UNDERSCORE) == negated;
2477      }
2478    return FALSE;
2479    }
2480  #endif  /* SUPPORT_UCP */  #endif  /* SUPPORT_UCP */
2481    
2482    
# Line 2307  whether the next thing could possibly ma Line 2490  whether the next thing could possibly ma
2490  sense to automatically possessify the repeated item.  sense to automatically possessify the repeated item.
2491    
2492  Arguments:  Arguments:
2493    op_code       the repeated op code    previous      pointer to the repeated opcode
   this          data for this item, depends on the opcode  
2494    utf8          TRUE in UTF-8 mode    utf8          TRUE in UTF-8 mode
   utf8_char     used for utf8 character bytes, NULL if not relevant  
2495    ptr           next character in pattern    ptr           next character in pattern
2496    options       options bits    options       options bits
2497    cd            contains pointers to tables etc.    cd            contains pointers to tables etc.
# Line 2319  Returns: TRUE if possessifying is Line 2500  Returns: TRUE if possessifying is
2500  */  */
2501    
2502  static BOOL  static BOOL
2503  check_auto_possessive(int op_code, int item, BOOL utf8, uschar *utf8_char,  check_auto_possessive(const uschar *previous, BOOL utf8, const uschar *ptr,
2504    const uschar *ptr, int options, compile_data *cd)    int options, compile_data *cd)
2505  {  {
2506  int next;  int c, next;
2507    int op_code = *previous++;
2508    
2509  /* Skip whitespace and comments in extended mode */  /* Skip whitespace and comments in extended mode */
2510    
# Line 2383  if (*ptr == CHAR_ASTERISK || *ptr == CHA Line 2565  if (*ptr == CHAR_ASTERISK || *ptr == CHA
2565    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)    strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2566      return FALSE;      return FALSE;
2567    
2568  /* Now compare the next item with the previous opcode. If the previous is a  /* Now compare the next item with the previous opcode. First, handle cases when
2569  positive single character match, "item" either contains the character or, if  the next item is a character. */
 "item" is greater than 127 in utf8 mode, the character's bytes are in  
 utf8_char. */  
   
   
 /* Handle cases when the next item is a character. */  
2570    
2571  if (next >= 0) switch(op_code)  if (next >= 0) switch(op_code)
2572    {    {
2573    case OP_CHAR:    case OP_CHAR:
2574  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2575    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2576  #else  #else
2577    (void)(utf8_char);  /* Keep compiler happy by referencing function argument */    c = *previous;
2578  #endif  #endif
2579    return item != next;    return c != next;
2580    
2581    /* For CHARNC (caseless character) we must check the other case. If we have    /* For CHARNC (caseless character) we must check the other case. If we have
2582    Unicode property support, we can use it to test the other case of    Unicode property support, we can use it to test the other case of
# Line 2407  if (next >= 0) switch(op_code) Line 2584  if (next >= 0) switch(op_code)
2584    
2585    case OP_CHARNC:    case OP_CHARNC:
2586  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2587    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2588    #else
2589      c = *previous;
2590  #endif  #endif
2591    if (item == next) return FALSE;    if (c == next) return FALSE;
2592  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2593    if (utf8)    if (utf8)
2594      {      {
# Line 2420  if (next >= 0) switch(op_code) Line 2599  if (next >= 0) switch(op_code)
2599  #else  #else
2600      othercase = NOTACHAR;      othercase = NOTACHAR;
2601  #endif  #endif
2602      return (unsigned int)item != othercase;      return (unsigned int)c != othercase;
2603      }      }
2604    else    else
2605  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
2606    return (item != cd->fcc[next]);  /* Non-UTF-8 mode */    return (c != cd->fcc[next]);  /* Non-UTF-8 mode */
2607    
2608    /* For OP_NOT, "item" must be a single-byte character. */    /* For OP_NOT, its data is always a single-byte character. */
2609    
2610    case OP_NOT:    case OP_NOT:
2611    if (item == next) return TRUE;    if ((c = *previous) == next) return TRUE;
2612    if ((options & PCRE_CASELESS) == 0) return FALSE;    if ((options & PCRE_CASELESS) == 0) return FALSE;
2613  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2614    if (utf8)    if (utf8)
# Line 2441  if (next >= 0) switch(op_code) Line 2620  if (next >= 0) switch(op_code)
2620  #else  #else
2621      othercase = NOTACHAR;      othercase = NOTACHAR;
2622  #endif  #endif
2623      return (unsigned int)item == othercase;      return (unsigned int)c == othercase;
2624      }      }
2625    else    else
2626  #endif  /* SUPPORT_UTF8 */  #endif  /* SUPPORT_UTF8 */
2627    return (item == cd->fcc[next]);  /* Non-UTF-8 mode */    return (c == cd->fcc[next]);  /* Non-UTF-8 mode */
2628    
2629      /* Note that OP_DIGIT etc. are generated only when PCRE_UCP is *not* set.
2630      When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
2631    
2632    case OP_DIGIT:    case OP_DIGIT:
2633    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;    return next > 127 || (cd->ctypes[next] & ctype_digit) == 0;
# Line 2488  if (next >= 0) switch(op_code) Line 2670  if (next >= 0) switch(op_code)
2670      case 0x202f:      case 0x202f:
2671      case 0x205f:      case 0x205f:
2672      case 0x3000:      case 0x3000:
2673      return op_code != OP_HSPACE;      return op_code == OP_NOT_HSPACE;
2674      default:      default:
2675      return op_code == OP_HSPACE;      return op_code != OP_NOT_HSPACE;
2676      }      }
2677    
2678      case OP_ANYNL:
2679    case OP_VSPACE:    case OP_VSPACE:
2680    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
2681    switch(next)    switch(next)
# Line 2504  if (next >= 0) switch(op_code) Line 2687  if (next >= 0) switch(op_code)
2687      case 0x85:      case 0x85:
2688      case 0x2028:      case 0x2028:
2689      case 0x2029:      case 0x2029:
2690      return op_code != OP_VSPACE;      return op_code == OP_NOT_VSPACE;
2691      default:      default:
2692      return op_code == OP_VSPACE;      return op_code != OP_NOT_VSPACE;
2693      }      }
2694    
2695    #ifdef SUPPORT_UCP
2696      case OP_PROP:
2697      return check_char_prop(next, previous[0], previous[1], FALSE);
2698    
2699      case OP_NOTPROP:
2700      return check_char_prop(next, previous[0], previous[1], TRUE);
2701    #endif
2702    
2703    default:    default:
2704    return FALSE;    return FALSE;
2705    }    }
2706    
2707    
2708  /* Handle the case when the next item is \d, \s, etc. */  /* Handle the case when the next item is \d, \s, etc. Note that when PCRE_UCP
2709    is set, \d turns into ESC_du rather than ESC_d, etc., so ESC_d etc. are
2710    generated only when PCRE_UCP is *not* set, that is, when only ASCII
2711    characteristics are recognized. Similarly, the opcodes OP_DIGIT etc. are
2712    replaced by OP_PROP codes when PCRE_UCP is set. */
2713    
2714  switch(op_code)  switch(op_code)
2715    {    {
2716    case OP_CHAR:    case OP_CHAR:
2717    case OP_CHARNC:    case OP_CHARNC:
2718  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
2719    if (utf8 && item > 127) { GETCHAR(item, utf8_char); }    GETCHARTEST(c, previous);
2720    #else
2721      c = *previous;
2722  #endif  #endif
2723    switch(-next)    switch(-next)
2724      {      {
2725      case ESC_d:      case ESC_d:
2726      return item > 127 || (cd->ctypes[item] & ctype_digit) == 0;      return c > 127 || (cd->ctypes[c] & ctype_digit) == 0;
2727    
2728      case ESC_D:      case ESC_D:
2729      return item <= 127 && (cd->ctypes[item] & ctype_digit) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_digit) != 0;
2730    
2731      case ESC_s:      case ESC_s:
2732      return item > 127 || (cd->ctypes[item] & ctype_space) == 0;      return c > 127 || (cd->ctypes[c] & ctype_space) == 0;
2733    
2734      case ESC_S:      case ESC_S:
2735      return item <= 127 && (cd->ctypes[item] & ctype_space) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_space) != 0;
2736    
2737      case ESC_w:      case ESC_w:
2738      return item > 127 || (cd->ctypes[item] & ctype_word) == 0;      return c > 127 || (cd->ctypes[c] & ctype_word) == 0;
2739    
2740      case ESC_W:      case ESC_W:
2741      return item <= 127 && (cd->ctypes[item] & ctype_word) != 0;      return c <= 127 && (cd->ctypes[c] & ctype_word) != 0;
2742    
2743      case ESC_h:      case ESC_h:
2744      case ESC_H:      case ESC_H:
2745      switch(item)      switch(c)
2746        {        {
2747        case 0x09:        case 0x09:
2748        case 0x20:        case 0x20:
# Line 2573  switch(op_code) Line 2770  switch(op_code)
2770    
2771      case ESC_v:      case ESC_v:
2772      case ESC_V:      case ESC_V:
2773      switch(item)      switch(c)
2774        {        {
2775        case 0x0a:        case 0x0a:
2776        case 0x0b:        case 0x0b:
# Line 2587  switch(op_code) Line 2784  switch(op_code)
2784        return -next == ESC_v;        return -next == ESC_v;
2785        }        }
2786    
2787        /* When PCRE_UCP is set, these values get generated for \d etc. Find
2788        their substitutions and process them. The result will always be either
2789        -ESC_p or -ESC_P. Then fall through to process those values. */
2790    
2791    #ifdef SUPPORT_UCP
2792        case ESC_du:
2793        case ESC_DU:
2794        case ESC_wu:
2795        case ESC_WU:
2796        case ESC_su:
2797        case ESC_SU:
2798          {
2799          int temperrorcode = 0;
2800          ptr = substitutes[-next - ESC_DU];
2801          next = check_escape(&ptr, &temperrorcode, 0, options, FALSE);
2802          if (temperrorcode != 0) return FALSE;
2803          ptr++;    /* For compatibility */
2804          }
2805        /* Fall through */
2806    
2807        case ESC_p:
2808        case ESC_P:
2809          {
2810          int ptype, pdata, errorcodeptr;
2811          BOOL negated;
2812    
2813          ptr--;      /* Make ptr point at the p or P */
2814          ptype = get_ucp(&ptr, &negated, &pdata, &errorcodeptr);
2815          if (ptype < 0) return FALSE;
2816          ptr++;      /* Point past the final curly ket */
2817    
2818          /* If the property item is optional, we have to give up. (When generated
2819          from \d etc by PCRE_UCP, this test will have been applied much earlier,
2820          to the original \d etc. At this point, ptr will point to a zero byte. */
2821    
2822          if (*ptr == CHAR_ASTERISK || *ptr == CHAR_QUESTION_MARK ||
2823            strncmp((char *)ptr, STR_LEFT_CURLY_BRACKET STR_0 STR_COMMA, 3) == 0)
2824              return FALSE;
2825    
2826          /* Do the property check. */
2827    
2828          return check_char_prop(c, ptype, pdata, (next == -ESC_P) != negated);
2829          }
2830    #endif
2831    
2832      default:      default:
2833      return FALSE;      return FALSE;
2834      }      }
2835    
2836      /* In principle, support for Unicode properties should be integrated here as
2837      well. It means re-organizing the above code so as to get hold of the property
2838      values before switching on the op-code. However, I wonder how many patterns
2839      combine ASCII \d etc with Unicode properties? (Note that if PCRE_UCP is set,
2840      these op-codes are never generated.) */
2841    
2842    case OP_DIGIT:    case OP_DIGIT:
2843    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||    return next == -ESC_D || next == -ESC_s || next == -ESC_W ||
2844           next == -ESC_h || next == -ESC_v;           next == -ESC_h || next == -ESC_v || next == -ESC_R;
2845    
2846    case OP_NOT_DIGIT:    case OP_NOT_DIGIT:
2847    return next == -ESC_d;    return next == -ESC_d;
2848    
2849    case OP_WHITESPACE:    case OP_WHITESPACE:
2850    return next == -ESC_S || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_d || next == -ESC_w || next == -ESC_R;
2851    
2852    case OP_NOT_WHITESPACE:    case OP_NOT_WHITESPACE:
2853    return next == -ESC_s || next == -ESC_h || next == -ESC_v;    return next == -ESC_s || next == -ESC_h || next == -ESC_v;
2854    
2855    case OP_HSPACE:    case OP_HSPACE:
2856    return next == -ESC_S || next == -ESC_H || next == -ESC_d || next == -ESC_w;    return next == -ESC_S || next == -ESC_H || next == -ESC_d ||
2857             next == -ESC_w || next == -ESC_v || next == -ESC_R;
2858    
2859    case OP_NOT_HSPACE:    case OP_NOT_HSPACE:
2860    return next == -ESC_h;    return next == -ESC_h;
2861    
2862    /* Can't have \S in here because VT matches \S (Perl anomaly) */    /* Can't have \S in here because VT matches \S (Perl anomaly) */
2863      case OP_ANYNL:
2864    case OP_VSPACE:    case OP_VSPACE:
2865    return next == -ESC_V || next == -ESC_d || next == -ESC_w;    return next == -ESC_V || next == -ESC_d || next == -ESC_w;
2866    
2867    case OP_NOT_VSPACE:    case OP_NOT_VSPACE:
2868    return next == -ESC_v;    return next == -ESC_v || next == -ESC_R;
2869    
2870    case OP_WORDCHAR:    case OP_WORDCHAR:
2871    return next == -ESC_W || next == -ESC_s || next == -ESC_h || next == -ESC_v;    return next == -ESC_W || next == -ESC_s || next == -ESC_h ||
2872             next == -ESC_v || next == -ESC_R;
2873    
2874    case OP_NOT_WORDCHAR:    case OP_NOT_WORDCHAR:
2875    return next == -ESC_w || next == -ESC_d;    return next == -ESC_w || next == -ESC_d;
# Line 2682  BOOL inescq = FALSE; Line 2933  BOOL inescq = FALSE;
2933  BOOL groupsetfirstbyte = FALSE;  BOOL groupsetfirstbyte = FALSE;
2934  const uschar *ptr = *ptrptr;  const uschar *ptr = *ptrptr;
2935  const uschar *tempptr;  const uschar *tempptr;
2936    const uschar *nestptr = NULL;
2937  uschar *previous = NULL;  uschar *previous = NULL;
2938  uschar *previous_callout = NULL;  uschar *previous_callout = NULL;
2939  uschar *save_hwm = NULL;  uschar *save_hwm = NULL;
# Line 2752  for (;; ptr++) Line 3004  for (;; ptr++)
3004    
3005    c = *ptr;    c = *ptr;
3006    
3007      /* If we are at the end of a nested substitution, revert to the outer level
3008      string. Nesting only happens one level deep. */
3009    
3010      if (c == 0 && nestptr != NULL)
3011        {
3012        ptr = nestptr;
3013        nestptr = NULL;
3014        c = *ptr;
3015        }
3016    
3017    /* If we are in the pre-compile phase, accumulate the length used for the    /* If we are in the pre-compile phase, accumulate the length used for the
3018    previous cycle of this loop. */    previous cycle of this loop. */
3019    
# Line 2760  for (;; ptr++) Line 3022  for (;; ptr++)
3022  #ifdef PCRE_DEBUG  #ifdef PCRE_DEBUG
3023      if (code > cd->hwm) cd->hwm = code;                 /* High water info */      if (code > cd->hwm) cd->hwm = code;                 /* High water info */
3024  #endif  #endif
3025      if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */      if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
3026        {        {
3027        *errorcodeptr = ERR52;        *errorcodeptr = ERR52;
3028        goto FAILED;        goto FAILED;
# Line 2782  for (;; ptr++) Line 3044  for (;; ptr++)
3044        goto FAILED;        goto FAILED;
3045        }        }
3046    
3047      *lengthptr += code - last_code;      *lengthptr += (int)(code - last_code);
3048      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));      DPRINTF(("length=%d added %d c=%c\n", *lengthptr, code - last_code, c));
3049    
3050      /* If "previous" is set and it is not at the start of the work space, move      /* If "previous" is set and it is not at the start of the work space, move
# Line 2809  for (;; ptr++) Line 3071  for (;; ptr++)
3071    /* In the real compile phase, just check the workspace used by the forward    /* In the real compile phase, just check the workspace used by the forward
3072    reference list. */    reference list. */
3073    
3074    else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)    else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
3075      {      {
3076      *errorcodeptr = ERR52;      *errorcodeptr = ERR52;
3077      goto FAILED;      goto FAILED;
# Line 2900  for (;; ptr++) Line 3162  for (;; ptr++)
3162          *errorcodeptr = ERR20;          *errorcodeptr = ERR20;
3163          goto FAILED;          goto FAILED;
3164          }          }
3165        *lengthptr += code - last_code;   /* To include callout length */        *lengthptr += (int)(code - last_code);   /* To include callout length */
3166        DPRINTF((">> end branch\n"));        DPRINTF((">> end branch\n"));
3167        }        }
3168      return TRUE;      return TRUE;
# Line 3105  for (;; ptr++) Line 3367  for (;; ptr++)
3367            ptr++;            ptr++;
3368            }            }
3369    
3370          posix_class = check_posix_name(ptr, tempptr - ptr);          posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
3371          if (posix_class < 0)          if (posix_class < 0)
3372            {            {
3373            *errorcodeptr = ERR30;            *errorcodeptr = ERR30;
# Line 3119  for (;; ptr++) Line 3381  for (;; ptr++)
3381          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)          if ((options & PCRE_CASELESS) != 0 && posix_class <= 2)
3382            posix_class = 0;            posix_class = 0;
3383    
3384          /* We build the bit map for the POSIX class in a chunk of local store          /* When PCRE_UCP is set, some of the POSIX classes are converted to
3385          because we may be adding and subtracting from it, and we don't want to          different escape sequences that use Unicode properties. */
3386          subtract bits that may be in the main map already. At the end we or the  
3387          result into the bit map that is being built. */  #ifdef SUPPORT_UCP
3388            if ((options & PCRE_UCP) != 0)
3389              {
3390              int pc = posix_class + ((local_negate)? POSIX_SUBSIZE/2 : 0);
3391              if (posix_substitutes[pc] != NULL)
3392                {
3393                nestptr = tempptr + 1;
3394                ptr = posix_substitutes[pc] - 1;
3395                continue;
3396                }
3397              }
3398    #endif
3399            /* In the non-UCP case, we build the bit map for the POSIX class in a
3400            chunk of local store because we may be adding and subtracting from it,
3401            and we don't want to subtract bits that may be in the main map already.
3402            At the end we or the result into the bit map that is being built. */
3403    
3404          posix_class *= 3;          posix_class *= 3;
3405    
# Line 3166  for (;; ptr++) Line 3443  for (;; ptr++)
3443    
3444        /* Backslash may introduce a single character, or it may introduce one        /* Backslash may introduce a single character, or it may introduce one
3445        of the specials, which just set a flag. The sequence \b is a special        of the specials, which just set a flag. The sequence \b is a special
3446        case. Inside a class (and only there) it is treated as backspace.        case. Inside a class (and only there) it is treated as backspace. We
3447        Elsewhere it marks a word boundary. Other escapes have preset maps ready        assume that other escapes have more than one character in them, so set
3448        to 'or' into the one we are building. We assume they have more than one        class_charcount bigger than one. Unrecognized escapes fall through and
3449        character in them, so set class_charcount bigger than one. */        are either treated as literal characters (by default), or are faulted if
3450          PCRE_EXTRA is set. */
3451    
3452        if (c == CHAR_BACKSLASH)        if (c == CHAR_BACKSLASH)
3453          {          {
3454          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);          c = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3455          if (*errorcodeptr != 0) goto FAILED;          if (*errorcodeptr != 0) goto FAILED;
3456    
3457          if (-c == ESC_b) c = CHAR_BS;       /* \b is backspace in a class */          if (-c == ESC_b) c = CHAR_BS;    /* \b is backspace in a class */
         else if (-c == ESC_X) c = CHAR_X;   /* \X is literal X in a class */  
         else if (-c == ESC_R) c = CHAR_R;   /* \R is literal R in a class */  
3458          else if (-c == ESC_Q)            /* Handle start of quoted string */          else if (-c == ESC_Q)            /* Handle start of quoted string */
3459            {            {
3460            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)            if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
# Line 3195  for (;; ptr++) Line 3471  for (;; ptr++)
3471            register const uschar *cbits = cd->cbits;            register const uschar *cbits = cd->cbits;
3472            class_charcount += 2;     /* Greater than 1 is what matters */            class_charcount += 2;     /* Greater than 1 is what matters */
3473    
3474            /* Save time by not doing this in the pre-compile phase. */            switch (-c)
   
           if (lengthptr == NULL) switch (-c)  
3475              {              {
3476    #ifdef SUPPORT_UCP
3477                case ESC_du:     /* These are the values given for \d etc */
3478                case ESC_DU:     /* when PCRE_UCP is set. We replace the */
3479                case ESC_wu:     /* escape sequence with an appropriate \p */
3480                case ESC_WU:     /* or \P to test Unicode properties instead */
3481                case ESC_su:     /* of the default ASCII testing. */
3482                case ESC_SU:
3483                nestptr = ptr;
3484                ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
3485                class_charcount -= 2;                /* Undo! */
3486                continue;
3487    #endif
3488              case ESC_d:              case ESC_d:
3489              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];              for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_digit];
3490              continue;              continue;
# Line 3228  for (;; ptr++) Line 3514  for (;; ptr++)
3514              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */              classbits[1] |= 0x08;    /* Perl 5.004 onwards omits VT from \s */
3515              continue;              continue;
3516    
3517              default:    /* Not recognized; fall through */              case ESC_h:
             break;      /* Need "default" setting to stop compiler warning. */  
             }  
   
           /* In the pre-compile phase, just do the recognition. */  
   
           else if (c == -ESC_d || c == -ESC_D || c == -ESC_w ||  
                    c == -ESC_W || c == -ESC_s || c == -ESC_S) continue;  
   
           /* We need to deal with \H, \h, \V, and \v in both phases because  
           they use extra memory. */  
   
           if (-c == ESC_h)  
             {  
3518              SETBIT(classbits, 0x09); /* VT */              SETBIT(classbits, 0x09); /* VT */
3519              SETBIT(classbits, 0x20); /* SPACE */              SETBIT(classbits, 0x20); /* SPACE */
3520              SETBIT(classbits, 0xa0); /* NSBP */              SETBIT(classbits, 0xa0); /* NSBP */
# Line 3265  for (;; ptr++) Line 3538  for (;; ptr++)
3538                }                }
3539  #endif  #endif
3540              continue;              continue;
             }  
3541    
3542            if (-c == ESC_H)              case ESC_H:
             {  
3543              for (c = 0; c < 32; c++)              for (c = 0; c < 32; c++)
3544                {                {
3545                int x = 0xff;                int x = 0xff;
# Line 3310  for (;; ptr++) Line 3581  for (;; ptr++)
3581                }                }
3582  #endif  #endif
3583              continue;              continue;
             }  
3584    
3585            if (-c == ESC_v)              case ESC_v:
             {  
3586              SETBIT(classbits, 0x0a); /* LF */              SETBIT(classbits, 0x0a); /* LF */
3587              SETBIT(classbits, 0x0b); /* VT */              SETBIT(classbits, 0x0b); /* VT */
3588              SETBIT(classbits, 0x0c); /* FF */              SETBIT(classbits, 0x0c); /* FF */
# Line 3329  for (;; ptr++) Line 3598  for (;; ptr++)
3598                }                }
3599  #endif  #endif
3600              continue;              continue;
             }  
3601    
3602            if (-c == ESC_V)              case ESC_V:
             {  
3603              for (c = 0; c < 32; c++)              for (c = 0; c < 32; c++)
3604                {                {
3605                int x = 0xff;                int x = 0xff;
# Line 3362  for (;; ptr++) Line 3629  for (;; ptr++)
3629                }                }
3630  #endif  #endif
3631              continue;              continue;
             }  
   
           /* We need to deal with \P and \p in both phases. */  
3632    
3633  #ifdef SUPPORT_UCP  #ifdef SUPPORT_UCP
3634            if (-c == ESC_p || -c == ESC_P)              case ESC_p:
3635              {              case ESC_P:
3636              BOOL negated;                {
3637              int pdata;                BOOL negated;
3638              int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);                int pdata;
3639              if (ptype < 0) goto FAILED;                int ptype = get_ucp(&ptr, &negated, &pdata, errorcodeptr);
3640              class_utf8 = TRUE;                if (ptype < 0) goto FAILED;
3641              *class_utf8data++ = ((-c == ESC_p) != negated)?                class_utf8 = TRUE;
3642                XCL_PROP : XCL_NOTPROP;                *class_utf8data++ = ((-c == ESC_p) != negated)?
3643              *class_utf8data++ = ptype;                  XCL_PROP : XCL_NOTPROP;
3644              *class_utf8data++ = pdata;                *class_utf8data++ = ptype;
3645              class_charcount -= 2;   /* Not a < 256 character */                *class_utf8data++ = pdata;
3646              continue;                class_charcount -= 2;   /* Not a < 256 character */
3647              }                continue;
3648                  }
3649  #endif  #endif
3650            /* Unrecognized escapes are faulted if PCRE is running in its              /* Unrecognized escapes are faulted if PCRE is running in its
3651            strict mode. By default, for compatibility with Perl, they are              strict mode. By default, for compatibility with Perl, they are
3652            treated as literals. */              treated as literals. */
3653    
3654            if ((options & PCRE_EXTRA) != 0)              default:
3655              {              if ((options & PCRE_EXTRA) != 0)
3656              *errorcodeptr = ERR7;                {
3657              goto FAILED;                *errorcodeptr = ERR7;
3658                  goto FAILED;
3659                  }
3660                class_charcount -= 2;  /* Undo the default count from above */
3661                c = *ptr;              /* Get the final character and fall through */
3662                break;
3663              }              }
   
           class_charcount -= 2;  /* Undo the default count from above */  
           c = *ptr;              /* Get the final character and fall through */  
3664            }            }
3665    
3666          /* Fall through if we have a single character (c >= 0). This may be          /* Fall through if we have a single character (c >= 0). This may be
# Line 3463  for (;; ptr++) Line 3730  for (;; ptr++)
3730            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);            d = check_escape(&ptr, errorcodeptr, cd->bracount, options, TRUE);
3731            if (*errorcodeptr != 0) goto FAILED;            if (*errorcodeptr != 0) goto FAILED;
3732    
3733            /* \b is backspace; \X is literal X; \R is literal R; any other            /* \b is backspace; any other special means the '-' was literal */
           special means the '-' was literal */  
3734    
3735            if (d < 0)            if (d < 0)
3736              {              {
3737              if (d == -ESC_b) d = CHAR_BS;              if (d == -ESC_b) d = CHAR_BS; else
             else if (d == -ESC_X) d = CHAR_X;  
             else if (d == -ESC_R) d = CHAR_R; else  
3738                {                {
3739                ptr = oldptr;                ptr = oldptr;
3740                goto LONE_SINGLE_CHARACTER;  /* A few lines below */                goto LONE_SINGLE_CHARACTER;  /* A few lines below */
# Line 3636  for (;; ptr++) Line 3900  for (;; ptr++)
3900          }          }
3901        }        }
3902    
3903      /* Loop until ']' reached. This "while" is the end of the "do" above. */      /* Loop until ']' reached. This "while" is the end of the "do" far above.
3904        If we are at the end of an internal nested string, revert to the outer
3905        string. */
3906    
3907        while (((c = *(++ptr)) != 0 ||
3908               (nestptr != NULL &&
3909                 (ptr = nestptr, nestptr = NULL, c = *(++ptr)) != 0)) &&
3910               (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));
3911    
3912      while ((c = *(++ptr)) != 0 && (c != CHAR_RIGHT_SQUARE_BRACKET || inescq));      /* Check for missing terminating ']' */
3913    
3914      if (c == 0)                          /* Missing terminating ']' */      if (c == 0)
3915        {        {
3916        *errorcodeptr = ERR6;        *errorcodeptr = ERR6;
3917        goto FAILED;        goto FAILED;
3918        }        }
3919    
   
 /* This code has been disabled because it would mean that \s counts as  
 an explicit \r or \n reference, and that's not really what is wanted. Now  
 we set the flag only if there is a literal "\r" or "\n" in the class. */  
   
 #if 0  
     /* Remember whether \r or \n are in this class */  
   
     if (negate_class)  
       {  
       if ((classbits[1] & 0x24) != 0x24) cd->external_flags |= PCRE_HASCRORLF;  
       }  
     else  
       {  
       if ((classbits[1] & 0x24) != 0) cd->external_flags |= PCRE_HASCRORLF;  
       }  
 #endif  
   
   
3920      /* If class_charcount is 1, we saw precisely one character whose value is      /* If class_charcount is 1, we saw precisely one character whose value is
3921      less than 256. As long as there were no characters >= 128 and there was no      less than 256. As long as there were no characters >= 128 and there was no
3922      use of \p or \P, in other words, no use of any XCLASS features, we can      use of \p or \P, in other words, no use of any XCLASS features, we can
# Line 3728  we set the flag only if there is a liter Line 3980  we set the flag only if there is a liter
3980    
3981      /* If there are characters with values > 255, we have to compile an      /* If there are characters with values > 255, we have to compile an
3982      extended class, with its own opcode, unless there was a negated special      extended class, with its own opcode, unless there was a negated special
3983      such as \S in the class, because in that case all characters > 255 are in      such as \S in the class, and PCRE_UCP is not set, because in that case all
3984      the class, so any that were explicitly given as well can be ignored. If      characters > 255 are in the class, so any that were explicitly given as
3985      (when there are explicit characters > 255 that must be listed) there are no      well can be ignored. If (when there are explicit characters > 255 that must
3986      characters < 256, we can omit the bitmap in the actual compiled code. */      be listed) there are no characters < 256, we can omit the bitmap in the
3987        actual compiled code. */
3988    
3989  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
3990      if (class_utf8 && !should_flip_negation)      if (class_utf8 && (!should_flip_negation || (options & PCRE_UCP) != 0))
3991        {        {
3992        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */        *class_utf8data++ = XCL_END;    /* Marks the end of extra data */
3993        *code++ = OP_XCLASS;        *code++ = OP_XCLASS;
# Line 3760  we set the flag only if there is a liter Line 4013  we set the flag only if there is a liter
4013        }        }
4014  #endif  #endif
4015    
4016      /* If there are no characters > 255, set the opcode to OP_CLASS or      /* If there are no characters > 255, or they are all to be included or
4017      OP_NCLASS, depending on whether the whole class was negated and whether      excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
4018      there were negative specials such as \S in the class. Then copy the 32-byte      whole class was negated and whether there were negative specials such as \S
4019      map into the code vector, negating it if necessary. */      (non-UCP) in the class. Then copy the 32-byte map into the code vector,
4020        negating it if necessary. */
4021    
4022      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;      *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
4023      if (negate_class)      if (negate_class)
# Line 3887  we set the flag only if there is a liter Line 4141  we set the flag only if there is a liter
4141    
4142        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4143            repeat_max < 0 &&            repeat_max < 0 &&
4144            check_auto_possessive(*previous, c, utf8, utf8_char, ptr + 1,            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
             options, cd))  
4145          {          {
4146          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4147          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3909  we set the flag only if there is a liter Line 4162  we set the flag only if there is a liter
4162        c = previous[1];        c = previous[1];
4163        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4164            repeat_max < 0 &&            repeat_max < 0 &&
4165            check_auto_possessive(OP_NOT, c, utf8, NULL, ptr + 1, options, cd))            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
4166          {          {
4167          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4168          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 3933  we set the flag only if there is a liter Line 4186  we set the flag only if there is a liter
4186    
4187        if (!possessive_quantifier &&        if (!possessive_quantifier &&
4188            repeat_max < 0 &&            repeat_max < 0 &&
4189            check_auto_possessive(c, 0, utf8, NULL, ptr + 1, options, cd))            check_auto_possessive(previous, utf8, ptr + 1, options, cd))
4190          {          {
4191          repeat_type = 0;    /* Force greedy */          repeat_type = 0;    /* Force greedy */
4192          possessive_quantifier = TRUE;          possessive_quantifier = TRUE;
# Line 4143  we set the flag only if there is a liter Line 4396  we set the flag only if there is a liter
4396        {        {
4397        register int i;        register int i;
4398        int ketoffset = 0;        int ketoffset = 0;
4399        int len = code - previous;        int len = (int)(code - previous);
4400        uschar *bralink = NULL;        uschar *bralink = NULL;
4401    
4402        /* Repeating a DEFINE group is pointless */        /* Repeating a DEFINE group is pointless */
# Line 4164  we set the flag only if there is a liter Line 4417  we set the flag only if there is a liter
4417          {          {
4418          register uschar *ket = previous;          register uschar *ket = previous;
4419          do ket += GET(ket, 1); while (*ket != OP_KET);          do ket += GET(ket, 1); while (*ket != OP_KET);
4420          ketoffset = code - ket;          ketoffset = (int)(code - ket);
4421          }          }
4422    
4423        /* The case of a zero minimum is special because of the need to stick        /* The case of a zero minimum is special because of the need to stick
# Line 4232  we set the flag only if there is a liter Line 4485  we set the flag only if there is a liter
4485            /* We chain together the bracket offset fields that have to be            /* We chain together the bracket offset fields that have to be
4486            filled in later when the ends of the brackets are reached. */            filled in later when the ends of the brackets are reached. */
4487    
4488            offset = (bralink == NULL)? 0 : previous - bralink;            offset = (bralink == NULL)? 0 : (int)(previous - bralink);
4489            bralink = previous;            bralink = previous;
4490            PUTINC(previous, 0, offset);            PUTINC(previous, 0, offset);
4491            }            }
# Line 4341  we set the flag only if there is a liter Line 4594  we set the flag only if there is a liter
4594              {              {
4595              int offset;              int offset;
4596              *code++ = OP_BRA;              *code++ = OP_BRA;
4597              offset = (bralink == NULL)? 0 : code - bralink;              offset = (bralink == NULL)? 0 : (int)(code - bralink);
4598              bralink = code;              bralink = code;
4599              PUTINC(code, 0, offset);              PUTINC(code, 0, offset);
4600              }              }
# Line 4362  we set the flag only if there is a liter Line 4615  we set the flag only if there is a liter
4615          while (bralink != NULL)          while (bralink != NULL)
4616            {            {
4617            int oldlinkoffset;            int oldlinkoffset;
4618            int offset = code - bralink + 1;            int offset = (int)(code - bralink + 1);
4619            uschar *bra = code - offset;            uschar *bra = code - offset;
4620            oldlinkoffset = GET(bra, 1);            oldlinkoffset = GET(bra, 1);
4621            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;            bralink = (oldlinkoffset == 0)? NULL : bralink - oldlinkoffset;
# Line 4450  we set the flag only if there is a liter Line 4703  we set the flag only if there is a liter
4703  #endif  #endif
4704          }          }
4705    
4706        len = code - tempcode;        len = (int)(code - tempcode);
4707        if (len > 0) switch (*tempcode)        if (len > 0) switch (*tempcode)
4708          {          {
4709          case OP_STAR:  *tempcode = OP_POSSTAR; break;          case OP_STAR:  *tempcode = OP_POSSTAR; break;
# Line 4470  we set the flag only if there is a liter Line 4723  we set the flag only if there is a liter
4723    
4724          /* Because we are moving code along, we must ensure that any          /* Because we are moving code along, we must ensure that any
4725          pending recursive references are updated. */          pending recursive references are updated. */
4726    
4727          default:          default:
4728          *code = OP_END;          *code = OP_END;
4729          adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);          adjust_recurse(tempcode, 1 + LINK_SIZE, utf8, cd, save_hwm);
# Line 4509  we set the flag only if there is a liter Line 4762  we set the flag only if there is a liter
4762    
4763      /* First deal with various "verbs" that can be introduced by '*'. */      /* First deal with various "verbs" that can be introduced by '*'. */
4764    
4765      if (*(++ptr) == CHAR_ASTERISK && (cd->ctypes[ptr[1]] & ctype_letter) != 0)      if (*(++ptr) == CHAR_ASTERISK &&
4766             ((cd->ctypes[ptr[1]] & ctype_letter) != 0 || ptr[1] == ':'))
4767        {        {
4768        int i, namelen;        int i, namelen;
4769          int arglen = 0;
4770        const char *vn = verbnames;        const char *vn = verbnames;
4771        const uschar *name = ++ptr;        const uschar *name = ptr + 1;
4772          const uschar *arg = NULL;
4773        previous = NULL;        previous = NULL;
4774        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};        while ((cd->ctypes[*++ptr] & ctype_letter) != 0) {};
4775          namelen = (int)(ptr - name);
4776    
4777        if (*ptr == CHAR_COLON)        if (*ptr == CHAR_COLON)
4778          {          {
4779          *errorcodeptr = ERR59;   /* Not supported */          arg = ++ptr;
4780          goto FAILED;          while ((cd->ctypes[*ptr] & (ctype_letter|ctype_digit)) != 0
4781              || *ptr == '_') ptr++;
4782            arglen = (int)(ptr - arg);
4783          }          }
4784    
4785        if (*ptr != CHAR_RIGHT_PARENTHESIS)        if (*ptr != CHAR_RIGHT_PARENTHESIS)
4786          {          {
4787          *errorcodeptr = ERR60;          *errorcodeptr = ERR60;
4788          goto FAILED;          goto FAILED;
4789          }          }
4790        namelen = ptr - name;  
4791          /* Scan the table of verb names */
4792    
4793        for (i = 0; i < verbcount; i++)        for (i = 0; i < verbcount; i++)
4794          {          {
4795          if (namelen == verbs[i].len &&          if (namelen == verbs[i].len &&
# Line 4544  we set the flag only if there is a liter Line 4807  we set the flag only if there is a liter
4807                PUT2INC(code, 0, oc->number);                PUT2INC(code, 0, oc->number);
4808                }                }
4809              }              }
4810            *code++ = verbs[i].op;  
4811            break;            /* Handle the cases with/without an argument */
4812    
4813              if (arglen == 0)
4814                {
4815                if (verbs[i].op < 0)   /* Argument is mandatory */
4816                  {
4817                  *errorcodeptr = ERR66;
4818                  goto FAILED;
4819                  }
4820                *code = verbs[i].op;
4821                if (*code++ == OP_THEN)
4822                  {
4823                  PUT(code, 0, code - bcptr->current_branch - 1);
4824                  code += LINK_SIZE;
4825                  }
4826                }
4827    
4828              else
4829                {
4830                if (verbs[i].op_arg < 0)   /* Argument is forbidden */
4831                  {
4832                  *errorcodeptr = ERR59;
4833                  goto FAILED;
4834                  }
4835                *code = verbs[i].op_arg;
4836                if (*code++ == OP_THEN_ARG)
4837                  {
4838                  PUT(code, 0, code - bcptr->current_branch - 1);
4839                  code += LINK_SIZE;
4840                  }
4841                *code++ = arglen;
4842                memcpy(code, arg, arglen);
4843                code += arglen;
4844                *code++ = 0;
4845                }
4846    
4847              break;  /* Found verb, exit loop */
4848            }            }
4849    
4850          vn += verbs[i].len + 1;          vn += verbs[i].len + 1;
4851          }          }
4852        if (i < verbcount) continue;  
4853        *errorcodeptr = ERR60;        if (i < verbcount) continue;    /* Successfully handled a verb */
4854          *errorcodeptr = ERR60;          /* Verb not recognized */
4855        goto FAILED;        goto FAILED;
4856        }        }
4857    
# Line 4669  we set the flag only if there is a liter Line 4970  we set the flag only if there is a liter
4970                recno * 10 + *ptr - CHAR_0 : -1;                recno * 10 + *ptr - CHAR_0 : -1;
4971            ptr++;            ptr++;
4972            }            }
4973          namelen = ptr - name;          namelen = (int)(ptr - name);
4974    
4975          if ((terminator > 0 && *ptr++ != terminator) ||          if ((terminator > 0 && *ptr++ != terminator) ||
4976              *ptr++ != CHAR_RIGHT_PARENTHESIS)              *ptr++ != CHAR_RIGHT_PARENTHESIS)
# Line 4865  we set the flag only if there is a liter Line 5166  we set the flag only if there is a liter
5166              goto FAILED;              goto FAILED;
5167              }              }
5168            *code++ = n;            *code++ = n;
5169            PUT(code, 0, ptr - cd->start_pattern + 1);  /* Pattern offset */            PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
5170            PUT(code, LINK_SIZE, 0);                    /* Default length */            PUT(code, LINK_SIZE, 0);                          /* Default length */
5171            code += 2 * LINK_SIZE;            code += 2 * LINK_SIZE;
5172            }            }
5173          previous = NULL;          previous = NULL;
# Line 4899  we set the flag only if there is a liter Line 5200  we set the flag only if there is a liter
5200            name = ++ptr;            name = ++ptr;
5201    
5202            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;            while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
5203            namelen = ptr - name;            namelen = (int)(ptr - name);
5204    
5205            /* In the pre-compile phase, just do a syntax check. */            /* In the pre-compile phase, just do a syntax check. */
5206    
# Line 5029  we set the flag only if there is a liter Line 5330  we set the flag only if there is a liter
5330          NAMED_REF_OR_RECURSE:          NAMED_REF_OR_RECURSE:
5331          name = ++ptr;          name = ++ptr;
5332          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;          while ((cd->ctypes[*ptr] & ctype_word) != 0) ptr++;
5333          namelen = ptr - name;          namelen = (int)(ptr - name);
5334    
5335          /* In the pre-compile phase, do a syntax check and set a dummy          /* In the pre-compile phase, do a syntax check and set a dummy
5336          reference number. */          reference number. */
# Line 5192  we set the flag only if there is a liter Line 5493  we set the flag only if there is a liter
5493                  *errorcodeptr = ERR15;                  *errorcodeptr = ERR15;
5494                  goto FAILED;                  goto FAILED;
5495                  }                  }
5496    
5497                /* Fudge the value of "called" so that when it is inserted as an                /* Fudge the value of "called" so that when it is inserted as an
5498                offset below, what it actually inserted is the reference number                offset below, what it actually inserted is the reference number
5499                of the group. */                of the group. */
5500    
5501                called = cd->start_code + recno;                called = cd->start_code + recno;
5502                PUTINC(cd->hwm, 0, code + 2 + LINK_SIZE - cd->start_code);                PUTINC(cd->hwm, 0, (int)(code + 2 + LINK_SIZE - cd->start_code));
5503                }                }
5504    
5505              /* If not a forward reference, and the subpattern is still open,              /* If not a forward reference, and the subpattern is still open,
# Line 5222  we set the flag only if there is a liter Line 5523  we set the flag only if there is a liter
5523            code += 1 + LINK_SIZE;            code += 1 + LINK_SIZE;
5524    
5525            *code = OP_RECURSE;            *code = OP_RECURSE;
5526            PUT(code, 1, called - cd->start_code);            PUT(code, 1, (int)(called - cd->start_code));
5527            code += 1 + LINK_SIZE;            code += 1 + LINK_SIZE;
5528    
5529            *code = OP_KET;            *code = OP_KET;
# Line 5333  we set the flag only if there is a liter Line 5634  we set the flag only if there is a liter
5634          }     /* End of switch for character following (? */          }     /* End of switch for character following (? */
5635        }       /* End of (? handling */        }       /* End of (? handling */
5636    
5637      /* Opening parenthesis not followed by '?'. If PCRE_NO_AUTO_CAPTURE is set,      /* Opening parenthesis not followed by '*' or '?'. If PCRE_NO_AUTO_CAPTURE
5638      all unadorned brackets become non-capturing and behave like (?:...)      is set, all unadorned brackets become non-capturing and behave like (?:...)
5639      brackets. */      brackets. */
5640    
5641      else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)      else if ((options & PCRE_NO_AUTO_CAPTURE) != 0)
# Line 5526  we set the flag only if there is a liter Line 5827  we set the flag only if there is a liter
5827    
5828      /* ===================================================================*/      /* ===================================================================*/
5829      /* Handle metasequences introduced by \. For ones like \d, the ESC_ values      /* Handle metasequences introduced by \. For ones like \d, the ESC_ values
5830      are arranged to be the negation of the corresponding OP_values. For the      are arranged to be the negation of the corresponding OP_values in the
5831      back references, the values are ESC_REF plus the reference number. Only      default case when PCRE_UCP is not set. For the back references, the values
5832      back references and those types that consume a character may be repeated.      are ESC_REF plus the reference number. Only back references and those types
5833      We can test for values between ESC_b and ESC_Z for the latter; this may      that consume a character may be repeated. We can test for values between
5834      have to change if any new ones are ever created. */      ESC_b and ESC_Z for the latter; this may have to change if any new ones are
5835        ever created. */
5836    
5837      case CHAR_BACKSLASH:      case CHAR_BACKSLASH:
5838      tempptr = ptr;      tempptr = ptr;
# Line 5690  we set the flag only if there is a liter Line 5992  we set the flag only if there is a liter
5992  #endif  #endif
5993    
5994        /* For the rest (including \X when Unicode properties are supported), we        /* For the rest (including \X when Unicode properties are supported), we
5995        can obtain the OP value by negating the escape value. */        can obtain the OP value by negating the escape value in the default
5996          situation when PCRE_UCP is not set. When it *is* set, we substitute
5997          Unicode property tests. */
5998    
5999        else        else
6000          {          {
6001          previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;  #ifdef SUPPORT_UCP
6002          *code++ = -c;          if (-c >= ESC_DU && -c <= ESC_wu)
6003              {
6004              nestptr = ptr + 1;                   /* Where to resume */
6005              ptr = substitutes[-c - ESC_DU] - 1;  /* Just before substitute */
6006              }
6007            else
6008    #endif
6009              {
6010              previous = (-c > ESC_b && -c < ESC_Z)? code : NULL;
6011              *code++ = -c;
6012              }
6013          }          }
6014        continue;        continue;
6015        }        }
# Line 6027  for (;;) Line 6341  for (;;)
6341      {      {
6342      if (lengthptr == NULL)      if (lengthptr == NULL)
6343        {        {
6344        int branch_length = code - last_branch;        int branch_length = (int)(code - last_branch);
6345        do        do
6346          {          {
6347          int prev_length = GET(last_branch, 1);          int prev_length = GET(last_branch, 1);
# Line 6041  for (;;) Line 6355  for (;;)
6355      /* Fill in the ket */      /* Fill in the ket */
6356    
6357      *code = OP_KET;      *code = OP_KET;
6358      PUT(code, 1, code - start_bracket);      PUT(code, 1, (int)(code - start_bracket));
6359      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6360    
6361      /* If it was a capturing subpattern, check to see if it contained any      /* If it was a capturing subpattern, check to see if it contained any
# Line 6056  for (;;) Line 6370  for (;;)
6370            code - start_bracket);            code - start_bracket);
6371          *start_bracket = OP_ONCE;          *start_bracket = OP_ONCE;
6372          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
6373          PUT(start_bracket, 1, code - start_bracket);          PUT(start_bracket, 1, (int)(code - start_bracket));
6374          *code = OP_KET;          *code = OP_KET;
6375          PUT(code, 1, code - start_bracket);          PUT(code, 1, (int)(code - start_bracket));
6376          code += 1 + LINK_SIZE;          code += 1 + LINK_SIZE;
6377          length += 2 + 2*LINK_SIZE;          length += 2 + 2*LINK_SIZE;
6378          }          }
# Line 6113  for (;;) Line 6427  for (;;)
6427    else    else
6428      {      {
6429      *code = OP_ALT;      *code = OP_ALT;
6430      PUT(code, 1, code - last_branch);      PUT(code, 1, (int)(code - last_branch));
6431      bc.current_branch = last_branch = code;      bc.current_branch = last_branch = code;
6432      code += 1 + LINK_SIZE;      code += 1 + LINK_SIZE;
6433      }      }
# Line 6432  int length = 1; /* For final END opcode Line 6746  int length = 1; /* For final END opcode
6746  int firstbyte, reqbyte, newline;  int firstbyte, reqbyte, newline;
6747  int errorcode = 0;  int errorcode = 0;
6748  int skipatstart = 0;  int skipatstart = 0;
6749  BOOL utf8 = (options & PCRE_UTF8) != 0;  BOOL utf8;
6750  size_t size;  size_t size;
6751  uschar *code;  uschar *code;
6752  const uschar *codestart;  const uschar *codestart;
# Line 6502  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 6816  while (ptr[skipatstart] == CHAR_LEFT_PAR
6816    
6817    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)    if (strncmp((char *)(ptr+skipatstart+2), STRING_UTF8_RIGHTPAR, 5) == 0)
6818      { skipatstart += 7; options |= PCRE_UTF8; continue; }      { skipatstart += 7; options |= PCRE_UTF8; continue; }
6819      else if (strncmp((char *)(ptr+skipatstart+2), STRING_UCP_RIGHTPAR, 4) == 0)
6820        { skipatstart += 6; options |= PCRE_UCP; continue; }
6821    
6822    if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)    if (strncmp((char *)(ptr+skipatstart+2), STRING_CR_RIGHTPAR, 3) == 0)
6823      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }      { skipatstart += 5; newnl = PCRE_NEWLINE_CR; }
# Line 6526  while (ptr[skipatstart] == CHAR_LEFT_PAR Line 6842  while (ptr[skipatstart] == CHAR_LEFT_PAR
6842    else break;    else break;
6843    }    }
6844    
6845    utf8 = (options & PCRE_UTF8) != 0;
6846    
6847  /* Can't support UTF8 unless PCRE has been compiled to include the code. */  /* Can't support UTF8 unless PCRE has been compiled to include the code. */
6848    
6849  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
# Line 6543  if (utf8) Line 6861  if (utf8)
6861    }    }
6862  #endif  #endif
6863    
6864    /* Can't support UCP unless PCRE has been compiled to include the code. */
6865    
6866    #ifndef SUPPORT_UCP
6867    if ((options & PCRE_UCP) != 0)
6868      {
6869      errorcode = ERR67;
6870      goto PCRE_EARLY_ERROR_RETURN;
6871      }
6872    #endif
6873    
6874  /* Check validity of \R options. */  /* Check validity of \R options. */
6875    
6876  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))  switch (options & (PCRE_BSR_ANYCRLF|PCRE_BSR_UNICODE))
# Line 6671  regex compiled on a system with 4-byte p Line 6999  regex compiled on a system with 4-byte p
6999  pointers. */  pointers. */
7000    
7001  re->magic_number = MAGIC_NUMBER;  re->magic_number = MAGIC_NUMBER;
7002  re->size = size;  re->size = (int)size;
7003  re->options = cd->external_options;  re->options = cd->external_options;
7004  re->flags = cd->external_flags;  re->flags = cd->external_flags;
7005  re->dummy1 = 0;  re->dummy1 = 0;
# Line 6742  while (errorcode == 0 && cd->hwm > cwork Line 7070  while (errorcode == 0 && cd->hwm > cwork
7070    recno = GET(codestart, offset);    recno = GET(codestart, offset);
7071    groupptr = _pcre_find_bracket(codestart, utf8, recno);    groupptr = _pcre_find_bracket(codestart, utf8, recno);
7072    if (groupptr == NULL) errorcode = ERR53;    if (groupptr == NULL) errorcode = ERR53;
7073      else PUT(((uschar *)codestart), offset, groupptr - codestart);      else PUT(((uschar *)codestart), offset, (int)(groupptr - codestart));
7074    }    }
7075    
7076  /* Give an error if there's back reference to a non-existent capturing  /* Give an error if there's back reference to a non-existent capturing
# Line 6797  if (errorcode != 0) Line 7125  if (errorcode != 0)
7125    {    {
7126    (pcre_free)(re);    (pcre_free)(re);
7127    PCRE_EARLY_ERROR_RETURN:    PCRE_EARLY_ERROR_RETURN:
7128    *erroroffset = ptr - (const uschar *)pattern;    *erroroffset = (int)(ptr - (const uschar *)pattern);
7129    PCRE_EARLY_ERROR_RETURN2:    PCRE_EARLY_ERROR_RETURN2:
7130    *errorptr = find_error_text(errorcode);    *errorptr = find_error_text(errorcode);
7131    if (errorcodeptr != NULL) *errorcodeptr = errorcode;    if (errorcodeptr != NULL) *errorcodeptr = errorcode;
Legend:
Removed from v.504  
changed lines
  Added in v.550
webmaster@exim.org
 ViewVC Help
Powered by ViewVC 1.1.12