From 48650316e3373be33455bab6db0a33546169c906 Mon Sep 17 00:00:00 2001
From: aspect <aspect+tclcore@abstracted-spleen.org>
Date: Thu, 19 Feb 2015 02:34:43 +0000
Subject: (core ticket [32b6159246]) Fix for [lreplace l x y] where y<x-1

---
 generic/tclCompCmdsGR.c | 5 ++++-
 tests/lreplace.test     | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index e2fb43d..5220576 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1524,6 +1524,9 @@ TclCompileLreplaceCmd(
 		tmpObj = Tcl_NewIntObj(idx1);
 		Tcl_IncrRefCount(tmpObj);
 	    }
+	    if(idx2 < idx1) {
+		idx2 = idx1-1;
+	    }
 	    goto dropRange;
 	}
     }
@@ -1547,7 +1550,7 @@ TclCompileLreplaceCmd(
 	idx1 = 0;
 	goto replaceTail;
     } else {
-	if (idx1 > 0 && idx2 > 0 && idx2 < idx1) {
+	if (idx1 >= 0 && idx2 > 0 && idx2 < idx1) {
 	    idx2 = idx1 - 1;
 	} else if (idx1 < 0 && idx2 < 0 && idx2 < idx1) {
 	    idx2 = idx1 - 1;
diff --git a/tests/lreplace.test b/tests/lreplace.test
index b976788..44f3ac2 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -137,6 +137,12 @@ test lreplace-4.1 {Bug ccc2c2cc98: lreplace edge case} {
 test lreplace-4.2 {Bug ccc2c2cc98: lreplace edge case} {
     lreplace { } 1 1
 } {}
+test lreplace-4.3 {lreplace edge case} {
+    lreplace {1 2 3} 2 0
+} {1 2 3}
+test lreplace-4.4 {lreplace edge case} {
+    lreplace {1 2 3 4 5} 3 1
+} {1 2 3 4 5}
 
 # cleanup
 catch {unset foo}
-- 
cgit v0.12


From b8674e42d217b1b7ed6d7a1d89dc42a59902b108 Mon Sep 17 00:00:00 2001
From: aspect <aspect+tclcore@abstracted-spleen.org>
Date: Thu, 19 Feb 2015 02:42:13 +0000
Subject: handle [lreplace l x y ...] where y<x

---
 generic/tclCompCmdsGR.c | 7 ++++---
 tests/lreplace.test     | 3 +++
 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}
-- 
cgit v0.12


From bb005f26e422eead94be19f7b3a781bb64828aee Mon Sep 17 00:00:00 2001
From: aspect <aspect+tclcore@abstracted-spleen.org>
Date: Thu, 19 Feb 2015 06:29:18 +0000
Subject: undo erroneous change in [1fa2e32e07]

---
 generic/tclCompCmdsGR.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tclCompCmdsGR.c b/generic/tclCompCmdsGR.c
index e7f6473..b77c43c 100644
--- a/generic/tclCompCmdsGR.c
+++ b/generic/tclCompCmdsGR.c
@@ -1551,7 +1551,7 @@ TclCompileLreplaceCmd(
 	idx1 = 0;
 	goto replaceTail;
     } else {
-	if (idx1 >= 0 && idx2 > 0 && idx2 < idx1) {
+	if (idx1 > 0 && idx2 > 0 && idx2 < idx1) {
 	    idx2 = idx1 - 1;
 	} else if (idx1 < 0 && idx2 < 0 && idx2 < idx1) {
 	    idx2 = idx1 - 1;
-- 
cgit v0.12