diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-02 16:35:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-02 16:35:26 (GMT) |
| commit | 0801e742abbbe74e43b87b0ea139e700c7094627 (patch) | |
| tree | 839a5006f6d67a3ccf53e0115d6c47c9afdc80a6 /generic/tclScan.c | |
| parent | bfaca509637e46e0ffd48c20a60b78c617c7bf44 (diff) | |
| download | tcl-0801e742abbbe74e43b87b0ea139e700c7094627.zip tcl-0801e742abbbe74e43b87b0ea139e700c7094627.tar.gz tcl-0801e742abbbe74e43b87b0ea139e700c7094627.tar.bz2 | |
Fix some "scan.test" test-cases when TCL_UTF_MAX=4. Wrongly resolved merge-conflict in previous cherry-pick merge.
Diffstat (limited to 'generic/tclScan.c')
| -rw-r--r-- | generic/tclScan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c index ade5f33..1ff83af 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.c @@ -888,8 +888,8 @@ Tcl_ScanObjCmd( offset = TclUtfToUniChar(string, &sch); i = (int)sch; #if TCL_UTF_MAX == 4 - if (!offset) { - offset = TclUtfToUniChar(string, &sch); + if ((sch >= 0xD800) && (offset < 3)) { + offset += TclUtfToUniChar(string+offset, &sch); i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF); } #endif |