diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2014-01-09 21:20:23 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2014-01-09 21:20:23 (GMT) |
| commit | 4aa0402e774719d5bde6de666876df9607d61f62 (patch) | |
| tree | fe3896fd636563de7504eb24bce205cf9f547457 /generic/tclOOBasic.c | |
| parent | 8bf48ad5587163c9d5efb09245c0ff6d24db142a (diff) | |
| parent | 1dd57e7f83b454f114c495ecec9d81fcfa8c13f6 (diff) | |
| download | tcl-4aa0402e774719d5bde6de666876df9607d61f62.zip tcl-4aa0402e774719d5bde6de666876df9607d61f62.tar.gz tcl-4aa0402e774719d5bde6de666876df9607d61f62.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclOOBasic.c')
| -rw-r--r-- | generic/tclOOBasic.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c index 853e2ec..6084cf2 100644 --- a/generic/tclOOBasic.c +++ b/generic/tclOOBasic.c @@ -17,16 +17,11 @@ #include "tclOOInt.h" static inline Tcl_Object *AddConstructionFinalizer(Tcl_Interp *interp); -static int AfterNRDestructor(ClientData data[], - Tcl_Interp *interp, int result); -static int DecrRefsPostClassConstructor(ClientData data[], - Tcl_Interp *interp, int result); -static int FinalizeConstruction(ClientData data[], - Tcl_Interp *interp, int result); -static int FinalizeEval(ClientData data[], - Tcl_Interp *interp, int result); -static int RestoreFrame(ClientData data[], - Tcl_Interp *interp, int result); +static Tcl_NRPostProc AfterNRDestructor; +static Tcl_NRPostProc DecrRefsPostClassConstructor; +static Tcl_NRPostProc FinalizeConstruction; +static Tcl_NRPostProc FinalizeEval; +static Tcl_NRPostProc NextRestoreFrame; /* * ---------------------------------------------------------------------- @@ -808,7 +803,7 @@ TclOONextObjCmd( * that this is like [uplevel 1] and not [eval]. */ - TclNRAddCallback(interp, RestoreFrame, framePtr, NULL, NULL, NULL); + TclNRAddCallback(interp, NextRestoreFrame, framePtr, NULL,NULL,NULL); iPtr->varFramePtr = framePtr->callerVarPtr; return TclNRObjectContextInvokeNext(interp, context, objc, objv, 1); } @@ -877,8 +872,8 @@ TclOONextToObjCmd( * context. Note that this is like [uplevel 1] and not [eval]. */ - TclNRAddCallback(interp, RestoreFrame, framePtr, contextPtr, - INT2PTR(contextPtr->index), NULL); + TclNRAddCallback(interp, NextRestoreFrame, framePtr, + contextPtr, INT2PTR(contextPtr->index), NULL); contextPtr->index = i-1; iPtr->varFramePtr = framePtr->callerVarPtr; return TclNRObjectContextInvokeNext(interp, @@ -908,7 +903,7 @@ TclOONextToObjCmd( } static int -RestoreFrame( +NextRestoreFrame( ClientData data[], Tcl_Interp *interp, int result) |