diff options
| author | dgp <dgp@users.sourceforge.net> | 2006-02-16 20:21:54 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2006-02-16 20:21:54 (GMT) |
| commit | 516bd8eecdd1a001de9d6aff3e7ea01460b357b8 (patch) | |
| tree | 3d05db661c9d68e583b5f4ee2bb5d305890088b6 /generic/tclIndexObj.c | |
| parent | 8a69941cbf07e009343850ef3a370bcc7adf4f7e (diff) | |
| download | tcl-516bd8eecdd1a001de9d6aff3e7ea01460b357b8.zip tcl-516bd8eecdd1a001de9d6aff3e7ea01460b357b8.tar.gz tcl-516bd8eecdd1a001de9d6aff3e7ea01460b357b8.tar.bz2 | |
* generic/tclIndexObj.c: Disallow the "ambiguous" error message
* generic/indexObj.test: when TCL_EXACT matching is requested.
Diffstat (limited to 'generic/tclIndexObj.c')
| -rw-r--r-- | generic/tclIndexObj.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c index 60d4931..bdfca15 100644 --- a/generic/tclIndexObj.c +++ b/generic/tclIndexObj.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: tclIndexObj.c,v 1.16.2.1 2004/01/13 09:45:30 dkf Exp $ + * RCS: @(#) $Id: tclIndexObj.c,v 1.16.2.2 2006/02/16 20:21:54 dgp Exp $ */ #include "tclInt.h" @@ -274,8 +274,8 @@ Tcl_GetIndexFromObjStruct(interp, objPtr, tablePtr, offset, msg, flags, TclNewObj(resultPtr); Tcl_SetObjResult(interp, resultPtr); - Tcl_AppendStringsToObj(resultPtr, - (numAbbrev > 1) ? "ambiguous " : "bad ", msg, " \"", + Tcl_AppendStringsToObj(resultPtr, (numAbbrev > 1) && + !(flags & TCL_EXACT) ? "ambiguous " : "bad ", msg, " \"", key, "\": must be ", STRING_AT(tablePtr,offset,0), (char*)NULL); for (entryPtr = NEXT_ENTRY(tablePtr, offset), count = 0; *entryPtr != NULL; |