summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-03-03 21:30:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-03-03 21:30:39 (GMT)
commit899174261fca68ba566c1b2a0123f0359d38642b (patch)
tree61b9fd261a9a7461ac9426a83c57c994239a9bcf
parentb8eebc935bb7b0d587afc258c7d5d7c628d48be6 (diff)
parent9cdc14d4f0772cc73d3712b6944048ac0b2a2659 (diff)
downloadtcl-899174261fca68ba566c1b2a0123f0359d38642b.zip
tcl-899174261fca68ba566c1b2a0123f0359d38642b.tar.gz
tcl-899174261fca68ba566c1b2a0123f0359d38642b.tar.bz2
Fix [d63061a1ac]: PRIVATE != CONTROL in Unicode
-rw-r--r--generic/regc_locale.c3
-rw-r--r--generic/tclUtf.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/generic/regc_locale.c b/generic/regc_locale.c
index d56f56e..3f2fc46 100644
--- a/generic/regc_locale.c
+++ b/generic/regc_locale.c
@@ -1101,9 +1101,8 @@ cclass(
addchr(cv, ' ');
break;
case CC_CNTRL:
- cv = getcvec(v, NUM_CONTROL_CHAR, NUM_CONTROL_RANGE+1);
+ cv = getcvec(v, NUM_CONTROL_CHAR, NUM_CONTROL_RANGE);
if (cv) {
- addrange(cv, 0xE000, 0xF8FF); /* private */
for (i=0 ; i<NUM_CONTROL_RANGE ; i++) {
addrange(cv, controlRangeTable[i].start,
controlRangeTable[i].end);
diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index 736da66..6fbeb36 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -26,7 +26,7 @@
#define ALPHA_BITS ((1 << UPPERCASE_LETTER) | (1 << LOWERCASE_LETTER) \
| (1 << TITLECASE_LETTER) | (1 << MODIFIER_LETTER) | (1<<OTHER_LETTER))
-#define CONTROL_BITS ((1 << CONTROL) | (1 << FORMAT) | (1 << PRIVATE_USE))
+#define CONTROL_BITS ((1 << CONTROL) | (1 << FORMAT))
#define DIGIT_BITS (1 << DECIMAL_DIGIT_NUMBER)