summaryrefslogtreecommitdiffstats
path: root/tools/uniClass.tcl
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-01-22 15:30:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-01-22 15:30:54 (GMT)
commitb8651ae498dba4d0a1edcff000582bc06a7a8efe (patch)
treef6dc9eb4efcd8c11cba9e7f1631dcd099682faba /tools/uniClass.tcl
parenta7072a53147e689d2c265a66e87a2f6f74c86014 (diff)
parent11fcad9b1df2c2cf7d5ada8feb565c97b9777fef (diff)
downloadtcl-b8651ae498dba4d0a1edcff000582bc06a7a8efe.zip
tcl-b8651ae498dba4d0a1edcff000582bc06a7a8efe.tar.gz
tcl-b8651ae498dba4d0a1edcff000582bc06a7a8efe.tar.bz2
merge trunkrfe_3473670
expand all unicode tables and tools to eventually handle the unicode chars > 0xffff (if UTF_MAX_CHAR > 3)
Diffstat (limited to 'tools/uniClass.tcl')
-rw-r--r--tools/uniClass.tcl38
1 files changed, 32 insertions, 6 deletions
diff --git a/tools/uniClass.tcl b/tools/uniClass.tcl
index 55aa44c..f741434 100644
--- a/tools/uniClass.tcl
+++ b/tools/uniClass.tcl
@@ -13,22 +13,36 @@ exec tclsh "$0" ${1+"$@"}
#
proc emitRange {first last} {
- global ranges numranges chars numchars
+ global ranges numranges chars numchars extchars extranges
if {$first < ($last-1)} {
- append ranges [format "{0x%04x, 0x%04x}, " \
+ if {!$extranges && ($first) > 0xffff} {
+ set extranges 1
+ set numranges 0
+ set ranges [string trimright $ranges " \n\r\t,"]
+ append ranges "\n#if MAX_UTF_CHAR > 4\n ,"
+ }
+ append ranges [format "{0x%x, 0x%x}, " \
$first $last]
if {[incr numranges] % 4 == 0} {
+ set ranges [string trimright $ranges]
append ranges "\n "
}
} else {
- append chars [format "0x%04x, " $first]
+ if {!$extchars && ($first) > 0xffff} {
+ set extchars 1
+ set numchars 0
+ set chars [string trimright $chars " \n\r\t,"]
+ append chars "\n#if MAX_UTF_CHAR > 4\n ,"
+ }
+ append chars [format "0x%x, " $first]
incr numchars
if {$numchars % 9 == 0} {
+ set chars [string trimright $chars]
append chars "\n "
}
if {$first != $last} {
- append chars [format "0x%04x, " $last]
+ append chars [format "0x%x, " $last]
incr numchars
if {$numchars % 9 == 0} {
append chars "\n "
@@ -38,7 +52,7 @@ proc emitRange {first last} {
}
proc genTable {type} {
- global first last ranges numranges chars numchars
+ global first last ranges numranges chars numchars extchars extranges
set first -2
set last -2
@@ -46,8 +60,14 @@ proc genTable {type} {
set numranges 0
set chars " "
set numchars 0
+ set extchars 0
+ set extranges 0
- for {set i 0} {$i <= 0xFFFF} {incr i} {
+ for {set i 0} {$i <= 0x10ffff} {incr i} {
+ if {$i == 0xd800} {
+ # Skip surrogates
+ set i 0xdc00
+ }
if {[string is $type [format %c $i]]} {
if {$i == ($last + 1)} {
set last $i
@@ -63,7 +83,13 @@ proc genTable {type} {
emitRange $first $last
set ranges [string trimright $ranges "\t\n ,"]
+ if {$extranges} {
+ append ranges "\n#endif"
+ }
set chars [string trimright $chars "\t\n ,"]
+ if {$extchars} {
+ append chars "\n#endif"
+ }
if {$ranges ne ""} {
puts "static CONST crange ${type}RangeTable\[\] = {\n$ranges\n};\n"
puts "#define NUM_[string toupper $type]_RANGE (sizeof(${type}RangeTable)/sizeof(crange))\n"