From 428644e1853798dec8416b023b9cfea053574e4b Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 5 May 2011 16:35:00 +0000 Subject: Stop generating string rep of dict when converting to list. --- ChangeLog | 5 +++++ generic/tclListObj.c | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ced1a7..6ace69a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-05 Don Porter + + * generic/tclListObj.c: Stop generating string rep of dict when + converting to list. + 2011-05-03 Don Porter * generic/tclUtil.c: Tighten Tcl_SplitList(). diff --git a/generic/tclListObj.c b/generic/tclListObj.c index 164fa4a..a9c986b 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -589,7 +589,11 @@ Tcl_ListObjAppendElement( if (listPtr->typePtr != &tclListType) { int result, length; - (void) TclGetStringFromObj(listPtr, &length); + if (listPtr->typePtr == &tclDictType) { + (void) Tcl_DictObjSize(NULL, listPtr, &length); + } else { + (void) TclGetStringFromObj(listPtr, &length); + } if (!length) { Tcl_SetListObj(listPtr, 1, &objPtr); return TCL_OK; @@ -700,7 +704,11 @@ Tcl_ListObjIndex( if (listPtr->typePtr != &tclListType) { int result, length; - (void) TclGetStringFromObj(listPtr, &length); + if (listPtr->typePtr == &tclDictType) { + (void) Tcl_DictObjSize(NULL, listPtr, &length); + } else { + (void) TclGetStringFromObj(listPtr, &length); + } if (!length) { *objPtrPtr = NULL; return TCL_OK; @@ -755,7 +763,20 @@ Tcl_ListObjLength( if (listPtr->typePtr != &tclListType) { int result, length; - (void) TclGetStringFromObj(listPtr, &length); + if (listPtr->typePtr == &tclDictType) { + (void) Tcl_DictObjSize(NULL, listPtr, &length); + /* + * It's tempting to just report 2*length as the list length + * of this dict, but arguably that's false since the max sizes + * for dicts and lists are not the same, so some dicts don't + * actually convert to lists, and it's good to get that error + * back from the SetListFromAny() call below instead of a false + * indication we can treat the value as a list. ([llength $val] + * often used as a "listiness" test) + */ + } else { + (void) TclGetStringFromObj(listPtr, &length); + } if (!length) { *intPtr = 0; return TCL_OK; @@ -830,7 +851,11 @@ Tcl_ListObjReplace( if (listPtr->typePtr != &tclListType) { int length; - (void) TclGetStringFromObj(listPtr, &length); + if (listPtr->typePtr == &tclDictType) { + (void) Tcl_DictObjSize(NULL, listPtr, &length); + } else { + (void) TclGetStringFromObj(listPtr, &length); + } if (!length) { if (objc) { Tcl_SetListObj(listPtr, objc, NULL); @@ -1526,7 +1551,11 @@ TclListObjSetElement( if (listPtr->typePtr != &tclListType) { int length, result; - (void) TclGetStringFromObj(listPtr, &length); + if (listPtr->typePtr == &tclDictType) { + (void) Tcl_DictObjSize(NULL, listPtr, &length); + } else { + (void) TclGetStringFromObj(listPtr, &length); + } if (!length) { Tcl_SetObjResult(interp, Tcl_NewStringObj("list index out of range", -1)); -- cgit v0.12 From 1fd1d39eedb4da8fa200dfa4e16c7e4da62ed81d Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 5 May 2011 16:53:56 +0000 Subject: Tolerate NULL interps more completely. --- ChangeLog | 2 +- generic/tclListObj.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ace69a..3371aa7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2011-05-05 Don Porter * generic/tclListObj.c: Stop generating string rep of dict when - converting to list. + converting to list. Tolerate NULL interps more completely. 2011-05-03 Don Porter diff --git a/generic/tclListObj.c b/generic/tclListObj.c index a9c986b..c4061b3 100644 --- a/generic/tclListObj.c +++ b/generic/tclListObj.c @@ -1400,8 +1400,10 @@ TclLsetFlat( if (index < 0 || index >= elemCount) { /* ...the index points outside the sublist. */ - Tcl_SetObjResult(interp, - Tcl_NewStringObj("list index out of range", -1)); + if (interp != NULL) { + Tcl_SetObjResult(interp, + Tcl_NewStringObj("list index out of range", -1)); + } break; } @@ -1557,8 +1559,10 @@ TclListObjSetElement( (void) TclGetStringFromObj(listPtr, &length); } if (!length) { - Tcl_SetObjResult(interp, - Tcl_NewStringObj("list index out of range", -1)); + if (interp != NULL) { + Tcl_SetObjResult(interp, + Tcl_NewStringObj("list index out of range", -1)); + } return TCL_ERROR; } result = SetListFromAny(interp, listPtr); -- cgit v0.12