diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:37:08 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-05-19 20:37:08 (GMT) |
commit | 276bcea418a3db186a49c67505c81e5c8cf84b7b (patch) | |
tree | 407017ea92745919245da494113d7c1733b41196 | |
parent | c0b55c5efdce5be6416a405e7f8dac1b4829aebd (diff) | |
parent | 1ac9419646cfa6a09fc0833febd11a0692bca193 (diff) | |
download | tcl-276bcea418a3db186a49c67505c81e5c8cf84b7b.zip tcl-276bcea418a3db186a49c67505c81e5c8cf84b7b.tar.gz tcl-276bcea418a3db186a49c67505c81e5c8cf84b7b.tar.bz2 |
Don't #define VOID on VxWorks, as it is already typdef'd to void. Eliminate possibly conflicting LOCAL/OFFSET
-rw-r--r-- | generic/regguts.h | 6 | ||||
-rw-r--r-- | generic/tcl.h | 10 | ||||
-rw-r--r-- | generic/tclCompCmdsGR.c | 7 | ||||
-rw-r--r-- | generic/tclExecute.c | 10 |
4 files changed, 14 insertions, 19 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 */ diff --git a/generic/tcl.h b/generic/tcl.h index 4de18f0..d47e931 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -329,10 +329,12 @@ typedef long LONG; * in ANSI C; maps them to type "char *" in non-ANSI systems. */ -#ifndef NO_VOID -# define VOID void -#else -# define VOID char +#ifndef __VXWORKS__ +# ifndef NO_VOID +# define VOID void +# else +# define VOID char +# endif #endif /* diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c index 83a84e8..26e63e8 100644 --- a/generic/tclCompCmdsGR.c +++ b/generic/tclCompCmdsGR.c @@ -32,13 +32,6 @@ static int PushVarName(Tcl_Interp *interp, int flags, int *localIndexPtr, int *simpleVarNamePtr, int *isScalarPtr, int line, int *clNext); -static int CompileEachloopCmd(Tcl_Interp *interp, - Tcl_Parse *parsePtr, Command *cmdPtr, - CompileEnv *envPtr, int collect); -static int CompileDictEachCmd(Tcl_Interp *interp, - Tcl_Parse *parsePtr, Command *cmdPtr, - struct CompileEnv *envPtr, int collect); - /* * Macro that encapsulates an efficiency trick that avoids a function call for diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 76fd71a..7c645e7 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -724,7 +724,7 @@ static Tcl_Obj ** GrowEvaluationStack(ExecEnv *eePtr, int growth, static void IllegalExprOperandType(Tcl_Interp *interp, const unsigned char *pc, Tcl_Obj *opndPtr); static void InitByteCodeExecution(Tcl_Interp *interp); -static inline int OFFSET(void *ptr); +static inline int wordSkip(void *ptr); static void ReleaseDictIterator(Tcl_Obj *objPtr); /* Useful elsewhere, make available in tclInt.h or stubs? */ static Tcl_Obj ** StackAllocWords(Tcl_Interp *interp, int numWords); @@ -1001,13 +1001,13 @@ TclFinalizeExecution(void) (TCL_ALLOCALIGN/sizeof(Tcl_Obj *)) /* - * OFFSET computes how many words have to be skipped until the next aligned + * wordSkip computes how many words have to be skipped until the next aligned * word. Note that we are only interested in the low order bits of ptr, so * that any possible information loss in PTR2INT is of no consequence. */ static inline int -OFFSET( +wordSkip( void *ptr) { int mask = TCL_ALLOCALIGN-1; @@ -1020,7 +1020,7 @@ OFFSET( */ #define MEMSTART(markerPtr) \ - ((markerPtr) + OFFSET(markerPtr)) + ((markerPtr) + wordSkip(markerPtr)) /* *---------------------------------------------------------------------- @@ -1065,7 +1065,7 @@ GrowEvaluationStack( } else { #ifndef PURIFY Tcl_Obj **tmpMarkerPtr = esPtr->tosPtr + 1; - int offset = OFFSET(tmpMarkerPtr); + int offset = wordSkip(tmpMarkerPtr); if (needed + offset < 0) { /* |