[BACK]Return to pcretest.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / pcre

Diff for /embedaddon/pcre/pcretest.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/02/21 23:50:25 version 1.1.1.3, 2012/10/09 09:19:17
Line 46  pcre_internal.h that depend on COMPILE_PCRE8 or COMPIL Line 46  pcre_internal.h that depend on COMPILE_PCRE8 or COMPIL
 however, make use of SUPPORT_PCRE8 and SUPPORT_PCRE16 to ensure that it calls  however, make use of SUPPORT_PCRE8 and SUPPORT_PCRE16 to ensure that it calls
 only supported library functions. */  only supported library functions. */
   
   
 #ifdef HAVE_CONFIG_H  #ifdef HAVE_CONFIG_H
 #include "config.h"  #include "config.h"
 #endif  #endif
Line 59  only supported library functions. */ Line 58  only supported library functions. */
 #include <locale.h>  #include <locale.h>
 #include <errno.h>  #include <errno.h>
   
#ifdef SUPPORT_LIBREADLINE/* Both libreadline and libedit are optionally supported. The user-supplied
 original patch uses readline/readline.h for libedit, but in at least one system
 it is installed as editline/readline.h, so the configuration code now looks for
 that first, falling back to readline/readline.h. */
 
 #if defined(SUPPORT_LIBREADLINE) || defined(SUPPORT_LIBEDIT)
 #ifdef HAVE_UNISTD_H  #ifdef HAVE_UNISTD_H
 #include <unistd.h>  #include <unistd.h>
 #endif  #endif
   #if defined(SUPPORT_LIBREADLINE)
 #include <readline/readline.h>  #include <readline/readline.h>
 #include <readline/history.h>  #include <readline/history.h>
   #else
   #if defined(HAVE_EDITLINE_READLINE_H)
   #include <editline/readline.h>
   #else
   #include <readline/readline.h>
 #endif  #endif
   #endif
   #endif
   
   
 /* A number of things vary for Windows builds. Originally, pcretest opened its  /* A number of things vary for Windows builds. Originally, pcretest opened its
 input and output without "b"; then I was told that "b" was needed in some  input and output without "b"; then I was told that "b" was needed in some
 environments, so it was added for release 5.0 to both the input and output. (It  environments, so it was added for release 5.0 to both the input and output. (It
Line 599  version is called. ----- */ Line 610  version is called. ----- */
 #endif  #endif
 #endif  #endif
   
   #if !defined NODFA
   #define DFA_WS_DIMENSION 1000
   #endif
   
 /* This is the default loop count for timing. */  /* This is the default loop count for timing. */
   
 #define LOOPREPEAT 500000  #define LOOPREPEAT 500000
Line 613  static int callout_fail_count; Line 628  static int callout_fail_count;
 static int callout_fail_id;  static int callout_fail_id;
 static int debug_lengths;  static int debug_lengths;
 static int first_callout;  static int first_callout;
   static int jit_was_used;
 static int locale_set = 0;  static int locale_set = 0;
 static int show_malloc;  static int show_malloc;
 static int use_utf;  static int use_utf;
Line 674  static int use_pcre16 = 0; Line 690  static int use_pcre16 = 0;
 static int use_pcre16 = 1;  static int use_pcre16 = 1;
 #endif  #endif
   
   /* JIT study options for -s+n and /S+n where '1' <= n <= '7'. */
   
   static int jit_study_bits[] =
     {
     PCRE_STUDY_JIT_COMPILE,
     PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE,
     PCRE_STUDY_JIT_COMPILE + PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE,
     PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE,
     PCRE_STUDY_JIT_COMPILE + PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE,
     PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE + PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE,
     PCRE_STUDY_JIT_COMPILE + PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE +
       PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE
   };
   
 /* Textual explanations for runtime error codes */  /* Textual explanations for runtime error codes */
   
 static const char *errtexts[] = {  static const char *errtexts[] = {
Line 705  static const char *errtexts[] = { Line 735  static const char *errtexts[] = {
   NULL,  /* SHORTUTF8/16 is handled specially */    NULL,  /* SHORTUTF8/16 is handled specially */
   "nested recursion at the same subject position",    "nested recursion at the same subject position",
   "JIT stack limit reached",    "JIT stack limit reached",
  "pattern compiled in wrong mode: 8-bit/16-bit error"  "pattern compiled in wrong mode: 8-bit/16-bit error",
   "pattern compiled with other endianness",
   "invalid data in workspace for DFA restart"
 };  };
   
   
Line 1063  return sys_errlist[n]; Line 1095  return sys_errlist[n];
   
 static pcre_jit_stack* jit_callback(void *arg)  static pcre_jit_stack* jit_callback(void *arg)
 {  {
   jit_was_used = TRUE;
 return (pcre_jit_stack *)arg;  return (pcre_jit_stack *)arg;
 }  }
   
Line 1276  for (;;) Line 1309  for (;;)
     {      {
     int dlen;      int dlen;
   
    /* If libreadline support is required, use readline() to read a line if the    /* If libreadline or libedit support is required, use readline() to read a
    input is a terminal. Note that readline() removes the trailing newline, so    line if the input is a terminal. Note that readline() removes the trailing
    we must put it back again, to be compatible with fgets(). */    newline, so we must put it back again, to be compatible with fgets(). */
   
#ifdef SUPPORT_LIBREADLINE#if defined(SUPPORT_LIBREADLINE) || defined(SUPPORT_LIBEDIT)
     if (isatty(fileno(f)))      if (isatty(fileno(f)))
       {        {
       size_t len;        size_t len;
Line 2096  usage(void) Line 2129  usage(void)
 {  {
 printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");  printf("Usage:     pcretest [options] [<input file> [<output file>]]\n\n");
 printf("Input and output default to stdin and stdout.\n");  printf("Input and output default to stdin and stdout.\n");
#ifdef SUPPORT_LIBREADLINE#if defined(SUPPORT_LIBREADLINE) || defined(SUPPORT_LIBEDIT)
 printf("If input is a terminal, readline() is used to read from it.\n");  printf("If input is a terminal, readline() is used to read from it.\n");
 #else  #else
 printf("This version of pcretest is not linked with readline().\n");  printf("This version of pcretest is not linked with readline().\n");
Line 2132  printf("  -q       quiet: do not output PCRE version n Line 2165  printf("  -q       quiet: do not output PCRE version n
 printf("  -S <n>   set stack size to <n> megabytes\n");  printf("  -S <n>   set stack size to <n> megabytes\n");
 printf("  -s       force each pattern to be studied at basic level\n"  printf("  -s       force each pattern to be studied at basic level\n"
        "  -s+      force each pattern to be studied, using JIT if available\n"         "  -s+      force each pattern to be studied, using JIT if available\n"
          "  -s++     ditto, verifying when JIT was actually used\n"
          "  -s+n     force each pattern to be studied, using JIT if available,\n"
          "             where 1 <= n <= 7 selects JIT options\n"
          "  -s++n    ditto, verifying when JIT was actually used\n"
        "  -t       time compilation and execution\n");         "  -t       time compilation and execution\n");
 printf("  -t <n>   time compilation and execution, repeating <n> times\n");  printf("  -t <n>   time compilation and execution, repeating <n> times\n");
 printf("  -tm      time execution (matching) only\n");  printf("  -tm      time execution (matching) only\n");
Line 2166  int quiet = 0; Line 2203  int quiet = 0;
 int size_offsets = 45;  int size_offsets = 45;
 int size_offsets_max;  int size_offsets_max;
 int *offsets = NULL;  int *offsets = NULL;
 #if !defined NOPOSIX  
 int posix = 0;  
 #endif  
 int debug = 0;  int debug = 0;
 int done = 0;  int done = 0;
 int all_use_dfa = 0;  int all_use_dfa = 0;
   int verify_jit = 0;
 int yield = 0;  int yield = 0;
 int stack_size;  int stack_size;
   
   #if !defined NOPOSIX
   int posix = 0;
   #endif
   #if !defined NODFA
   int *dfa_workspace = NULL;
   #endif
   
 pcre_jit_stack *jit_stack = NULL;  pcre_jit_stack *jit_stack = NULL;
   
 /* These vectors store, end-to-end, a list of zero-terminated captured  /* These vectors store, end-to-end, a list of zero-terminated captured
Line 2233  version = pcre16_version(); Line 2275  version = pcre16_version();
 while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
   {    {
   pcre_uint8 *endptr;    pcre_uint8 *endptr;
     char *arg = argv[op];
   
  if (strcmp(argv[op], "-m") == 0) showstore = 1;  if (strcmp(arg, "-m") == 0) showstore = 1;
  else if (strcmp(argv[op], "-s") == 0) force_study = 0;  else if (strcmp(arg, "-s") == 0) force_study = 0;
  else if (strcmp(argv[op], "-s+") == 0)
   else if (strncmp(arg, "-s+", 3) == 0)
     {      {
       arg += 3;
       if (*arg == '+') { arg++; verify_jit = TRUE; }
     force_study = 1;      force_study = 1;
    force_study_options = PCRE_STUDY_JIT_COMPILE;    if (*arg == 0)
       force_study_options = jit_study_bits[6];
     else if (*arg >= '1' && *arg <= '7')
       force_study_options = jit_study_bits[*arg - '1'];
     else goto BAD_ARG;
     }      }
  else if (strcmp(argv[op], "-16") == 0)  else if (strcmp(arg, "-16") == 0)
     {      {
 #ifdef SUPPORT_PCRE16  #ifdef SUPPORT_PCRE16
     use_pcre16 = 1;      use_pcre16 = 1;
Line 2250  while (argc > 1 && argv[op][0] == '-') Line 2300  while (argc > 1 && argv[op][0] == '-')
     exit(1);      exit(1);
 #endif  #endif
     }      }
  else if (strcmp(argv[op], "-q") == 0) quiet = 1;  else if (strcmp(arg, "-q") == 0) quiet = 1;
  else if (strcmp(argv[op], "-b") == 0) debug = 1;  else if (strcmp(arg, "-b") == 0) debug = 1;
  else if (strcmp(argv[op], "-i") == 0) showinfo = 1;  else if (strcmp(arg, "-i") == 0) showinfo = 1;
  else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;  else if (strcmp(arg, "-d") == 0) showinfo = debug = 1;
  else if (strcmp(argv[op], "-M") == 0) default_find_match_limit = TRUE;  else if (strcmp(arg, "-M") == 0) default_find_match_limit = TRUE;
 #if !defined NODFA  #if !defined NODFA
  else if (strcmp(argv[op], "-dfa") == 0) all_use_dfa = 1;  else if (strcmp(arg, "-dfa") == 0) all_use_dfa = 1;
 #endif  #endif
  else if (strcmp(argv[op], "-o") == 0 && argc > 2 &&  else if (strcmp(arg, "-o") == 0 && argc > 2 &&
       ((size_offsets = get_value((pcre_uint8 *)argv[op+1], &endptr)),        ((size_offsets = get_value((pcre_uint8 *)argv[op+1], &endptr)),
         *endptr == 0))          *endptr == 0))
     {      {
     op++;      op++;
     argc--;      argc--;
     }      }
  else if (strcmp(argv[op], "-t") == 0 || strcmp(argv[op], "-tm") == 0)  else if (strcmp(arg, "-t") == 0 || strcmp(arg, "-tm") == 0)
     {      {
    int both = argv[op][2] == 0;    int both = arg[2] == 0;
     int temp;      int temp;
     if (argc > 2 && (temp = get_value((pcre_uint8 *)argv[op+1], &endptr),      if (argc > 2 && (temp = get_value((pcre_uint8 *)argv[op+1], &endptr),
                      *endptr == 0))                       *endptr == 0))
Line 2279  while (argc > 1 && argv[op][0] == '-') Line 2329  while (argc > 1 && argv[op][0] == '-')
     else timeitm = LOOPREPEAT;      else timeitm = LOOPREPEAT;
     if (both) timeit = timeitm;      if (both) timeit = timeitm;
     }      }
  else if (strcmp(argv[op], "-S") == 0 && argc > 2 &&  else if (strcmp(arg, "-S") == 0 && argc > 2 &&
       ((stack_size = get_value((pcre_uint8 *)argv[op+1], &endptr)),        ((stack_size = get_value((pcre_uint8 *)argv[op+1], &endptr)),
         *endptr == 0))          *endptr == 0))
     {      {
Line 2302  while (argc > 1 && argv[op][0] == '-') Line 2352  while (argc > 1 && argv[op][0] == '-')
 #endif  #endif
     }      }
 #if !defined NOPOSIX  #if !defined NOPOSIX
  else if (strcmp(argv[op], "-p") == 0) posix = 1;  else if (strcmp(arg, "-p") == 0) posix = 1;
 #endif  #endif
  else if (strcmp(argv[op], "-C") == 0)  else if (strcmp(arg, "-C") == 0)
     {      {
     int rc;      int rc;
     unsigned long int lrc;      unsigned long int lrc;
Line 2444  are set, either both UTFs are supported or both are no Line 2494  are set, either both UTFs are supported or both are no
     printf("\n");      printf("\n");
     goto EXIT;      goto EXIT;
     }      }
  else if (strcmp(argv[op], "-help") == 0 ||  else if (strcmp(arg, "-help") == 0 ||
           strcmp(argv[op], "--help") == 0)           strcmp(arg, "--help") == 0)
     {      {
     usage();      usage();
     goto EXIT;      goto EXIT;
     }      }
   else    else
     {      {
    printf("** Unknown or malformed option %s\n", argv[op]);    BAD_ARG:
     printf("** Unknown or malformed option %s\n", arg);
     usage();      usage();
     yield = 1;      yield = 1;
     goto EXIT;      goto EXIT;
Line 2550  while (!done) Line 2601  while (!done)
   int do_flip = 0;    int do_flip = 0;
   int erroroffset, len, delimiter, poffset;    int erroroffset, len, delimiter, poffset;
   
   #if !defined NODFA
     int dfa_matched = 0;
   #endif
   
   use_utf = 0;    use_utf = 0;
   debug_lengths = 1;    debug_lengths = 1;
   
Line 2768  while (!done) Line 2823  while (!done)
         do_study = 1;          do_study = 1;
         if (*pp == '+')          if (*pp == '+')
           {            {
          study_options |= PCRE_STUDY_JIT_COMPILE;          if (*(++pp) == '+')
          pp++;            {
             verify_jit = TRUE;
             pp++;
             }
           if (*pp >= '1' && *pp <= '7')
             study_options |= jit_study_bits[*pp++ - '1'];
           else
             study_options |= jit_study_bits[6];
           }            }
         }          }
       else        else
Line 3062  while (!done) Line 3124  while (!done)
       {        {
       unsigned long int all_options;        unsigned long int all_options;
       int count, backrefmax, first_char, need_char, okpartial, jchanged,        int count, backrefmax, first_char, need_char, okpartial, jchanged,
        hascrorlf;        hascrorlf, maxlookbehind;
       int nameentrysize, namecount;        int nameentrysize, namecount;
       const pcre_uint8 *nametable;        const pcre_uint8 *nametable;
   
Line 3076  while (!done) Line 3138  while (!done)
           new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable) +            new_info(re, NULL, PCRE_INFO_NAMETABLE, (void *)&nametable) +
           new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial) +            new_info(re, NULL, PCRE_INFO_OKPARTIAL, &okpartial) +
           new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged) +            new_info(re, NULL, PCRE_INFO_JCHANGED, &jchanged) +
          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf)          new_info(re, NULL, PCRE_INFO_HASCRORLF, &hascrorlf) +
           new_info(re, NULL, PCRE_INFO_MAXLOOKBEHIND, &maxlookbehind)
           != 0)            != 0)
         goto SKIP_DATA;          goto SKIP_DATA;
   
Line 3216  while (!done) Line 3279  while (!done)
           }            }
         }          }
   
         if (maxlookbehind > 0)
           fprintf(outfile, "Max lookbehind = %d\n", maxlookbehind);
   
       /* Don't output study size; at present it is in any case a fixed        /* Don't output study size; at present it is in any case a fixed
       value, but it varies, depending on the computer architecture, and        value, but it varies, depending on the computer architecture, and
       so messes up the test suite. (And with the /F option, it might be        so messes up the test suite. (And with the /F option, it might be
Line 3653  while (!done) Line 3719  while (!done)
           }            }
         use_size_offsets = n;          use_size_offsets = n;
         if (n == 0) use_offsets = NULL;   /* Ensures it can't write to it */          if (n == 0) use_offsets = NULL;   /* Ensures it can't write to it */
             else use_offsets = offsets + size_offsets_max - n;  /* To catch overruns */
         continue;          continue;
   
         case 'P':          case 'P':
Line 3855  while (!done) Line 3922  while (!done)
       }        }
 #endif  #endif
   
       /* Ensure that there is a JIT callback if we want to verify that JIT was
       actually used. If jit_stack == NULL, no stack has yet been assigned. */
   
       if (verify_jit && jit_stack == NULL && extra != NULL)
          { PCRE_ASSIGN_JIT_STACK(extra, jit_callback, jit_stack); }
   
     for (;; gmatched++)    /* Loop for /g or /G */      for (;; gmatched++)    /* Loop for /g or /G */
       {        {
       markptr = NULL;        markptr = NULL;
         jit_was_used = FALSE;
   
       if (timeitm > 0)        if (timeitm > 0)
         {          {
Line 3868  while (!done) Line 3942  while (!done)
 #if !defined NODFA  #if !defined NODFA
         if (all_use_dfa || use_dfa)          if (all_use_dfa || use_dfa)
           {            {
          int workspace[1000];          if ((options & PCRE_DFA_RESTART) != 0)
             {
             fprintf(outfile, "Timing DFA restarts is not supported\n");
             break;
             }
           if (dfa_workspace == NULL)
             dfa_workspace = (int *)malloc(DFA_WS_DIMENSION*sizeof(int));
           for (i = 0; i < timeitm; i++)            for (i = 0; i < timeitm; i++)
             {              {
             PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,              PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,
              (options | g_notempty), use_offsets, use_size_offsets, workspace,              (options | g_notempty), use_offsets, use_size_offsets,
              (sizeof(workspace)/sizeof(int)));              dfa_workspace, DFA_WS_DIMENSION);
             }              }
           }            }
         else          else
Line 3939  while (!done) Line 4019  while (!done)
 #if !defined NODFA  #if !defined NODFA
       else if (all_use_dfa || use_dfa)        else if (all_use_dfa || use_dfa)
         {          {
        int workspace[1000];        if (dfa_workspace == NULL)
           dfa_workspace = (int *)malloc(DFA_WS_DIMENSION*sizeof(int));
         if (dfa_matched++ == 0)
           dfa_workspace[0] = -1;  /* To catch bad restart */
         PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,          PCRE_DFA_EXEC(count, re, extra, bptr, len, start_offset,
          (options | g_notempty), use_offsets, use_size_offsets, workspace,          (options | g_notempty), use_offsets, use_size_offsets, dfa_workspace,
          (sizeof(workspace)/sizeof(int)));          DFA_WS_DIMENSION);
         if (count == 0)          if (count == 0)
           {            {
           fprintf(outfile, "Matched, but too many subsidiary matches\n");            fprintf(outfile, "Matched, but too many subsidiary matches\n");
Line 4019  while (!done) Line 4102  while (!done)
             fprintf(outfile, "%2d: ", i/2);              fprintf(outfile, "%2d: ", i/2);
             PCHARSV(bptr, use_offsets[i],              PCHARSV(bptr, use_offsets[i],
               use_offsets[i+1] - use_offsets[i], outfile);                use_offsets[i+1] - use_offsets[i], outfile);
               if (verify_jit && jit_was_used) fprintf(outfile, " (JIT)");
             fprintf(outfile, "\n");              fprintf(outfile, "\n");
             if (do_showcaprest || (i == 0 && do_showrest))              if (do_showcaprest || (i == 0 && do_showrest))
               {                {
Line 4185  while (!done) Line 4269  while (!done)
           PCHARSV(bptr, use_offsets[0], use_offsets[1] - use_offsets[0],            PCHARSV(bptr, use_offsets[0], use_offsets[1] - use_offsets[0],
             outfile);              outfile);
           }            }
           if (verify_jit && jit_was_used) fprintf(outfile, " (JIT)");
         fprintf(outfile, "\n");          fprintf(outfile, "\n");
         break;  /* Out of the /g loop */          break;  /* Out of the /g loop */
         }          }
Line 4264  while (!done) Line 4349  while (!done)
               {                {
               if (markptr == NULL)                if (markptr == NULL)
                 {                  {
                fprintf(outfile, "No match\n");                fprintf(outfile, "No match");
                 }                  }
               else                else
                 {                  {
                 fprintf(outfile, "No match, mark = ");                  fprintf(outfile, "No match, mark = ");
                 PCHARSV(markptr, 0, -1, outfile);                  PCHARSV(markptr, 0, -1, outfile);
                 putc('\n', outfile);  
                 }                  }
                 if (verify_jit && jit_was_used) fprintf(outfile, " (JIT)");
                 putc('\n', outfile);
               }                }
             break;              break;
   
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>