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/tclCompExpr.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/tclCompExpr.c')
| -rw-r--r-- | generic/tclCompExpr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index 41938e3..fa15fba 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -1928,7 +1928,7 @@ ParseLexeme( { const char *end; int scanned, size; - Tcl_UniChar ch = 0; + int ch; Tcl_Obj *literal = NULL; unsigned char byte; @@ -2145,14 +2145,14 @@ ParseLexeme( */ if (!TclIsBareword(*start) || *start == '_') { - if (Tcl_UtfCharComplete(start, numBytes)) { - scanned = TclUtfToUniChar(start, &ch); + if (TclUCS4Complete(start, numBytes)) { + scanned = TclUtfToUCS4(start, &ch); } else { - char utfBytes[4]; + char utfBytes[8]; memcpy(utfBytes, start, numBytes); utfBytes[numBytes] = '\0'; - scanned = TclUtfToUniChar(utfBytes, &ch); + scanned = TclUtfToUCS4(utfBytes, &ch); } *lexemePtr = INVALID; Tcl_DecrRefCount(literal); |