diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclInt.h | 32 |
2 files changed, 23 insertions, 14 deletions
@@ -1,3 +1,8 @@ +2010-05-28 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tclInt.h: [tcl-Patches-3008541] order of TIP #348 fields + in Interp structure + 2010-05-28 Donal K. Fellows <dkf@users.sf.net> * generic/tclCompCmdsSZ.c (IssueTryFinallyInstructions): [3007374]: diff --git a/generic/tclInt.h b/generic/tclInt.h index fa503cc..a03bfc2 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInt.h,v 1.476 2010/05/03 14:36:40 nijtmans Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.477 2010/05/28 13:52:00 nijtmans Exp $ */ #ifndef _TCLINT @@ -1982,10 +1982,6 @@ typedef struct Interp { Tcl_Obj *eiVar; /* cached ref to ::errorInfo variable. */ Tcl_Obj *errorCode; /* errorCode value (now as a Tcl_Obj). */ Tcl_Obj *ecVar; /* cached ref to ::errorInfo variable. */ - Tcl_Obj *errorStack; /* [info errorstack] value (as a Tcl_Obj). */ - Tcl_Obj *upLiteral; /* "UP" literal for [info errorstack] */ - Tcl_Obj *callLiteral; /* "CALL" literal for [info errorstack] */ - int resetErrorStack; /* controls cleaning up of ::errorStack */ int returnLevel; /* [return -level] parameter. */ /* @@ -2144,15 +2140,6 @@ typedef struct Interp { * tclOOInt.h and tclOO.c for real definition * and setup. */ -#ifdef TCL_COMPILE_STATS - /* - * Statistical information about the bytecode compiler and interpreter's - * operation. - */ - - ByteCodeStats stats; /* Holds compilation and execution statistics - * for this interpreter. */ -#endif /* TCL_COMPILE_STATS */ struct TEOV_callback *deferredCallbacks; /* Callbacks that are set previous to a call * to some Eval function but that actually @@ -2173,6 +2160,23 @@ typedef struct Interp { * over the default error messages returned by * a script cancellation operation. */ + /* + * TIP #348 IMPLEMENTATION - Substituted error stack + */ + Tcl_Obj *errorStack; /* [info errorstack] value (as a Tcl_Obj). */ + Tcl_Obj *upLiteral; /* "UP" literal for [info errorstack] */ + Tcl_Obj *callLiteral; /* "CALL" literal for [info errorstack] */ + int resetErrorStack; /* controls cleaning up of ::errorStack */ + +#ifdef TCL_COMPILE_STATS + /* + * Statistical information about the bytecode compiler and interpreter's + * operation. This should be the last field of Interp. + */ + + ByteCodeStats stats; /* Holds compilation and execution statistics + * for this interpreter. */ +#endif /* TCL_COMPILE_STATS */ } Interp; /* |