/[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 416 by ph10, Sat Apr 11 14:34:02 2009 UTC revision 442 by ph10, Fri Sep 11 10:21:02 2009 UTC
# Line 1305  while (!done) Line 1305  while (!done)
1305      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;      if ((options & PCRE_DOTALL) != 0) cflags |= REG_DOTALL;
1306      if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;      if ((options & PCRE_NO_AUTO_CAPTURE) != 0) cflags |= REG_NOSUB;
1307      if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;      if ((options & PCRE_UTF8) != 0) cflags |= REG_UTF8;
1308        if ((options & PCRE_UNGREEDY) != 0) cflags |= REG_UNGREEDY;
1309    
1310      rc = regcomp(&preg, (char *)p, cflags);      rc = regcomp(&preg, (char *)p, cflags);
1311    
# Line 1969  while (!done) Line 1970  while (!done)
1970          continue;          continue;
1971    
1972          case 'N':          case 'N':
1973          options |= PCRE_NOTEMPTY;          if ((options & PCRE_NOTEMPTY) != 0)
1974              options = (options & ~PCRE_NOTEMPTY) | PCRE_NOTEMPTY_ATSTART;
1975            else
1976              options |= PCRE_NOTEMPTY;
1977          continue;          continue;
1978    
1979          case 'O':          case 'O':
# Line 1992  while (!done) Line 1996  while (!done)
1996          continue;          continue;
1997    
1998          case 'P':          case 'P':
1999          options |= PCRE_PARTIAL;          options |= ((options & PCRE_PARTIAL_SOFT) == 0)?
2000              PCRE_PARTIAL_SOFT : PCRE_PARTIAL_HARD;
2001          continue;          continue;
2002    
2003          case 'Q':          case 'Q':
# Line 2363  while (!done) Line 2368  while (!done)
2368        else if (count == PCRE_ERROR_PARTIAL)        else if (count == PCRE_ERROR_PARTIAL)
2369          {          {
2370          fprintf(outfile, "Partial match");          fprintf(outfile, "Partial match");
2371  #if !defined NODFA          if (use_size_offsets > 1)
2372          if ((all_use_dfa || use_dfa) && use_size_offsets > 2)            {
2373            fprintf(outfile, ": %.*s", use_offsets[1] - use_offsets[0],            fprintf(outfile, ": ");
2374              bptr + use_offsets[0]);            pchars(bptr + use_offsets[0], use_offsets[1] - use_offsets[0],
2375  #endif              outfile);
2376              }
2377          fprintf(outfile, "\n");          fprintf(outfile, "\n");
2378          break;  /* Out of the /g loop */          break;  /* Out of the /g loop */
2379          }          }
# Line 2440  while (!done) Line 2446  while (!done)
2446        if (!do_g && !do_G) break;        if (!do_g && !do_G) break;
2447    
2448        /* If we have matched an empty string, first check to see if we are at        /* If we have matched an empty string, first check to see if we are at
2449        the end of the subject. If so, the /g loop is over. Otherwise, mimic        the end of the subject. If so, the /g loop is over. Otherwise, mimic what
2450        what Perl's /g options does. This turns out to be rather cunning. First        Perl's /g options does. This turns out to be rather cunning. First we set
2451        we set PCRE_NOTEMPTY and PCRE_ANCHORED and try the match again at the        PCRE_NOTEMPTY_ATSTART and PCRE_ANCHORED and try the match again at the
2452        same point. If this fails (picked up above) we advance to the next        same point. If this fails (picked up above) we advance to the next
2453        character. */        character. */
2454    
# Line 2451  while (!done) Line 2457  while (!done)
2457        if (use_offsets[0] == use_offsets[1])        if (use_offsets[0] == use_offsets[1])
2458          {          {
2459          if (use_offsets[0] == len) break;          if (use_offsets[0] == len) break;
2460          g_notempty = PCRE_NOTEMPTY | PCRE_ANCHORED;          g_notempty = PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED;
2461          }          }
2462    
2463        /* For /g, update the start offset, leaving the rest alone */        /* For /g, update the start offset, leaving the rest alone */

Legend:
Removed from v.416  
changed lines
  Added in v.442

  ViewVC Help
Powered by ViewVC 1.1.5