* generic/tclBasic.c: More replacements of Tcl_UtfBackslash() calls

        * generic/tclCompile.c: with TclParseBackslash() where possible.
        * generic/tclParse.c:
        * generic/tclUtil.c:

1 files changed, 16 insertions, 15 deletions

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 211a7cd..d6e5b7b 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -327,14 +327,13 @@ TclFindElement(
  *
  * TclCopyAndCollapse --
  *
- *	Copy a string and eliminate any backslashes that aren't in braces.
+ *	Copy a string and substitute all backslash escape sequences
  *
  * Results:
- *	Count characters get copied from src to dst. Along the way, if
- *	backslash sequences are found outside braces, the backslashes are
- *	eliminated in the copy. After scanning count chars from source, a null
- *	character is placed at the end of dst. Returns the number of
- *	characters that got copied.
+ *	Count bytes get copied from src to dst. Along the way, backslash
+ *	sequences are substituted in the copy.  After scanning count bytes
+ *	from src, a null character is placed at the end of dst.  Returns
+ *	the number of bytes that got written to dst.
  *
  * Side effects:
  *	None.
@@ -344,26 +343,28 @@ TclFindElement(
 
 int
 TclCopyAndCollapse(
-    int count,			/* Number of characters to copy from src. */
+    int count,			/* Number of byte to copy from src. */
     CONST char *src,		/* Copy from here... */
     char *dst)			/* ... to here. */
 {
-    register char c;
-    int numRead;
     int newCount = 0;
-    int backslashCount;
 
-    for (c = *src;  count > 0;  src++, c = *src, count--) {
+    while (count > 0) {
+	char c = *src;
 	if (c == '\\') {
-	    backslashCount = Tcl_UtfBackslash(src, &numRead, dst);
+	    int numRead;
+	    int backslashCount = TclParseBackslash(src, count, &numRead, dst);
+
 	    dst += backslashCount;
 	    newCount += backslashCount;
-	    src += numRead-1;
-	    count -= numRead-1;
+	    src += numRead;
+	    count -= numRead;
 	} else {
 	    *dst = c;
 	    dst++;
 	    newCount++;
+	    src++;
+	    count--;
 	}
     }
     *dst = 0;
@@ -740,7 +741,7 @@ Tcl_ScanCountedElement(
 	    } else {
 		int size;
 
-		Tcl_UtfBackslash(p, &size, NULL);
+		TclParseBackslash(p, lastChar - p, &size, NULL);
 		p += size-1;
 		flags |= USE_BRACES;
 	    }