diff options
author | dgp <dgp@users.sourceforge.net> | 2020-04-17 05:14:43 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2020-04-17 05:14:43 (GMT) |
commit | ad85391b59eba72ecf8c0af3e83f800c61e52f26 (patch) | |
tree | 3e98250863dd97f27569a1c73642052b44c408e4 /generic/tclUtf.c | |
parent | 1edc023972ada28abd9649c5e153f0705ba1268d (diff) | |
download | tcl-ad85391b59eba72ecf8c0af3e83f800c61e52f26.zip tcl-ad85391b59eba72ecf8c0af3e83f800c61e52f26.tar.gz tcl-ad85391b59eba72ecf8c0af3e83f800c61e52f26.tar.bz2 |
When supporting 4-byte sequences even with TCL_UTF_MAX = 3, need to
paramterize a few things differently. (utf-4.11 failures).
Diffstat (limited to 'generic/tclUtf.c')
-rw-r--r-- | generic/tclUtf.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index e637263..4b5d500 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -84,11 +84,7 @@ static const unsigned char complete[256] = { #endif 2,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, -#if TCL_UTF_MAX > 4 4,4,4,4,4, -#else - 3,3,3,3,3, /* Tcl_UtfCharComplete() only checks TCL_UTF_MAX bytes */ -#endif 1,1,1,1,1,1,1,1,1,1,1 }; @@ -606,14 +602,14 @@ Tcl_NumUtfChars( src = next; } } else { - register const char *endPtr = src + length - TCL_UTF_MAX; + register const char *endPtr = src + length - /*TCL_UTF_MAX*/ 4; while (src < endPtr) { next = TclUtfNext(src); i += 1 + ((next - src) > 3); src = next; } - endPtr += TCL_UTF_MAX; + endPtr += /*TCL_UTF_MAX*/ 4; while ((src < endPtr) && Tcl_UtfCharComplete(src, endPtr - src)) { next = TclUtfNext(src); i += 1 + ((next - src) > 3); |