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

Diff of /code/trunk/pcre_exec.c

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

revision 366 by ph10, Mon Jul 14 15:45:32 2008 UTC revision 371 by ph10, Mon Aug 25 18:28:05 2008 UTC
# Line 2613  for (;;) Line 2613  for (;;)
2613              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
2614              if (d < 256) d = md->lcc[d];              if (d < 256) d = md->lcc[d];
2615              if (fc == d) RRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
2616    
2617              }              }
2618            }            }
2619          else          else
# Line 2721  for (;;) Line 2721  for (;;)
2721              if (rrc != MATCH_NOMATCH) RRETURN(rrc);              if (rrc != MATCH_NOMATCH) RRETURN(rrc);
2722              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);              if (fi >= max || eptr >= md->end_subject) RRETURN(MATCH_NOMATCH);
2723              GETCHARINC(d, eptr);              GETCHARINC(d, eptr);
2724              if (fc == d) RRETURN(MATCH_NOMATCH);              if (fc == d) RRETURN(MATCH_NOMATCH);
2725              }              }
2726            }            }
2727          else          else
# Line 4699  for(;;) Line 4699  for(;;)
4699      USPTR t = start_match;      USPTR t = start_match;
4700  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
4701      if (utf8)      if (utf8)
4702        {        {
4703        while (t < md->end_subject && !IS_NEWLINE(t))        while (t < md->end_subject && !IS_NEWLINE(t))
4704          {          {
4705          t++;          t++;
4706          while (t < end_subject && (*t & 0xc0) == 0x80) t++;          while (t < end_subject && (*t & 0xc0) == 0x80) t++;
4707          }          }
4708        }        }
4709      else      else
4710  #endif  #endif
4711      while (t < md->end_subject && !IS_NEWLINE(t)) t++;      while (t < md->end_subject && !IS_NEWLINE(t)) t++;
4712      end_subject = t;      end_subject = t;
4713      }      }
# Line 4735  for(;;) Line 4735  for(;;)
4735          {          {
4736          while (start_match < end_subject && !WAS_NEWLINE(start_match))          while (start_match < end_subject && !WAS_NEWLINE(start_match))
4737            {            {
4738            start_match++;            start_match++;
4739            while(start_match < end_subject && (*start_match & 0xc0) == 0x80)            while(start_match < end_subject && (*start_match & 0xc0) == 0x80)
4740              start_match++;              start_match++;
4741            }            }
4742          }          }
4743        else        else
4744  #endif  #endif
4745        while (start_match < end_subject && !WAS_NEWLINE(start_match))        while (start_match < end_subject && !WAS_NEWLINE(start_match))
4746          start_match++;          start_match++;
4747    
4748        /* If we have just passed a CR and the newline option is ANY or ANYCRLF,        /* If we have just passed a CR and the newline option is ANY or ANYCRLF,
4749        and we are now at a LF, advance the match position by one more character.        and we are now at a LF, advance the match position by one more character.
4750        */        */
# Line 4840  for(;;) Line 4840  for(;;)
4840      }      }
4841    
4842    /* OK, we can now run the match. */    /* OK, we can now run the match. */
4843    
4844    md->start_match_ptr = start_match;    md->start_match_ptr = start_match;
4845    md->match_call_count = 0;    md->match_call_count = 0;
4846    rc = match(start_match, md->start_code, start_match, 2, md, ims, NULL, 0, 0);    rc = match(start_match, md->start_code, start_match, 2, md, ims, NULL, 0, 0);
Legend:
Removed from v.366  
changed lines
  Added in v.371
  ViewVC Help
Powered by ViewVC 1.1.5