/[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 402 by ph10, Sat Mar 21 17:26:03 2009 UTC revision 406 by ph10, Mon Mar 23 12:05:43 2009 UTC
# Line 334  typedef struct heapframe { Line 334  typedef struct heapframe {
334    /* Function local variables */    /* Function local variables */
335    
336    const uschar *Xcallpat;    const uschar *Xcallpat;
337  #ifdef SUPPORT_UTF8  #ifdef SUPPORT_UTF8
338    const uschar *Xcharptr;    const uschar *Xcharptr;
339  #endif  #endif
340    const uschar *Xdata;    const uschar *Xdata;
341    const uschar *Xnext;    const uschar *Xnext;
342    const uschar *Xpp;    const uschar *Xpp;
# Line 362  typedef struct heapframe { Line 362  typedef struct heapframe {
362    uschar Xocchars[8];    uschar Xocchars[8];
363  #endif  #endif
364    
365      int Xcodelink;
366    int Xctype;    int Xctype;
367    unsigned int Xfc;    unsigned int Xfc;
368    int Xfi;    int Xfi;
# Line 441  register unsigned int c;   /* Character Line 442  register unsigned int c;   /* Character
442  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */  register BOOL utf8;        /* Local copy of UTF-8 flag for speed */
443    
444  BOOL minimize, possessive; /* Quantifier options */  BOOL minimize, possessive; /* Quantifier options */
445    int condcode;
446    
447  /* When recursion is not being used, all "local" variables that have to be  /* When recursion is not being used, all "local" variables that have to be
448  preserved over calls to RMATCH() are part of a "frame" which is obtained from  preserved over calls to RMATCH() are part of a "frame" which is obtained from
# Line 483  HEAP_RECURSE: Line 485  HEAP_RECURSE:
485  #define charptr            frame->Xcharptr  #define charptr            frame->Xcharptr
486  #endif  #endif
487  #define callpat            frame->Xcallpat  #define callpat            frame->Xcallpat
488    #define codelink           frame->Xcodelink
489  #define data               frame->Xdata  #define data               frame->Xdata
490  #define next               frame->Xnext  #define next               frame->Xnext
491  #define pp                 frame->Xpp  #define pp                 frame->Xpp
# Line 564  uschar occhars[8]; Line 567  uschar occhars[8];
567  #endif  #endif
568    
569  int codelink;  int codelink;
 int condcode;  
570  int ctype;  int ctype;
571  int length;  int length;
572  int max;  int max;
# Line 639  for (;;) Line 641  for (;;)
641    {    {
642    minimize = possessive = FALSE;    minimize = possessive = FALSE;
643    op = *ecode;    op = *ecode;
644    
645    /* For partial matching, remember if we ever hit the end of the subject after    /* For partial matching, remember if we ever hit the end of the subject after
646    matching at least one subject character. */    matching at least one subject character. */
647    
# Line 792  for (;;) Line 794  for (;;)
794      case OP_COND:      case OP_COND:
795      case OP_SCOND:      case OP_SCOND:
796      codelink= GET(ecode, 1);      codelink= GET(ecode, 1);
797    
798      /* Because of the way auto-callout works during compile, a callout item is      /* Because of the way auto-callout works during compile, a callout item is
799      inserted between OP_COND and an assertion condition. */      inserted between OP_COND and an assertion condition. */
800    
# Line 820  for (;;) Line 822  for (;;)
822        }        }
823    
824      condcode = ecode[LINK_SIZE+1];      condcode = ecode[LINK_SIZE+1];
825    
826      /* Now see what the actual condition is */      /* Now see what the actual condition is */
827    
828      if (condcode == OP_RREF)         /* Recursion test */      if (condcode == OP_RREF)         /* Recursion test */

Legend:
Removed from v.402  
changed lines
  Added in v.406

  ViewVC Help
Powered by ViewVC 1.1.5