From ee993255dd196245a4ea4e3607b830598445bcdf Mon Sep 17 00:00:00 2001 From: Miguel Sofer Date: Sat, 5 Mar 2011 12:29:00 +0000 Subject: Renamed struct TEOV_callback to the more descriptive NRE_callback. --- ChangeLog | 11 +++++++++++ generic/tclBasic.c | 24 ++++++++++++------------ generic/tclCompExpr.c | 2 +- generic/tclCompile.c | 2 +- generic/tclExecute.c | 4 ++-- generic/tclInt.decls | 2 +- generic/tclInt.h | 26 +++++++++++++------------- generic/tclIntDecls.h | 4 ++-- generic/tclTest.c | 2 +- 9 files changed, 44 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index e519cae..372f9c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-03-01 Miguel Sofer + + * generic/tclBasic.c: Renamed struct TEOV_callback to + * generic/tclCompExpr.c: the more descriptive NRE_callback. + * generic/tclCompile.c: + * generic/tclExecute.c: + * generic/tclInt.decls: + * generic/tclInt.h: + * generic/tclIntDecls.h: + * generic/tclTest.c: + 2011-03-04 Donal K. Fellows * generic/tclOOMethod.c (ProcedureMethodCompiledVarConnect) diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 9187306..ce5be25 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -165,7 +165,7 @@ static Tcl_NRPostProc TEOV_RunLeaveTraces; static Tcl_NRPostProc YieldToCallback; static void ClearTailcall(Tcl_Interp *interp, - struct TEOV_callback *tailcallPtr); + struct NRE_callback *tailcallPtr); static Tcl_ObjCmdProc NRCoroInjectObjCmd; MODULE_SCOPE const TclStubs tclStubs; @@ -4100,7 +4100,7 @@ Tcl_EvalObjv( * TCL_EVAL_NOERR are currently supported. */ { int result; - TEOV_callback *rootPtr = TOP_CB(interp); + NRE_callback *rootPtr = TOP_CB(interp); result = TclNREvalObjv(interp, objc, objv, flags, NULL); return TclNRRunCallbacks(interp, result, rootPtr); @@ -4297,12 +4297,12 @@ int TclNRRunCallbacks( Tcl_Interp *interp, int result, - struct TEOV_callback *rootPtr) + struct NRE_callback *rootPtr) /* All callbacks down to rootPtr not inclusive * are to be run. */ { Interp *iPtr = (Interp *) interp; - TEOV_callback *callbackPtr; + NRE_callback *callbackPtr; Tcl_NRPostProc *procPtr; /* @@ -5895,7 +5895,7 @@ TclEvalObjEx( int word) /* Index of the word which is in objPtr. */ { int result = TCL_OK; - TEOV_callback *rootPtr = TOP_CB(interp); + NRE_callback *rootPtr = TOP_CB(interp); result = TclNREvalObjEx(interp, objPtr, flags, invoker, word); return TclNRRunCallbacks(interp, result, rootPtr); @@ -8100,7 +8100,7 @@ Tcl_NRCallObjProc( Tcl_Obj *const objv[]) { int result = TCL_OK; - TEOV_callback *rootPtr = TOP_CB(interp); + NRE_callback *rootPtr = TOP_CB(interp); if (TCL_DTRACE_CMD_ARGS_ENABLED()) { const char *a[10]; @@ -8252,7 +8252,7 @@ Tcl_NRCmdSwap( void TclSpliceTailcall( Tcl_Interp *interp, - TEOV_callback *tailcallPtr) + NRE_callback *tailcallPtr) { /* * Find the splicing spot: right before the NRCommand of the thing @@ -8260,7 +8260,7 @@ TclSpliceTailcall( * (used by command redirectors). */ - TEOV_callback *runPtr; + NRE_callback *runPtr; for (runPtr = TOP_CB(interp); runPtr; runPtr = runPtr->nextPtr) { if (((runPtr->procPtr) == NRCommand) && !runPtr->data[1]) { @@ -8318,7 +8318,7 @@ TclNRTailcallObjCmd( Tcl_Obj *listPtr, *nsObjPtr; Tcl_Namespace *nsPtr = (Tcl_Namespace *) iPtr->varFramePtr->nsPtr; Tcl_Namespace *ns1Ptr; - TEOV_callback *tailcallPtr; + NRE_callback *tailcallPtr; listPtr = Tcl_NewListObj(objc-1, objv+1); Tcl_IncrRefCount(listPtr); @@ -8389,7 +8389,7 @@ TailcallCleanup( static void ClearTailcall( Tcl_Interp *interp, - TEOV_callback *tailcallPtr) + NRE_callback *tailcallPtr) { TailcallCleanup(tailcallPtr->data, interp, TCL_OK); TCLNR_FREE(interp, tailcallPtr); @@ -8526,7 +8526,7 @@ YieldToCallback( /* CoroutineData *corPtr = data[0];*/ Tcl_Obj *listPtr = data[1]; ClientData nsPtr = data[2]; - TEOV_callback *cbPtr; + NRE_callback *cbPtr; /* * yieldTo: invoke the command using tailcall tech. @@ -8573,7 +8573,7 @@ DeleteCoroutine( { CoroutineData *corPtr = clientData; Tcl_Interp *interp = corPtr->eePtr->interp; - TEOV_callback *rootPtr = TOP_CB(interp); + NRE_callback *rootPtr = TOP_CB(interp); if (COR_IS_SUSPENDED(corPtr)) { TclNRRunCallbacks(interp, RewindCoroutine(corPtr,TCL_OK), rootPtr); diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index 17dde0a..1d42b81 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -2099,7 +2099,7 @@ ExecConstantExprTree( ByteCode *byteCodePtr; int code; Tcl_Obj *byteCodeObj = Tcl_NewObj(); - TEOV_callback *rootPtr = TOP_CB(interp); + NRE_callback *rootPtr = TOP_CB(interp); /* * Note we are compiling an expression with literal arguments. This means diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 2948416..8005034 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -927,7 +927,7 @@ Tcl_SubstObj( Tcl_Obj *objPtr, /* The value to be substituted. */ int flags) /* What substitutions to do. */ { - TEOV_callback *rootPtr = TOP_CB(interp); + NRE_callback *rootPtr = TOP_CB(interp); if (TclNRRunCallbacks(interp, Tcl_NRSubstObj(interp, objPtr, flags), rootPtr) != TCL_OK) { diff --git a/generic/tclExecute.c b/generic/tclExecute.c index f8cbe4e..5586506 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -930,7 +930,7 @@ TclDeleteExecEnv( TclDecrRefCount(eePtr->constants[0]); TclDecrRefCount(eePtr->constants[1]); if (eePtr->callbackPtr) { - Tcl_Panic("Deleting execEnv with pending TEOV callbacks!"); + Tcl_Panic("Deleting execEnv with pending NRE callbacks!"); } if (eePtr->corPtr) { Tcl_Panic("Deleting execEnv with existing coroutine"); @@ -1321,7 +1321,7 @@ Tcl_ExprObj( Tcl_Obj **resultPtrPtr) /* Where the Tcl_Obj* that is the expression * result is stored if no errors occur. */ { - TEOV_callback *rootPtr = TOP_CB(interp); + NRE_callback *rootPtr = TOP_CB(interp); Tcl_Obj *resultPtr; TclNewObj(resultPtr); diff --git a/generic/tclInt.decls b/generic/tclInt.decls index 39ecf89..df60dae 100644 --- a/generic/tclInt.decls +++ b/generic/tclInt.decls @@ -959,7 +959,7 @@ declare 239 { } declare 240 { int TclNRRunCallbacks(Tcl_Interp *interp, int result, - struct TEOV_callback *rootPtr) + struct NRE_callback *rootPtr) } declare 241 { int TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, diff --git a/generic/tclInt.h b/generic/tclInt.h index 2f6fac9..a804969 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -1150,7 +1150,7 @@ typedef struct CallFrame { * meaning of the value is, which we do not * specify. */ LocalCache *localCachePtr; - struct TEOV_callback *tailcallPtr; + struct NRE_callback *tailcallPtr; /* NULL if no tailcall is scheduled */ } CallFrame; @@ -1491,8 +1491,8 @@ typedef struct ExecEnv { * stack on the heap. */ Tcl_Obj *constants[2]; /* Pointers to constant "0" and "1" objs. */ struct Tcl_Interp *interp; - struct TEOV_callback *callbackPtr; - /* Top callback in TEOV's stack. */ + struct NRE_callback *callbackPtr; + /* Top callback in NRE's stack. */ struct CoroutineData *corPtr; int rewind; } ExecEnv; @@ -2133,7 +2133,7 @@ typedef struct Interp { * tclOOInt.h and tclOO.c for real definition * and setup. */ - struct TEOV_callback *deferredCallbacks; + struct NRE_callback *deferredCallbacks; /* Callbacks that are set previous to a call * to some Eval function but that actually * belong to the command that is about to be @@ -2772,7 +2772,7 @@ MODULE_SCOPE Tcl_ObjCmdProc TclNRYieldmObjCmd; MODULE_SCOPE Tcl_ObjCmdProc TclNRYieldToObjCmd; MODULE_SCOPE void TclSpliceTailcall(Tcl_Interp *interp, - struct TEOV_callback *tailcallPtr); + struct NRE_callback *tailcallPtr); /* * This structure holds the data for the various iteration callbacks used to @@ -4547,11 +4547,11 @@ void Tcl_Panic(const char *, ...) __attribute__((analyzer_noreturn)); * available. */ -typedef struct TEOV_callback { +typedef struct NRE_callback { Tcl_NRPostProc *procPtr; ClientData data[4]; - struct TEOV_callback *nextPtr; -} TEOV_callback; + struct NRE_callback *nextPtr; +} NRE_callback; #define TOP_CB(iPtr) (((Interp *)(iPtr))->execEnvPtr->callbackPtr) @@ -4561,7 +4561,7 @@ typedef struct TEOV_callback { #define TclNRAddCallback(interp,postProcPtr,data0,data1,data2,data3) \ do { \ - TEOV_callback *callbackPtr; \ + NRE_callback *callbackPtr; \ TCLNR_ALLOC((interp), (callbackPtr)); \ callbackPtr->procPtr = (postProcPtr); \ callbackPtr->data[0] = (ClientData)(data0); \ @@ -4574,7 +4574,7 @@ typedef struct TEOV_callback { #define TclNRDeferCallback(interp,postProcPtr,data0,data1,data2,data3) \ do { \ - TEOV_callback *callbackPtr; \ + NRE_callback *callbackPtr; \ TCLNR_ALLOC((interp), (callbackPtr)); \ callbackPtr->procPtr = (postProcPtr); \ callbackPtr->data[0] = (ClientData)(data0); \ @@ -4587,7 +4587,7 @@ typedef struct TEOV_callback { #define TclNRSpliceCallbacks(interp, topPtr) \ do { \ - TEOV_callback *bottomPtr = topPtr; \ + NRE_callback *bottomPtr = topPtr; \ while (bottomPtr->nextPtr) { \ bottomPtr = bottomPtr->nextPtr; \ } \ @@ -4603,11 +4603,11 @@ typedef struct TEOV_callback { #if NRE_USE_SMALL_ALLOC #define TCLNR_ALLOC(interp, ptr) \ - TclSmallAllocEx(interp, sizeof(TEOV_callback), (ptr)) + TclSmallAllocEx(interp, sizeof(NRE_callback), (ptr)) #define TCLNR_FREE(interp, ptr) TclSmallFreeEx((interp), (ptr)) #else #define TCLNR_ALLOC(interp, ptr) \ - (ptr = ((ClientData) ckalloc(sizeof(TEOV_callback)))) + (ptr = ((ClientData) ckalloc(sizeof(NRE_callback)))) #define TCLNR_FREE(interp, ptr) ckfree((char *) (ptr)) #endif diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h index 015f33a..b294e4f 100644 --- a/generic/tclIntDecls.h +++ b/generic/tclIntDecls.h @@ -570,7 +570,7 @@ EXTERN int TclNRInterpProcCore(Tcl_Interp *interp, ProcErrorProc *errorProc); /* 240 */ EXTERN int TclNRRunCallbacks(Tcl_Interp *interp, int result, - struct TEOV_callback *rootPtr); + struct NRE_callback *rootPtr); /* 241 */ EXTERN int TclNREvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, const CmdFrame *invoker, int word); @@ -846,7 +846,7 @@ typedef struct TclIntStubs { int (*tclResetCancellation) (Tcl_Interp *interp, int force); /* 237 */ int (*tclNRInterpProc) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 238 */ int (*tclNRInterpProcCore) (Tcl_Interp *interp, Tcl_Obj *procNameObj, int skip, ProcErrorProc *errorProc); /* 239 */ - int (*tclNRRunCallbacks) (Tcl_Interp *interp, int result, struct TEOV_callback *rootPtr); /* 240 */ + int (*tclNRRunCallbacks) (Tcl_Interp *interp, int result, struct NRE_callback *rootPtr); /* 240 */ int (*tclNREvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, const CmdFrame *invoker, int word); /* 241 */ int (*tclNREvalObjv) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], int flags, Command *cmdPtr); /* 242 */ void (*tclDbDumpActiveObjects) (FILE *outFile); /* 243 */ diff --git a/generic/tclTest.c b/generic/tclTest.c index 731a686..fc29702 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -6724,7 +6724,7 @@ TestNRELevels( ptrdiff_t depth; Tcl_Obj *levels[6]; int i = 0; - TEOV_callback *cbPtr = ((Interp *) interp)->execEnvPtr->callbackPtr; + NRE_callback *cbPtr = ((Interp *) interp)->execEnvPtr->callbackPtr; if (refDepth == NULL) { refDepth = &depth; -- cgit v0.12