/[pcre]/code/trunk/pcre_internal.h
ViewVC logotype

Diff of /code/trunk/pcre_internal.h

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

revision 1414 by zherczeg, Sun Dec 22 16:27:35 2013 UTC revision 1425 by ph10, Tue Dec 31 17:44:40 2013 UTC
# Line 316  start/end of string field names are. */ Line 316  start/end of string field names are. */
316         &(NLBLOCK->nllen), utf)) \         &(NLBLOCK->nllen), utf)) \
317      : \      : \
318      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \      ((p) <= NLBLOCK->PSEND - NLBLOCK->nllen && \
319       RAWUCHARTEST(p) == NLBLOCK->nl[0] && \       *p == NLBLOCK->nl[0] && (NLBLOCK->nllen == 1 || p[1] == NLBLOCK->nl[1]) \
      (NLBLOCK->nllen == 1 || RAWUCHARTEST(p+1) == NLBLOCK->nl[1])       \  
320      ) \      ) \
321    )    )
322    
# Line 330  start/end of string field names are. */ Line 329  start/end of string field names are. */
329         &(NLBLOCK->nllen), utf)) \         &(NLBLOCK->nllen), utf)) \
330      : \      : \
331      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \      ((p) >= NLBLOCK->PSSTART + NLBLOCK->nllen && \
332       RAWUCHARTEST(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \       *(p - NLBLOCK->nllen) == NLBLOCK->nl[0] &&              \
333       (NLBLOCK->nllen == 1 || RAWUCHARTEST(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \       (NLBLOCK->nllen == 1 || *(p - NLBLOCK->nllen + 1) == NLBLOCK->nl[1]) \
334      ) \      ) \
335    )    )
336    
# Line 600  we don't even define them. */ Line 599  we don't even define them. */
599  #define GETCHARINC(c, eptr) c = *eptr++;  #define GETCHARINC(c, eptr) c = *eptr++;
600  #define GETCHARINCTEST(c, eptr) c = *eptr++;  #define GETCHARINCTEST(c, eptr) c = *eptr++;
601  #define GETCHARLEN(c, eptr, len) c = *eptr;  #define GETCHARLEN(c, eptr, len) c = *eptr;
 #define RAWUCHAR(eptr) (*(eptr))  
 #define RAWUCHARINC(eptr) (*(eptr)++)  
 #define RAWUCHARTEST(eptr) (*(eptr))  
 #define RAWUCHARINCTEST(eptr) (*(eptr)++)  
602  /* #define GETCHARLENTEST(c, eptr, len) */  /* #define GETCHARLENTEST(c, eptr, len) */
603  /* #define BACKCHAR(eptr) */  /* #define BACKCHAR(eptr) */
604  /* #define FORWARDCHAR(eptr) */  /* #define FORWARDCHAR(eptr) */
# Line 776  do not know if we are in UTF-8 mode. */ Line 771  do not know if we are in UTF-8 mode. */
771    c = *eptr; \    c = *eptr; \
772    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);    if (utf && c >= 0xc0) GETUTF8LEN(c, eptr, len);
773    
 /* Returns the next uchar, not advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHAR(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHARINC(eptr) \  
   (*((eptr)++))  
   
 /* Returns the next uchar, testing for UTF mode, and not advancing the  
 pointer. */  
   
 #define RAWUCHARTEST(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, testing for UTF mode, advancing the  
 pointer. */  
   
 #define RAWUCHARINCTEST(eptr) \  
   (*((eptr)++))  
   
774  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
775  it is. This is called only in UTF-8 mode - we don't put a test within the macro  it is. This is called only in UTF-8 mode - we don't put a test within the macro
776  because almost all calls are already within a block of UTF-8 only code. */  because almost all calls are already within a block of UTF-8 only code. */
# Line 895  we do not know if we are in UTF-16 mode. Line 866  we do not know if we are in UTF-16 mode.
866    c = *eptr; \    c = *eptr; \
867    if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);    if (utf && (c & 0xfc00) == 0xd800) GETUTF16LEN(c, eptr, len);
868    
 /* Returns the next uchar, not advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHAR(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHARINC(eptr) \  
   (*((eptr)++))  
   
 /* Returns the next uchar, testing for UTF mode, and not advancing the  
 pointer. */  
   
 #define RAWUCHARTEST(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, testing for UTF mode, advancing the  
 pointer. */  
   
 #define RAWUCHARINCTEST(eptr) \  
   (*((eptr)++))  
   
869  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
870  it is. This is called only in UTF-16 mode - we don't put a test within the  it is. This is called only in UTF-16 mode - we don't put a test within the
871  macro because almost all calls are already within a block of UTF-16 only  macro because almost all calls are already within a block of UTF-16 only
# Line 980  This is called when we do not know if we Line 927  This is called when we do not know if we
927  #define GETCHARLENTEST(c, eptr, len) \  #define GETCHARLENTEST(c, eptr, len) \
928    GETCHARTEST(c, eptr)    GETCHARTEST(c, eptr)
929    
 /* Returns the next uchar, not advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHAR(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, advancing the pointer. This is called when  
 we know we are in UTF mode. */  
   
 #define RAWUCHARINC(eptr) \  
   (*((eptr)++))  
   
 /* Returns the next uchar, testing for UTF mode, and not advancing the  
 pointer. */  
   
 #define RAWUCHARTEST(eptr) \  
   (*(eptr))  
   
 /* Returns the next uchar, testing for UTF mode, advancing the  
 pointer. */  
   
 #define RAWUCHARINCTEST(eptr) \  
   (*((eptr)++))  
   
930  /* If the pointer is not at the start of a character, move it back until  /* If the pointer is not at the start of a character, move it back until
931  it is. This is called only in UTF-32 mode - we don't put a test within the  it is. This is called only in UTF-32 mode - we don't put a test within the
932  macro because almost all calls are already within a block of UTF-32 only  macro because almost all calls are already within a block of UTF-32 only

Legend:
Removed from v.1414  
changed lines
  Added in v.1425

  ViewVC Help
Powered by ViewVC 1.1.5