/[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 411 by ph10, Fri Apr 10 15:40:21 2009 UTC revision 412 by ph10, Sat Apr 11 10:34:37 2009 UTC
# Line 1325  while (!done) Line 1325  while (!done)
1325  #endif  /* !defined NOPOSIX */  #endif  /* !defined NOPOSIX */
1326    
1327      {      {
1328        unsigned long int get_options;
1329    
1330      if (timeit > 0)      if (timeit > 0)
1331        {        {
1332        register int i;        register int i;
# Line 1367  while (!done) Line 1369  while (!done)
1369          }          }
1370        goto CONTINUE;        goto CONTINUE;
1371        }        }
1372    
1373      /* Compilation succeeded; print data if required. There are now two      /* Compilation succeeded. It is now possible to set the UTF-8 option from
1374      info-returning functions. The old one has a limited interface and      within the regex; check for this so that we know how to process the data
1375      returns only limited data. Check that it agrees with the newer one. */      lines. */
1376    
1377        new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);
1378        if ((get_options & PCRE_UTF8) != 0) use_utf8 = 1;
1379    
1380        /* Print information if required. There are now two info-returning
1381        functions. The old one has a limited interface and returns only limited
1382        data. Check that it agrees with the newer one. */
1383    
1384      if (log_store)      if (log_store)
1385        fprintf(outfile, "Memory allocation (code space): %d\n",        fprintf(outfile, "Memory allocation (code space): %d\n",
# Line 1454  while (!done) Line 1463  while (!done)
1463        fprintf(outfile, "------------------------------------------------------------------\n");        fprintf(outfile, "------------------------------------------------------------------\n");
1464        pcre_printint(re, outfile, debug_lengths);        pcre_printint(re, outfile, debug_lengths);
1465        }        }
1466    
1467        /* We already have the options in get_options (see above) */
1468    
1469      if (do_showinfo)      if (do_showinfo)
1470        {        {
1471        unsigned long int get_options, all_options;        unsigned long int all_options;
1472  #if !defined NOINFOCHECK  #if !defined NOINFOCHECK
1473        int old_first_char, old_options, old_count;        int old_first_char, old_options, old_count;
1474  #endif  #endif
# Line 1466  while (!done) Line 1477  while (!done)
1477        int nameentrysize, namecount;        int nameentrysize, namecount;
1478        const uschar *nametable;        const uschar *nametable;
1479    
       new_info(re, NULL, PCRE_INFO_OPTIONS, &get_options);  
1480        new_info(re, NULL, PCRE_INFO_SIZE, &size);        new_info(re, NULL, PCRE_INFO_SIZE, &size);
1481        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);        new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
1482        new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);        new_info(re, NULL, PCRE_INFO_BACKREFMAX, &backrefmax);
Legend:
Removed from v.411  
changed lines
  Added in v.412
  ViewVC Help
Powered by ViewVC 1.1.5