diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2006-08-09 13:51:02 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2006-08-09 13:51:02 (GMT) |
| commit | 5d8d3fcace7029ada82a3ac3cdc7f9afdd19bb9f (patch) | |
| tree | 766d70df4980bc7d000077939f9aab5512913993 /generic | |
| parent | 99218e86bcf6d184ccf51155c312d298a5d82b07 (diff) | |
| download | tcl-5d8d3fcace7029ada82a3ac3cdc7f9afdd19bb9f.zip tcl-5d8d3fcace7029ada82a3ac3cdc7f9afdd19bb9f.tar.gz tcl-5d8d3fcace7029ada82a3ac3cdc7f9afdd19bb9f.tar.bz2 | |
Fix silly error in error handling for uncompiled [dict for]. [Bug 1531184]
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclDictObj.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c index 12907db..390c66f 100644 --- a/generic/tclDictObj.c +++ b/generic/tclDictObj.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDictObj.c,v 1.39 2005/11/04 22:38:38 msofer Exp $ + * RCS: @(#) $Id: tclDictObj.c,v 1.40 2006/08/09 13:51:02 dkf Exp $ */ #include "tclInt.h" @@ -2182,6 +2182,11 @@ DictForCmd( valueVarObj = varv[1]; scriptObj = objv[4]; + if (Tcl_DictObjFirst(interp, objv[3], &search, &keyObj, &valueObj, + &done) != TCL_OK) { + return TCL_ERROR; + } + /* * Make sure that these objects (which we need throughout the body of the * loop) don't vanish. Note that the dictionary internal rep is locked @@ -2192,12 +2197,7 @@ DictForCmd( Tcl_IncrRefCount(valueVarObj); Tcl_IncrRefCount(scriptObj); - result = Tcl_DictObjFirst(interp, objv[3], - &search, &keyObj, &valueObj, &done); - if (result != TCL_OK) { - goto doneFor; - } - + result = TCL_OK; while (!done) { /* * Stop the value from getting hit in any way by any traces on the key @@ -2211,7 +2211,7 @@ DictForCmd( TclGetString(keyVarObj), "\"", NULL); TclDecrRefCount(valueObj); result = TCL_ERROR; - goto doneFor; + break; } TclDecrRefCount(valueObj); if (Tcl_ObjSetVar2(interp, valueVarObj, NULL, valueObj, 0) == NULL) { @@ -2219,7 +2219,7 @@ DictForCmd( Tcl_AppendResult(interp, "couldn't set value variable: \"", TclGetString(valueVarObj), "\"", NULL); result = TCL_ERROR; - goto doneFor; + break; } result = Tcl_EvalObjEx(interp, scriptObj, 0); @@ -2230,7 +2230,8 @@ DictForCmd( result = TCL_OK; } else if (result == TCL_ERROR) { TclFormatToErrorInfo(interp, - "\n (\"dict for\" body line %d)", interp->errorLine); + "\n (\"dict for\" body line %d)", + interp->errorLine); } break; } @@ -2238,7 +2239,6 @@ DictForCmd( Tcl_DictObjNext(&search, &keyObj, &valueObj, &done); } - doneFor: /* * Stop holding a reference to these objects. */ |