Fix [16e25e1402]: tcl_startOfPreviousWord cannot handle "end-1"

jan.nijtmans · jan.nijtmans · commit 854b78432390 · 2024-01-27T11:51:45.000Z
diff --git a/library/word.tcl b/library/word.tcl
@@ -147,7 +147,7 @@ proc tcl_startOfPreviousWord {str start} {
     variable ::tcl::WordBreakRE
     set word {-1 -1}
     if {$start > 0} {
-	regexp -indices -- $WordBreakRE(previous) [string range $str 0 $start-1] \
+	regexp -indices -- $WordBreakRE(previous) [string range [string range $str 0 $start] 0 end-1] \
 		result word
     }
     return [lindex $word 0]
diff --git a/tests/word.test b/tests/word.test
@@ -64,7 +64,7 @@ test word-2.6 {tcl_startOfPreviousWord} -body {
 test word-2.7 {tcl_startOfPreviousWord} -body {
     tcl_startOfPreviousWord "ab cd" end
 } -result 3
-test word-2.8 {tcl_startOfPreviousWord, bug [16e25e1402]} -constraints knownBug -body {
+test word-2.8 {tcl_startOfPreviousWord, bug [16e25e1402]} -body {
     tcl_startOfPreviousWord "ab cd" end-1
 } -result 0
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ proc tcl_startOfPreviousWord {str start} {`
`147`	`147`	`variable ::tcl::WordBreakRE`
`148`	`148`	`set word {-1 -1}`
`149`	`149`	`if {$start > 0} {`
`150`		`- regexp -indices -- $WordBreakRE(previous) [string range $str 0 $start-1] \`
	`150`	`+ regexp -indices -- $WordBreakRE(previous) [string range [string range $str 0 $start] 0 end-1] \`
`151`	`151`	`result word`
`152`	`152`	`}`
`153`	`153`	`return [lindex $word 0]`