summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraspect <aspect+tclcore@abstracted-spleen.org>2015-02-19 02:42:13 (GMT)
committeraspect <aspect+tclcore@abstracted-spleen.org>2015-02-19 02:42:13 (GMT)
commit650782af59cef1d9524137ddc9ef3f373b3cda69 (patch)
tree0a15cfa1e8417cc5fa66669fa9cc1d9d5f6fab88
parenta3fe56e967acaf42e8fb2180de39428b24fb3ed4 (diff)
downloadtcl-650782af59cef1d9524137ddc9ef3f373b3cda69.zip
tcl-650782af59cef1d9524137ddc9ef3f373b3cda69.tar.gz
tcl-650782af59cef1d9524137ddc9ef3f373b3cda69.tar.bz2
handle [lreplace l x y ...] where y<x
-rw-r--r--generic/tclCompCmdsGR.c7
-rw-r--r--tests/lreplace.test3
2 files changed, 7 insertions, 3 deletions
diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index 5220576..e7f6473 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1501,6 +1501,10 @@ TclCompileLreplaceCmd(
return TCL_ERROR;
}
+ if(idx2 != INDEX_END && idx2 < idx1) {
+ idx2 = idx1-1;
+ }
+
/*
* Work out what this [lreplace] is actually doing.
*/
@@ -1524,9 +1528,6 @@ TclCompileLreplaceCmd(
tmpObj = Tcl_NewIntObj(idx1);
Tcl_IncrRefCount(tmpObj);
}
- if(idx2 < idx1) {
- idx2 = idx1-1;
- }
goto dropRange;
}
}
diff --git a/tests/lreplace.test b/tests/lreplace.test
index 44f3ac2..d5c51ae 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -143,6 +143,9 @@ test lreplace-4.3 {lreplace edge case} {
test lreplace-4.4 {lreplace edge case} {
lreplace {1 2 3 4 5} 3 1
} {1 2 3 4 5}
+test lreplace-4.4 {lreplace edge case} {
+ lreplace {1 2 3 4 5} 3 0 _
+} {1 2 3 _ 4 5}
# cleanup
catch {unset foo}