diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-25 11:53:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-05-25 11:53:11 (GMT) |
| commit | 0fce9600ee90c152b14295a28da571c3a4db622b (patch) | |
| tree | 02f0d74e4805e8df0a4a0cee31f740af55aa3bff /generic/tclUtf.c | |
| parent | 52819473a2f3c699983cec389ca6430a42dff612 (diff) | |
| download | tcl-0fce9600ee90c152b14295a28da571c3a4db622b.zip tcl-0fce9600ee90c152b14295a28da571c3a4db622b.tar.gz tcl-0fce9600ee90c152b14295a28da571c3a4db622b.tar.bz2 | |
Finish implementation of "string nextchar|nextword|prevchar|prevword". Not thourougly test yet, but seems OK at first sight.
Diffstat (limited to 'generic/tclUtf.c')
| -rw-r--r-- | generic/tclUtf.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index db2fc02..807e087 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -2642,12 +2642,25 @@ TclUniCharToUCS4( * by the Tcl_UniChar string. */ { if (((src[0] & 0xFC00) == 0xD800) && ((src[1] & 0xFC00) == 0xDC00)) { - *ucs4Ptr = (((src[0] & 0x3FF) << 10) | (src[01] & 0x3FF)) + 0x10000; + *ucs4Ptr = (((src[0] & 0x3FF) << 10) | (src[1] & 0x3FF)) + 0x10000; return 2; } *ucs4Ptr = src[0]; return 1; } + +const Tcl_UniChar *TclUCS4Prev(const Tcl_UniChar *src, const Tcl_UniChar *ptr) { + if (src <= ptr + 1) { + return ptr; + } + if (((src[-1] & 0xFC00) == 0xDC00) && ((src[-2] & 0xFC00) == 0xD800)) { + return src - 2; + } + return src - 1; +} + + + #endif /* |