diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-10-15 04:01:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-10-15 04:01:22 (GMT) |
| commit | 0eb70513827981212a928f0a5b63afb70c53c960 (patch) | |
| tree | a5072bb17646340c040c80672eeba059e8b393f0 /generic/tclInterp.c | |
| parent | 2b7d6e025eefe41b48ec7f948602faf2d3bf7055 (diff) | |
| download | tcl-0eb70513827981212a928f0a5b63afb70c53c960.zip tcl-0eb70513827981212a928f0a5b63afb70c53c960.tar.gz tcl-0eb70513827981212a928f0a5b63afb70c53c960.tar.bz2 | |
* generic/tclBasic.c (Tcl_CreateInterp,Tcl_DeleteInterp,
TclEvalObjvInternal,Tcl_LogCommandInfo,TclAddObjErrorInfo):
* generic/tclCmdAH.c (Tcl_CatchObjCmd):
* generic/tclEvent.c (BgError,ErrAssocData,Tcl_BackgroundError,
HandleBgErrors,BgErrorDeleteProc):
* generic/tclExecute.c (TclCreateExecEnv,TclDeleteExecEnv):
* generic/tclIOUtil.c (comments only):
* generic/tclInt.h (ExecEnv,Interp, ERR_IN_PROGRESS):
* generic/tclInterp.c ([tclInit]):
* generic/tclMain.c (comments only):
* generic/tclNamesp.c
(Tcl_CreateNamespace,Tcl_DeleteNamespace,TclTeardownNamespace):
* generic/tclProc.c (TclUpdateReturnInfo):
* generic/tclResult.c
(Tcl_ResetResult,TclTransferResult):
* generic/tclTrace.c (CallVarTraces):
Reworked management of the "errorInfo" data of an interp.
That information is now primarily stored in a new private
(Tcl_Obj *) field of the Interp struct, rather than using a
global variable ::errorInfo as the primary storage. The
ERR_IN_PROGRESS flag bit value is no longer required to manage
the value in its new location, and is removed. Variable traces
are established to support compatibility for any code expecting
the ::errorInfo variable to hold the information.
***POTENTIAL INCOMPATIBILITY***
Code that sets traces on the ::errorInfo variable may notice a
difference in timing of the firing of those traces. Code that
uses the value ERR_IN_PROGRESS.
Diffstat (limited to 'generic/tclInterp.c')
| -rw-r--r-- | generic/tclInterp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 5ba48ab..51ce8fd 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.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: tclInterp.c,v 1.46 2004/10/06 14:59:02 dgp Exp $ + * RCS: @(#) $Id: tclInterp.c,v 1.47 2004/10/15 04:01:32 dgp Exp $ */ #include "tclInt.h" @@ -59,7 +59,7 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\ proc tclInit {} {\n\ - global tcl_libPath tcl_library errorInfo\n\ + global tcl_libPath tcl_library\n\ global env tclDefaultLibrary\n\ rename tclInit {}\n\ set errors {}\n\ @@ -84,10 +84,10 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\ set tcl_library $i\n\ set tclfile [file join $i init.tcl]\n\ if {[file exists $tclfile]} {\n\ - if {![catch {uplevel #0 [list source $tclfile]} msg]} {\n\ + if {![catch {uplevel #0 [list source $tclfile]} msg opt]} {\n\ return\n\ } else {\n\ - append errors \"$tclfile: $msg\n$errorInfo\n\"\n\ + append errors \"$tclfile: $msg\n$opt(-errorinfo)\n\"\n\ }\n\ }\n\ }\n\ |