diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-19 08:57:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-19 08:57:49 (GMT) |
| commit | 14ec7c1d858d00e7c69c80c28cf599095dd3feaf (patch) | |
| tree | c1bbe67b99dbfd4a521682975956b358f53f7bb2 /generic/tclParse.c | |
| parent | 72c49f69099c98bd55334dbad3d68645c72bc707 (diff) | |
| parent | 8e1f957a669b2f4b84dca7e8a27f2985c0625172 (diff) | |
| download | tcl-14ec7c1d858d00e7c69c80c28cf599095dd3feaf.zip tcl-14ec7c1d858d00e7c69c80c28cf599095dd3feaf.tar.gz tcl-14ec7c1d858d00e7c69c80c28cf599095dd3feaf.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclParse.c')
| -rw-r--r-- | generic/tclParse.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclParse.c b/generic/tclParse.c index daad31d..b863ff2 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -789,7 +789,7 @@ TclParseBackslash( * written. At most 4 bytes will be written there. */ { const char *p = src+1; - Tcl_UniChar unichar = 0; + int unichar; int result; int count; char buf[4] = ""; @@ -935,14 +935,14 @@ TclParseBackslash( * #217987] test subst-3.2 */ - if (Tcl_UtfCharComplete(p, numBytes - 1)) { - count = TclUtfToUniChar(p, &unichar) + 1; /* +1 for '\' */ + if (TclUCS4Complete(p, numBytes - 1)) { + count = TclUtfToUCS4(p, &unichar) + 1; /* +1 for '\' */ } else { - char utfBytes[4]; + char utfBytes[8]; memcpy(utfBytes, p, numBytes - 1); utfBytes[numBytes - 1] = '\0'; - count = TclUtfToUniChar(utfBytes, &unichar) + 1; + count = TclUtfToUCS4(utfBytes, &unichar) + 1; } result = unichar; break; |