diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-05 17:06:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-05 17:06:22 (GMT) |
| commit | ba934aa27e1d1b8a6b0110817028080ea4c6694d (patch) | |
| tree | 620ee207ede848ef890070313145c275721cb615 /generic/tclUtil.c | |
| parent | dd5f3f71b128a5c8f8fbc9a9ae52219a38709e96 (diff) | |
| parent | f2abeaba919cf08d6db314afbcc6e0f2360967ec (diff) | |
| download | tcl-ba934aa27e1d1b8a6b0110817028080ea4c6694d.zip tcl-ba934aa27e1d1b8a6b0110817028080ea4c6694d.tar.gz tcl-ba934aa27e1d1b8a6b0110817028080ea4c6694d.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclUtil.c')
| -rw-r--r-- | generic/tclUtil.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 0cf5d98..0241e29 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -2208,7 +2208,7 @@ Tcl_StringCaseMatch( } else { TclUtfToUCS4(pattern, &ch2); if (nocase) { - ch2 = Tcl_UniCharFold(ch2); + ch2 = Tcl_UniCharToLower(ch2); } } @@ -2223,7 +2223,7 @@ Tcl_StringCaseMatch( if (nocase) { while (*str) { charLen = TclUtfToUCS4(str, &ch1); - if (ch2==ch1 || ch2==Tcl_UniCharFold(ch1)) { + if (ch2==ch1 || ch2==Tcl_UniCharToLower(ch1)) { break; } str += charLen; @@ -2282,7 +2282,7 @@ Tcl_StringCaseMatch( } else { str += TclUtfToUCS4(str, &ch1); if (nocase) { - ch1 = Tcl_UniCharFold(ch1); + ch1 = Tcl_UniCharToLower(ch1); } } while (1) { @@ -2296,7 +2296,7 @@ Tcl_StringCaseMatch( } else { pattern += TclUtfToUCS4(pattern, &startChar); if (nocase) { - startChar = Tcl_UniCharFold(startChar); + startChar = Tcl_UniCharToLower(startChar); } } if (*pattern == '-') { @@ -2311,7 +2311,7 @@ Tcl_StringCaseMatch( } else { pattern += TclUtfToUCS4(pattern, &endChar); if (nocase) { - endChar = Tcl_UniCharFold(endChar); + endChar = Tcl_UniCharToLower(endChar); } } if (((startChar <= ch1) && (ch1 <= endChar)) @@ -2360,7 +2360,7 @@ Tcl_StringCaseMatch( str += TclUtfToUCS4(str, &ch1); pattern += TclUtfToUCS4(pattern, &ch2); if (nocase) { - if (Tcl_UniCharFold(ch1) != Tcl_UniCharFold(ch2)) { + if (Tcl_UniCharToLower(ch1) != Tcl_UniCharToLower(ch2)) { return 0; } } else if (ch1 != ch2) { |