From 011dd7b0f6b3f7eae43f139e2c0b654387718fd8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 21 Nov 2017 09:13:08 +0000
Subject: Revert [d874801c57]:  putting back "string bytelength". It turns out
 to be too complicated to take along with the other deprecations in TIP #485

---
 doc/string.n          | 4 ++--
 generic/tclCmdMZ.c    | 4 ----
 library/init.tcl      | 4 ++--
 tests/info.test       | 4 ++--
 tests/regexp.test     | 4 ++--
 tests/regexpComp.test | 4 ++--
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/doc/string.n b/doc/string.n
index 730f49e..00ce85c 100644
--- a/doc/string.n
+++ b/doc/string.n
@@ -386,8 +386,8 @@ store the representation is of very low value (except to C extension
 code, which has direct access for the purpose of memory management,
 etc.)
 .PP
-\fICompatibility note:\fR this subcommand will be gone in
-Tcl 9.0. It is better to use the
+\fICompatibility note:\fR it is likely that this subcommand will be
+withdrawn in a future version of Tcl. It is better to use the
 \fBencoding convertto\fR command to convert a string to a known
 encoding and then apply \fBstring length\fR to that.
 .PP
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index 14ea6ad..67fbc94 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -2893,7 +2893,6 @@ StringCatCmd(
  *
  *----------------------------------------------------------------------
  */
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 static int
 StringBytesCmd(
     ClientData dummy,		/* Not used. */
@@ -2912,7 +2911,6 @@ StringBytesCmd(
     Tcl_SetObjResult(interp, Tcl_NewIntObj(length));
     return TCL_OK;
 }
-#endif /* !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 */
 
 /*
  *----------------------------------------------------------------------
@@ -3370,9 +3368,7 @@ TclInitStringCmd(
     Tcl_Interp *interp)		/* Current interpreter. */
 {
     static const EnsembleImplMap stringImplMap[] = {
-#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 	{"bytelength",	StringBytesCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 0},
-#endif
 	{"cat",		StringCatCmd,	TclCompileStringCatCmd, NULL, NULL, 0},
 	{"compare",	StringCmpCmd,	TclCompileStringCmpCmd, NULL, NULL, 0},
 	{"equal",	StringEqualCmd,	TclCompileStringEqualCmd, NULL, NULL, 0},
diff --git a/library/init.tcl b/library/init.tcl
index a3ee05f..13a4300 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -279,9 +279,9 @@ proc unknown args {
 		set errInfo [dict get $opts -errorinfo]
 		set errCode [dict get $opts -errorcode]
 		set cinfo $args
-		if {[string length $cinfo] > 150} {
+		if {[string bytelength $cinfo] > 150} {
 		    set cinfo [string range $cinfo 0 150]
-		    while {[string length $cinfo] > 150} {
+		    while {[string bytelength $cinfo] > 150} {
 			set cinfo [string range $cinfo 0 end-1]
 		    }
 		    append cinfo ...
diff --git a/tests/info.test b/tests/info.test
index ac4b98c..fd89b47 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -103,8 +103,8 @@ test info-2.5 {info body option, returning bytecompiled bodies} -body {
 # causing an empty string to be returned [Bug #545644]
 test info-2.6 {info body option, returning list bodies} {
     proc foo args [list subst bar]
-    list [string length [info body foo]] \
-	    [foo; string length [info body foo]]
+    list [string bytelength [info body foo]] \
+	    [foo; string bytelength [info body foo]]
 } {9 9}
 
 proc testinfocmdcount {} {
diff --git a/tests/regexp.test b/tests/regexp.test
index 62cadd3..7367af7 100644
--- a/tests/regexp.test
+++ b/tests/regexp.test
@@ -760,8 +760,8 @@ test regexp-20.1 {regsub shared object shimmering} {
     set b $a
     set c abcdefghijklmnopqurstuvwxyz0123456789
     regsub $a $c $b d
-    list $d [string length $d]
-} [list abcdefghijklmnopqurstuvwxyz0123456789 37]
+    list $d [string length $d] [string bytelength $d]
+} [list abcdefghijklmnopqurstuvwxyz0123456789 37 37]
 test regexp-20.2 {regsub shared object shimmering with -about} {
     eval regexp -about abc
 } {0 {}}
diff --git a/tests/regexpComp.test b/tests/regexpComp.test
index dc7b909..fbf8012 100644
--- a/tests/regexpComp.test
+++ b/tests/regexpComp.test
@@ -798,9 +798,9 @@ test regexpComp-20.1 {regsub shared object shimmering} {
 	set b $a
 	set c abcdefghijklmnopqurstuvwxyz0123456789
 	regsub $a $c $b d
-	list $d [string length $d]
+	list $d [string length $d] [string bytelength $d]
     }
-} [list abcdefghijklmnopqurstuvwxyz0123456789 37]
+} [list abcdefghijklmnopqurstuvwxyz0123456789 37 37]
 test regexpComp-20.2 {regsub shared object shimmering with -about} {
     evalInProc {
 	eval regexp -about abc
-- 
cgit v0.12