diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:00:45 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-08-14 18:00:45 (GMT) |
| commit | a733cde27c904a40aae56e93c7daa369e2a4d045 (patch) | |
| tree | 77fdf9d45381002ae272a660dd3090c4d9459dc5 /generic/regguts.h | |
| parent | 133a3b34b7419b202d6588f44871ea67176a5064 (diff) | |
| parent | 2b3657769b1d0b9ae6e10113b1d3c038b4967899 (diff) | |
| download | tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.zip tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.tar.gz tcl-a733cde27c904a40aae56e93c7daa369e2a4d045.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/regguts.h')
| -rw-r--r-- | generic/regguts.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/regguts.h b/generic/regguts.h index b4944dc..b478e4c 100644 --- a/generic/regguts.h +++ b/generic/regguts.h @@ -341,12 +341,12 @@ struct subre { #define CAP 010 /* capturing parens below */ #define BACKR 020 /* back reference below */ #define INUSE 0100 /* in use in final tree */ -#define LOCAL 03 /* bits which may not propagate up */ +#define NOPROP 03 /* bits which may not propagate up */ #define LMIX(f) ((f)<<2) /* LONGER -> MIXED */ #define SMIX(f) ((f)<<1) /* SHORTER -> MIXED */ -#define UP(f) (((f)&~LOCAL) | (LMIX(f) & SMIX(f) & MIXED)) +#define UP(f) (((f)&~NOPROP) | (LMIX(f) & SMIX(f) & MIXED)) #define MESSY(f) ((f)&(MIXED|CAP|BACKR)) -#define PREF(f) ((f)&LOCAL) +#define PREF(f) ((f)&NOPROP) #define PREF2(f1, f2) ((PREF(f1) != 0) ? PREF(f1) : PREF(f2)) #define COMBINE(f1, f2) (UP((f1)|(f2)) | PREF2(f1, f2)) short retry; /* index into retry memory */ |