/[pcre]/code/trunk/pcretest.c
ViewVC logotype

Diff of /code/trunk/pcretest.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 25 by nigel, Sat Feb 24 21:38:45 2007 UTC revision 43 by nigel, Sat Feb 24 21:39:21 2007 UTC
# Line 12  Line 12 
12  /* Use the internal info for displaying the results of pcre_study(). */  /* Use the internal info for displaying the results of pcre_study(). */
13    
14  #include "internal.h"  #include "internal.h"
15    
16    /* It is possible to compile this test program without including support for
17    testing the POSIX interface, though this is not available via the standard
18    Makefile. */
19    
20    #if !defined NOPOSIX
21  #include "pcreposix.h"  #include "pcreposix.h"
22    #endif
23    
24  #ifndef CLOCKS_PER_SEC  #ifndef CLOCKS_PER_SEC
25  #ifdef CLK_TCK  #ifdef CLK_TCK
# Line 22  Line 29 
29  #endif  #endif
30  #endif  #endif
31    
32  #define LOOPREPEAT 10000  #define LOOPREPEAT 20000
33    
34    
35  static FILE *outfile;  static FILE *outfile;
36  static int log_store = 0;  static int log_store = 0;
37    static size_t gotten_store;
38    
39    
40    
# Line 41  static const char *OP_names[] = { Line 49  static const char *OP_names[] = {
49    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",
50    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",    "*", "*?", "+", "+?", "?", "??", "{", "{", "{",
51    "*", "*?", "+", "+?", "?", "??", "{", "{",    "*", "*?", "+", "+?", "?", "??", "{", "{",
52    "class", "Ref",    "class", "Ref", "Recurse",
53    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",    "Alt", "Ket", "KetRmax", "KetRmin", "Assert", "Assert not",
54    "AssertB", "AssertB not", "Reverse", "Once", "Cond", "Cref",    "AssertB", "AssertB not", "Reverse", "Once", "Cond", "Cref",
55    "Brazero", "Braminzero", "Bra"    "Brazero", "Braminzero", "Bra"
56  };  };
57    
58    
59  static void print_internals(pcre *re, FILE *outfile)  static void print_internals(pcre *re)
60  {  {
61  unsigned char *code = ((real_pcre *)re)->code;  unsigned char *code = ((real_pcre *)re)->code;
62    
# Line 274  compiled re. */ Line 282  compiled re. */
282    
283  static void *new_malloc(size_t size)  static void *new_malloc(size_t size)
284  {  {
285  if (log_store) fprintf(outfile, "Store size request: %d\n", (int)size);  gotten_store = size;
286    if (log_store)
287      fprintf(outfile, "Memory allocation (code space): %d\n",
288        (int)((int)size - offsetof(real_pcre, code[0])));
289  return malloc(size);  return malloc(size);
290  }  }
291    
292    
293    
294    
295    /* Get one piece of information from the pcre_fullinfo() function */
296    
297    static void new_info(pcre *re, pcre_extra *study, int option, void *ptr)
298    {
299    int rc;
300    if ((rc = pcre_fullinfo(re, study, option, ptr)) < 0)
301      fprintf(outfile, "Error %d from pcre_fullinfo(%d)\n", rc, option);
302    }
303    
304    
305    
306    
307  /* Read lines from named file or stdin and write to named file or stdout; lines  /* Read lines from named file or stdin and write to named file or stdout; lines
308  consist of a regular expression, in delimiters and optionally followed by  consist of a regular expression, in delimiters and optionally followed by
309  options, followed by a set of test data, terminated by an empty line. */  options, followed by a set of test data, terminated by an empty line. */
# Line 292  int study_options = 0; Line 316  int study_options = 0;
316  int op = 1;  int op = 1;
317  int timeit = 0;  int timeit = 0;
318  int showinfo = 0;  int showinfo = 0;
319    int showstore = 0;
320  int posix = 0;  int posix = 0;
321  int debug = 0;  int debug = 0;
322  int done = 0;  int done = 0;
# Line 306  outfile = stdout; Line 331  outfile = stdout;
331    
332  while (argc > 1 && argv[op][0] == '-')  while (argc > 1 && argv[op][0] == '-')
333    {    {
334    if (strcmp(argv[op], "-s") == 0) log_store = 1;    if (strcmp(argv[op], "-s") == 0 || strcmp(argv[op], "-m") == 0)
335        showstore = 1;
336    else if (strcmp(argv[op], "-t") == 0) timeit = 1;    else if (strcmp(argv[op], "-t") == 0) timeit = 1;
337    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
338    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;    else if (strcmp(argv[op], "-d") == 0) showinfo = debug = 1;
# Line 362  while (!done) Line 388  while (!done)
388    {    {
389    pcre *re = NULL;    pcre *re = NULL;
390    pcre_extra *extra = NULL;    pcre_extra *extra = NULL;
391    
392    #if !defined NOPOSIX  /* There are still compilers that require no indent */
393    regex_t preg;    regex_t preg;
394    #endif
395    
396    const char *error;    const char *error;
397    unsigned char *p, *pp, *ppp;    unsigned char *p, *pp, *ppp;
398    unsigned const char *tables = NULL;    unsigned const char *tables = NULL;
399    int do_study = 0;    int do_study = 0;
400    int do_debug = debug;    int do_debug = debug;
401      int do_G = 0;
402      int do_g = 0;
403    int do_showinfo = showinfo;    int do_showinfo = showinfo;
404      int do_showrest = 0;
405    int do_posix = 0;    int do_posix = 0;
406    int erroroffset, len, delimiter;    int erroroffset, len, delimiter;
407    
# Line 385  while (!done) Line 418  while (!done)
418    
419    delimiter = *p++;    delimiter = *p++;
420    
421    if (isalnum(delimiter))    if (isalnum(delimiter) || delimiter == '\\')
422      {      {
423      fprintf(outfile, "** Delimiter must not be alphameric\n");      fprintf(outfile, "** Delimiter must not be alphameric or \\\n");
424      goto SKIP_DATA;      goto SKIP_DATA;
425      }      }
426    
# Line 395  while (!done) Line 428  while (!done)
428    
429    for(;;)    for(;;)
430      {      {
431      while (*pp != 0 && *pp != delimiter) pp++;      while (*pp != 0)
432          {
433          if (*pp == '\\' && pp[1] != 0) pp++;
434            else if (*pp == delimiter) break;
435          pp++;
436          }
437      if (*pp != 0) break;      if (*pp != 0) break;
438    
439      len = sizeof(buffer) - (pp - buffer);      len = sizeof(buffer) - (pp - buffer);
# Line 415  while (!done) Line 453  while (!done)
453      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);      if (infile != stdin) fprintf(outfile, "%s", (char *)pp);
454      }      }
455    
456      /* If the first character after the delimiter is backslash, make
457      the pattern end with backslash. This is purely to provide a way
458      of testing for the error message when a pattern ends with backslash. */
459    
460      if (pp[1] == '\\') *pp++ = '\\';
461    
462    /* Terminate the pattern at the delimiter */    /* Terminate the pattern at the delimiter */
463    
464    *pp++ = 0;    *pp++ = 0;
# Line 423  while (!done) Line 467  while (!done)
467    
468    options = 0;    options = 0;
469    study_options = 0;    study_options = 0;
470      log_store = showstore;  /* default from command line */
471    
472    while (*pp != 0)    while (*pp != 0)
473      {      {
474      switch (*pp++)      switch (*pp++)
475        {        {
476          case 'g': do_g = 1; break;
477        case 'i': options |= PCRE_CASELESS; break;        case 'i': options |= PCRE_CASELESS; break;
478        case 'm': options |= PCRE_MULTILINE; break;        case 'm': options |= PCRE_MULTILINE; break;
479        case 's': options |= PCRE_DOTALL; break;        case 's': options |= PCRE_DOTALL; break;
480        case 'x': options |= PCRE_EXTENDED; break;        case 'x': options |= PCRE_EXTENDED; break;
481    
482          case '+': do_showrest = 1; break;
483        case 'A': options |= PCRE_ANCHORED; break;        case 'A': options |= PCRE_ANCHORED; break;
484        case 'D': do_debug = do_showinfo = 1; break;        case 'D': do_debug = do_showinfo = 1; break;
485        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;        case 'E': options |= PCRE_DOLLAR_ENDONLY; break;
486          case 'G': do_G = 1; break;
487        case 'I': do_showinfo = 1; break;        case 'I': do_showinfo = 1; break;
488          case 'M': log_store = 1; break;
489    
490    #if !defined NOPOSIX
491        case 'P': do_posix = 1; break;        case 'P': do_posix = 1; break;
492    #endif
493    
494        case 'S': do_study = 1; break;        case 'S': do_study = 1; break;
495        case 'U': options |= PCRE_UNGREEDY; break;        case 'U': options |= PCRE_UNGREEDY; break;
496        case 'X': options |= PCRE_EXTRA; break;        case 'X': options |= PCRE_EXTRA; break;
# Line 465  while (!done) Line 519  while (!done)
519    timing, showing, or debugging options, nor the ability to pass over    timing, showing, or debugging options, nor the ability to pass over
520    local character tables. */    local character tables. */
521    
522    #if !defined NOPOSIX
523    if (posix || do_posix)    if (posix || do_posix)
524      {      {
525      int rc;      int rc;
# Line 487  while (!done) Line 542  while (!done)
542    /* Handle compiling via the native interface */    /* Handle compiling via the native interface */
543    
544    else    else
545    #endif  /* !defined NOPOSIX */
546    
547      {      {
548      if (timeit)      if (timeit)
549        {        {
# Line 499  while (!done) Line 556  while (!done)
556          if (re != NULL) free(re);          if (re != NULL) free(re);
557          }          }
558        time_taken = clock() - start_time;        time_taken = clock() - start_time;
559        fprintf(outfile, "Compile time %.2f milliseconds\n",        fprintf(outfile, "Compile time %.3f milliseconds\n",
560          ((double)time_taken)/(4 * CLOCKS_PER_SEC));          ((double)time_taken * 1000.0) /
561            ((double)LOOPREPEAT * (double)CLOCKS_PER_SEC));
562        }        }
563    
564      re = pcre_compile((char *)p, options, &error, &erroroffset, tables);      re = pcre_compile((char *)p, options, &error, &erroroffset, tables);
# Line 530  while (!done) Line 588  while (!done)
588        goto CONTINUE;        goto CONTINUE;
589        }        }
590    
591      /* Compilation succeeded; print data if required */      /* Compilation succeeded; print data if required. There are now two
592        info-returning functions. The old one has a limited interface and
593        returns only limited data. Check that it agrees with the newer one. */
594    
595      if (do_showinfo)      if (do_showinfo)
596        {        {
597        int first_char, count;        int old_first_char, old_options, old_count;
598          int count, backrefmax, first_char, need_char;
599        if (do_debug) print_internals(re, outfile);        size_t size;
600    
601          if (do_debug) print_internals(re);
602    
603          new_info(re, NULL, PCRE_INFO_OPTIONS, &options);
604          new_info(re, NULL, PCRE_INFO_SIZE, &size);
605          new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
606          new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);
607          new_info(re, NULL, PCRE_INFO_FIRSTCHAR, &first_char);
608          new_info(re, NULL, PCRE_INFO_LASTLITERAL, &need_char);
609    
610        count = pcre_info(re, &options, &first_char);        old_count = pcre_info(re, &old_options, &old_first_char);
611        if (count < 0) fprintf(outfile,        if (count < 0) fprintf(outfile,
612          "Error %d while reading info\n", count);          "Error %d from pcre_info()\n", count);
613        else        else
614          {          {
615          fprintf(outfile, "Identifying subpattern count = %d\n", count);          if (old_count != count) fprintf(outfile,
616          if (options == 0) fprintf(outfile, "No options\n");            "Count disagreement: pcre_fullinfo=%d pcre_info=%d\n", count,
617            else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s\n",              old_count);
618              ((options & PCRE_ANCHORED) != 0)? " anchored" : "",  
619              ((options & PCRE_CASELESS) != 0)? " caseless" : "",          if (old_first_char != first_char) fprintf(outfile,
620              ((options & PCRE_EXTENDED) != 0)? " extended" : "",            "First char disagreement: pcre_fullinfo=%d pcre_info=%d\n",
621              ((options & PCRE_MULTILINE) != 0)? " multiline" : "",              first_char, old_first_char);
622              ((options & PCRE_DOTALL) != 0)? " dotall" : "",  
623              ((options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",          if (old_options != options) fprintf(outfile,
624              ((options & PCRE_EXTRA) != 0)? " extra" : "",            "Options disagreement: pcre_fullinfo=%d pcre_info=%d\n", options,
625              ((options & PCRE_UNGREEDY) != 0)? " ungreedy" : "");              old_options);
626          if (first_char == -1)          }
627            {  
628            fprintf(outfile, "First char at start or follows \\n\n");        if (size != gotten_store) fprintf(outfile,
629            }          "Size disagreement: pcre_fullinfo=%d call to malloc for %d\n",
630          else if (first_char < 0)          size, gotten_store);
631            {  
632            fprintf(outfile, "No first char\n");        fprintf(outfile, "Capturing subpattern count = %d\n", count);
633            }        if (backrefmax > 0)
634            fprintf(outfile, "Max back reference = %d\n", backrefmax);
635          if (options == 0) fprintf(outfile, "No options\n");
636            else fprintf(outfile, "Options:%s%s%s%s%s%s%s%s\n",
637              ((options & PCRE_ANCHORED) != 0)? " anchored" : "",
638              ((options & PCRE_CASELESS) != 0)? " caseless" : "",
639              ((options & PCRE_EXTENDED) != 0)? " extended" : "",
640              ((options & PCRE_MULTILINE) != 0)? " multiline" : "",
641              ((options & PCRE_DOTALL) != 0)? " dotall" : "",
642              ((options & PCRE_DOLLAR_ENDONLY) != 0)? " dollar_endonly" : "",
643              ((options & PCRE_EXTRA) != 0)? " extra" : "",
644              ((options & PCRE_UNGREEDY) != 0)? " ungreedy" : "");
645    
646          if (((((real_pcre *)re)->options) & PCRE_ICHANGED) != 0)
647            fprintf(outfile, "Case state changes\n");
648    
649          if (first_char == -1)
650            {
651            fprintf(outfile, "First char at start or follows \\n\n");
652            }
653          else if (first_char < 0)
654            {
655            fprintf(outfile, "No first char\n");
656            }
657          else
658            {
659            if (isprint(first_char))
660              fprintf(outfile, "First char = \'%c\'\n", first_char);
661          else          else
662            {            fprintf(outfile, "First char = %d\n", first_char);
663            if (isprint(first_char))          }
664              fprintf(outfile, "First char = \'%c\'\n", first_char);  
665            else        if (need_char < 0)
666              fprintf(outfile, "First char = %d\n", first_char);          {
667            }          fprintf(outfile, "No need char\n");
668            }
669          else
670            {
671            if (isprint(need_char))
672              fprintf(outfile, "Need char = \'%c\'\n", need_char);
673            else
674              fprintf(outfile, "Need char = %d\n", need_char);
675          }          }
676        }        }
677    
# Line 586  while (!done) Line 689  while (!done)
689            extra = pcre_study(re, study_options, &error);            extra = pcre_study(re, study_options, &error);
690          time_taken = clock() - start_time;          time_taken = clock() - start_time;
691          if (extra != NULL) free(extra);          if (extra != NULL) free(extra);
692          fprintf(outfile, "  Study time %.2f milliseconds\n",          fprintf(outfile, "  Study time %.3f milliseconds\n",
693            ((double)time_taken)/(4 * CLOCKS_PER_SEC));            ((double)time_taken * 1000.0)/
694              ((double)LOOPREPEAT * (double)CLOCKS_PER_SEC));
695          }          }
696    
697        extra = pcre_study(re, study_options, &error);        extra = pcre_study(re, study_options, &error);
# Line 596  while (!done) Line 700  while (!done)
700        else if (extra == NULL)        else if (extra == NULL)
701          fprintf(outfile, "Study returned NULL\n");          fprintf(outfile, "Study returned NULL\n");
702    
       /* This looks at internal information. A bit kludgy to do it this  
       way, but it is useful for testing. */  
   
703        else if (do_showinfo)        else if (do_showinfo)
704          {          {
705          real_pcre_extra *xx = (real_pcre_extra *)extra;          uschar *start_bits = NULL;
706          if ((xx->options & PCRE_STUDY_MAPPED) == 0)          new_info(re, extra, PCRE_INFO_FIRSTTABLE, &start_bits);
707            if (start_bits == NULL)
708            fprintf(outfile, "No starting character set\n");            fprintf(outfile, "No starting character set\n");
709          else          else
710            {            {
# Line 611  while (!done) Line 713  while (!done)
713            fprintf(outfile, "Starting character set: ");            fprintf(outfile, "Starting character set: ");
714            for (i = 0; i < 256; i++)            for (i = 0; i < 256; i++)
715              {              {
716              if ((xx->start_bits[i/8] & (1<<(i%8))) != 0)              if ((start_bits[i/8] & (1<<(i%8))) != 0)
717                {                {
718                if (c > 75)                if (c > 75)
719                  {                  {
# Line 641  while (!done) Line 743  while (!done)
743    for (;;)    for (;;)
744      {      {
745      unsigned char *q;      unsigned char *q;
746        unsigned char *bptr = dbuffer;
747      int count, c;      int count, c;
748        int copystrings = 0;
749        int getstrings = 0;
750        int getlist = 0;
751        int gmatched = 0;
752        int start_offset = 0;
753        int g_notempty = 0;
754      int offsets[45];      int offsets[45];
755      int size_offsets = sizeof(offsets)/sizeof(int);      int size_offsets = sizeof(offsets)/sizeof(int);
756    
757      options = 0;      options = 0;
758    
759      if (infile == stdin) printf("  data> ");      if (infile == stdin) printf("data> ");
760      if (fgets((char *)buffer, sizeof(buffer), infile) == NULL)      if (fgets((char *)buffer, sizeof(buffer), infile) == NULL)
761        {        {
762        done = 1;        done = 1;
# Line 707  while (!done) Line 816  while (!done)
816          options |= PCRE_NOTBOL;          options |= PCRE_NOTBOL;
817          continue;          continue;
818    
819            case 'C':
820            while(isdigit(*p)) n = n * 10 + *p++ - '0';
821            copystrings |= 1 << n;
822            continue;
823    
824            case 'G':
825            while(isdigit(*p)) n = n * 10 + *p++ - '0';
826            getstrings |= 1 << n;
827            continue;
828    
829            case 'L':
830            getlist = 1;
831            continue;
832    
833            case 'N':
834            options |= PCRE_NOTEMPTY;
835            continue;
836    
837          case 'O':          case 'O':
838          while(isdigit(*p)) n = n * 10 + *p++ - '0';          while(isdigit(*p)) n = n * 10 + *p++ - '0';
839          if (n <= (int)(sizeof(offsets)/sizeof(int))) size_offsets = n;          if (n <= (int)(sizeof(offsets)/sizeof(int))) size_offsets = n;
# Line 724  while (!done) Line 851  while (!done)
851      /* Handle matching via the POSIX interface, which does not      /* Handle matching via the POSIX interface, which does not
852      support timing. */      support timing. */
853    
854    #if !defined NOPOSIX
855      if (posix || do_posix)      if (posix || do_posix)
856        {        {
857        int rc;        int rc;
858        int eflags = 0;        int eflags = 0;
859        regmatch_t pmatch[30];        regmatch_t pmatch[sizeof(offsets)/sizeof(int)];
860        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;        if ((options & PCRE_NOTBOL) != 0) eflags |= REG_NOTBOL;
861        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;        if ((options & PCRE_NOTEOL) != 0) eflags |= REG_NOTEOL;
862    
863        rc = regexec(&preg, (char *)dbuffer, sizeof(pmatch)/sizeof(regmatch_t),        rc = regexec(&preg, (const char *)bptr, size_offsets, pmatch, eflags);
         pmatch, eflags);  
864    
865        if (rc != 0)        if (rc != 0)
866          {          {
# Line 743  while (!done) Line 870  while (!done)
870        else        else
871          {          {
872          size_t i;          size_t i;
873          for (i = 0; i < sizeof(pmatch)/sizeof(regmatch_t); i++)          for (i = 0; i < size_offsets; i++)
874            {            {
875            if (pmatch[i].rm_so >= 0)            if (pmatch[i].rm_so >= 0)
876              {              {
# Line 751  while (!done) Line 878  while (!done)
878              pchars(dbuffer + pmatch[i].rm_so,              pchars(dbuffer + pmatch[i].rm_so,
879                pmatch[i].rm_eo - pmatch[i].rm_so);                pmatch[i].rm_eo - pmatch[i].rm_so);
880              fprintf(outfile, "\n");              fprintf(outfile, "\n");
881                if (i == 0 && do_showrest)
882                  {
883                  fprintf(outfile, " 0+ ");
884                  pchars(dbuffer + pmatch[i].rm_eo, len - pmatch[i].rm_eo);
885                  fprintf(outfile, "\n");
886                  }
887              }              }
888            }            }
889          }          }
890        }        }
891    
892      /* Handle matching via the native interface */      /* Handle matching via the native interface - repeats for /g and /G */
893    
894      else      else
895    #endif  /* !defined NOPOSIX */
896    
897        for (;; gmatched++)    /* Loop for /g or /G */
898        {        {
899        if (timeit)        if (timeit)
900          {          {
901          register int i;          register int i;
902          clock_t time_taken;          clock_t time_taken;
903          clock_t start_time = clock();          clock_t start_time = clock();
904          for (i = 0; i < 4000; i++)          for (i = 0; i < LOOPREPEAT; i++)
905            count = pcre_exec(re, extra, (char *)dbuffer, len, options, offsets,            count = pcre_exec(re, extra, (char *)bptr, len,
906              size_offsets);              start_offset, options | g_notempty, offsets, size_offsets);
907          time_taken = clock() - start_time;          time_taken = clock() - start_time;
908          fprintf(outfile, "Execute time %.2f milliseconds\n",          fprintf(outfile, "Execute time %.3f milliseconds\n",
909            ((double)time_taken)/(4 * CLOCKS_PER_SEC));            ((double)time_taken * 1000.0)/
910              ((double)LOOPREPEAT * (double)CLOCKS_PER_SEC));
911          }          }
912    
913        count = pcre_exec(re, extra, (char *)dbuffer, len, options, offsets,        count = pcre_exec(re, extra, (char *)bptr, len,
914          size_offsets);          start_offset, options | g_notempty, offsets, size_offsets);
915    
916        if (count == 0)        if (count == 0)
917          {          {
# Line 782  while (!done) Line 919  while (!done)
919          count = size_offsets/3;          count = size_offsets/3;
920          }          }
921    
922          /* Matched */
923    
924        if (count >= 0)        if (count >= 0)
925          {          {
926          int i;          int i;
927          count *= 2;          for (i = 0; i < count * 2; i += 2)
         for (i = 0; i < count; i += 2)  
928            {            {
929            if (offsets[i] < 0)            if (offsets[i] < 0)
930              fprintf(outfile, "%2d: <unset>\n", i/2);              fprintf(outfile, "%2d: <unset>\n", i/2);
931            else            else
932              {              {
933              fprintf(outfile, "%2d: ", i/2);              fprintf(outfile, "%2d: ", i/2);
934              pchars(dbuffer + offsets[i], offsets[i+1] - offsets[i]);              pchars(bptr + offsets[i], offsets[i+1] - offsets[i]);
935              fprintf(outfile, "\n");              fprintf(outfile, "\n");
936                if (i == 0)
937                  {
938                  if (do_showrest)
939                    {
940                    fprintf(outfile, " 0+ ");
941                    pchars(bptr + offsets[i+1], len - offsets[i+1]);
942                    fprintf(outfile, "\n");
943                    }
944                  }
945                }
946              }
947    
948            for (i = 0; i < 32; i++)
949              {
950              if ((copystrings & (1 << i)) != 0)
951                {
952                char copybuffer[16];
953                int rc = pcre_copy_substring((char *)bptr, offsets, count,
954                  i, copybuffer, sizeof(copybuffer));
955                if (rc < 0)
956                  fprintf(outfile, "copy substring %d failed %d\n", i, rc);
957                else
958                  fprintf(outfile, "%2dC %s (%d)\n", i, copybuffer, rc);
959                }
960              }
961    
962            for (i = 0; i < 32; i++)
963              {
964              if ((getstrings & (1 << i)) != 0)
965                {
966                const char *substring;
967                int rc = pcre_get_substring((char *)bptr, offsets, count,
968                  i, &substring);
969                if (rc < 0)
970                  fprintf(outfile, "get substring %d failed %d\n", i, rc);
971                else
972                  {
973                  fprintf(outfile, "%2dG %s (%d)\n", i, substring, rc);
974                  free((void *)substring);
975                  }
976                }
977              }
978    
979            if (getlist)
980              {
981              const char **stringlist;
982              int rc = pcre_get_substring_list((char *)bptr, offsets, count,
983                &stringlist);
984              if (rc < 0)
985                fprintf(outfile, "get substring list failed %d\n", rc);
986              else
987                {
988                for (i = 0; i < count; i++)
989                  fprintf(outfile, "%2dL %s\n", i, stringlist[i]);
990                if (stringlist[i] != NULL)
991                  fprintf(outfile, "string list not terminated by NULL\n");
992                free((void *)stringlist);
993              }              }
994            }            }
995          }          }
996    
997          /* Failed to match. If this is a /g or /G loop and we previously set
998          PCRE_NOTEMPTY after a null match, this is not necessarily the end.
999          We want to advance the start offset, and continue. Fudge the offset
1000          values to achieve this. We won't be at the end of the string - that
1001          was checked before setting PCRE_NOTEMPTY. */
1002    
1003        else        else
1004          {          {
1005          if (count == -1) fprintf(outfile, "No match\n");          if (g_notempty != 0)
1006            else fprintf(outfile, "Error %d\n", count);            {
1007              offsets[0] = start_offset;
1008              offsets[1] = start_offset + 1;
1009              }
1010            else
1011              {
1012              if (gmatched == 0)   /* Error if no previous matches */
1013                {
1014                if (count == -1) fprintf(outfile, "No match\n");
1015                  else fprintf(outfile, "Error %d\n", count);
1016                }
1017              break;  /* Out of the /g loop */
1018              }
1019          }          }
1020        }  
1021      }        /* If not /g or /G we are done */
1022    
1023          if (!do_g && !do_G) break;
1024    
1025          /* If we have matched an empty string, first check to see if we are at
1026          the end of the subject. If so, the /g loop is over. Otherwise, mimic
1027          what Perl's /g options does. This turns out to be rather cunning. First
1028          we set PCRE_NOTEMPTY and try the match again at the same point. If this
1029          fails (picked up above) we advance to the next character. */
1030    
1031          g_notempty = 0;
1032          if (offsets[0] == offsets[1])
1033            {
1034            if (offsets[0] == len) break;
1035            g_notempty = PCRE_NOTEMPTY;
1036            }
1037    
1038          /* For /g, update the start offset, leaving the rest alone */
1039    
1040          if (do_g) start_offset = offsets[1];
1041    
1042          /* For /G, update the pointer and length */
1043    
1044          else
1045            {
1046            bptr += offsets[1];
1047            len -= offsets[1];
1048            }
1049          }  /* End of loop for /g and /G */
1050        }    /* End of loop for data lines */
1051    
1052    CONTINUE:    CONTINUE:
1053    
1054    #if !defined NOPOSIX
1055    if (posix || do_posix) regfree(&preg);    if (posix || do_posix) regfree(&preg);
1056    #endif
1057    
1058    if (re != NULL) free(re);    if (re != NULL) free(re);
1059    if (extra != NULL) free(extra);    if (extra != NULL) free(extra);
1060    if (tables != NULL)    if (tables != NULL)

Legend:
Removed from v.25  
changed lines
  Added in v.43

  ViewVC Help
Powered by ViewVC 1.1.5