[BACK]Return to regex2.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libc / regex

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libc/regex/regex2.h between version 1.12 and 1.13

version 1.12, 2009/02/12 05:06:54 version 1.13, 2011/10/09 18:23:00
Line 110 
Line 110 
  * immediately *preceding* "execution" of that operator.   * immediately *preceding* "execution" of that operator.
  */   */
 typedef u_int32_t sop;  /* strip operator */  typedef u_int32_t sop;  /* strip operator */
 typedef int sopno;  typedef size_t sopno;
 #define OPRMASK ((u_int32_t)0xf8000000UL)  #define OPRMASK ((u_int32_t)0xf8000000UL)
 #define OPDMASK ((u_int32_t)0x07ffffffUL)  #define OPDMASK ((u_int32_t)0x07ffffffUL)
 #define OPSHIFT ((unsigned)27)  #define OPSHIFT ((unsigned)27)
Line 179  struct re_guts {
Line 179  struct re_guts {
         int magic;          int magic;
 #               define  MAGIC2  ((('R'^0200)<<8)|'E')  #               define  MAGIC2  ((('R'^0200)<<8)|'E')
         sop *strip;             /* malloced area for strip */          sop *strip;             /* malloced area for strip */
         int csetsize;           /* number of bits in a cset vector */          size_t csetsize;        /* number of bits in a cset vector */
         int ncsets;             /* number of csets in use */          size_t ncsets;          /* number of csets in use */
         cset *sets;             /* -> cset [ncsets] */          cset *sets;             /* -> cset [ncsets] */
         uch *setbits;           /* -> uch[csetsize][ncsets/CHAR_BIT] */          uch *setbits;           /* -> uch[csetsize][ncsets/CHAR_BIT] */
         int cflags;             /* copy of regcomp() cflags argument */          int cflags;             /* copy of regcomp() cflags argument */
Line 191  struct re_guts {
Line 191  struct re_guts {
 #               define  USEBOL  01      /* used ^ */  #               define  USEBOL  01      /* used ^ */
 #               define  USEEOL  02      /* used $ */  #               define  USEEOL  02      /* used $ */
 #               define  BAD     04      /* something wrong */  #               define  BAD     04      /* something wrong */
         int nbol;               /* number of ^ used */          size_t nbol;            /* number of ^ used */
         int neol;               /* number of $ used */          size_t neol;            /* number of $ used */
         int ncategories;        /* how many character categories */          size_t ncategories;     /* how many character categories */
         cat_t *categories;      /* ->catspace[-CHAR_MIN] */          cat_t *categories;      /* ->catspace[-CHAR_MIN] */
         char *must;             /* match must contain this string */          char *must;             /* match must contain this string */
         int mlen;               /* length of must */          size_t mlen;            /* length of must */
         size_t nsub;            /* copy of re_nsub */          size_t nsub;            /* copy of re_nsub */
         int backrefs;           /* does it use back references? */          int backrefs;           /* does it use back references? */
         sopno nplus;            /* how deep does it nest +s? */          sopno nplus;            /* how deep does it nest +s? */

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13

CVSweb <webmaster@jp.NetBSD.org>