From e1465aee3a159ab7eb67703d6b658593ed7e8cee Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 24 Jul 2009 20:45:22 +0000 Subject: minor cleanups --- generic/tclCmdAH.c | 4 ++-- generic/tclExecute.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index a3a5841..b268bfc 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCmdAH.c,v 1.117 2009/07/14 16:34:08 andreas_kupries Exp $ + * RCS: @(#) $Id: tclCmdAH.c,v 1.118 2009/07/24 20:45:22 dgp Exp $ */ #include "tclInt.h" @@ -290,7 +290,7 @@ TclNRCatchObjCmd( * TIP #280. Make invoking context available to caught script. */ - Tcl_NRAddCallback(interp, CatchObjCmdCallback, INT2PTR(objc), + TclNRAddCallback(interp, CatchObjCmdCallback, INT2PTR(objc), varNamePtr, optionVarNamePtr, NULL); return TclNREvalObjEx(interp, objv[1], 0, iPtr->cmdFramePtr, 1); diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 8ccdbe1..1a9c9a9 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclExecute.c,v 1.442 2009/07/16 21:24:39 dgp Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.443 2009/07/24 20:45:23 dgp Exp $ */ #include "tclInt.h" @@ -674,6 +674,7 @@ static void ValidatePcAndStackTop(ByteCode *codePtr, const unsigned char *pc, int stackTop, int stackLowerBound, int checkStack); #endif /* TCL_COMPILE_DEBUG */ +static ByteCode * CompileExprObj(Tcl_Interp *interp, Tcl_Obj *objPtr); static void DeleteExecStack(ExecStack *esPtr); static void DupExprCodeInternalRep(Tcl_Obj *srcPtr, Tcl_Obj *copyPtr); @@ -687,6 +688,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); /* Useful elsewhere, make available in tclInt.h or stubs? */ static Tcl_Obj ** StackAllocWords(Tcl_Interp *interp, int numWords); static Tcl_Obj ** StackReallocWords(Tcl_Interp *interp, int numWords); -- cgit v0.12