diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclVar.c | 18 |
2 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2000-11-15 jeff hobbs <jeff.hobbs@acm.org> + + * generic/tclVar.c (TclLookupVar): reverted fix below as it broke + all other array unset error reporting. Bug-119192 is still open. + 2000-11-15 Donal K. Fellows <fellowsd@cs.man.ac.uk> * generic/tclVar.c (TclLookupVar): Changed references to part2 to diff --git a/generic/tclVar.c b/generic/tclVar.c index feb319d..6b32fe3 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.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: tclVar.c,v 1.25 2000/11/15 14:09:01 dkf Exp $ + * RCS: @(#) $Id: tclVar.c,v 1.26 2000/11/15 22:19:56 hobbs Exp $ */ #include "tclInt.h" @@ -262,13 +262,13 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2, if (varNsPtr == NULL) { if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, badNamespace); + VarErrMsg(interp, part1, part2, msg, badNamespace); } goto done; } if (tail == NULL) { if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, missingName); + VarErrMsg(interp, part1, part2, msg, missingName); } goto done; } @@ -279,7 +279,7 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2, varPtr->nsPtr = varNsPtr; } else { /* var wasn't found and not to create it */ if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, noSuchVar); + VarErrMsg(interp, part1, part2, msg, noSuchVar); } goto done; } @@ -329,7 +329,7 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2, } if (hPtr == NULL) { if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, noSuchVar); + VarErrMsg(interp, part1, part2, msg, noSuchVar); } goto done; } @@ -370,7 +370,7 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2, if (TclIsVarUndefined(varPtr) && !TclIsVarArrayElement(varPtr)) { if (!createPart1) { if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, noSuchVar); + VarErrMsg(interp, part1, part2, msg, noSuchVar); } varPtr = NULL; goto done; @@ -382,7 +382,7 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2, */ if ((varPtr->flags & VAR_IN_HASHTABLE) && (varPtr->hPtr == NULL)) { if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, danglingVar); + VarErrMsg(interp, part1, part2, msg, danglingVar); } varPtr = NULL; goto done; @@ -395,7 +395,7 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2, Tcl_InitHashTable(varPtr->value.tablePtr, TCL_STRING_KEYS); } else if (!TclIsVarArray(varPtr)) { if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, needArray); + VarErrMsg(interp, part1, part2, msg, needArray); } varPtr = NULL; goto done; @@ -426,7 +426,7 @@ TclLookupVar(interp, part1, part2, flags, msg, createPart1, createPart2, } if (hPtr == NULL) { if (flags & TCL_LEAVE_ERR_MSG) { - VarErrMsg(interp, part1, elName, msg, noSuchElement); + VarErrMsg(interp, part1, part2, msg, noSuchElement); } varPtr = NULL; goto done; |