prepare v4.2.5

[m6w6/ext-http] / scripts / gen_switch_utf8.php

diff --git a/scripts/gen_switch_utf8.php b/scripts/gen_switch_utf8.php
index 242450a2391e646dc68a17a3599f40aea9fad639..66a97c8c73f7371806f574c51fd7cf890e0df6d0 100755 (executable)
--- a/scripts/gen_switch_utf8.php
+++ b/scripts/gen_switch_utf8.php
@@ -9,12 +9,18 @@ set_error_handler(function($c, $e, $f, $l) {
 $i18n = $argc >= 2 ? $argv[1] : "/usr/share/i18n/locales/i18n";
 
 $b = 10;
+$m = 0xfffff000 >> $b;
+$b2 = 8;
+$x = $m >> $b2;
 
 $f = fopen($i18n, "r");
 $c = false;
 $a = false;
 
+$ranges = $lables = $gotos = [];
+
 ob_start(null, 0xfffff);
+
 while (!feof($f)) {
        $line = fgets($f);
        if (!$c && $line !== "LC_CTYPE\n") {
@@ -34,8 +40,8 @@ while (!feof($f)) {
                break;
        case " ":
                if ($a) {
-                       foreach (explode(";", trim($line, "\n/ ;")) as $ranges) {
-                               $range = explode("..", $ranges);
+                       foreach (explode(";", trim($line, "\n/ ;")) as $list) {
+                               $range = explode("..", $list);
                                $step = 0;
                                $end = 0;
                                switch (count($range)) {
@@ -57,7 +63,26 @@ while (!feof($f)) {
                                        sscanf($sstart, "<U%X>", $start);
                                        break;
                                }
-                               $r[$start >> $b][]=[$start,$end,$step];
+                               $sw = $start >> $b;
+                               $sw2 = ($start & $m) >> $b2;
+                               if (isset($ranges[$sw][$sw2])) {
+                                       //$ranges[$sw][$sw2] = array_filter($ranges[$sw][$sw2]);
+                               }
+                               $ranges[$sw][$sw2][]=[$start,$end,$step];
+                               if ($end) {
+                                       $goto = $start;
+                               }
+                               while (($start += $step) <= $end) {
+                                       $ssw = $start >> $b;
+                                       $ssw2 = ($start & $m) >> $b2;
+                                       if (!isset($ranges[$ssw][$ssw2]) || null !== end($ranges[$ssw][$ssw2])) {
+                                               $ranges[$ssw][$ssw2][]=null;
+                                       }
+                                       if ($ssw != $sw || $ssw2 != $sw2) {
+                                               $gotos[$ssw][$ssw2] = $goto;
+                                               $labels[$sw][$sw2] = $goto;
+                                       }
+                               }
                        }
                }
                break;
@@ -72,25 +97,53 @@ while (!feof($f)) {
 }
 
 function sp($sp, $ch = " ") { return str_repeat($ch, $sp); }
+
 printf("switch (ch >> %d) {\n", $b);
-foreach ($r as $sw => $specs) {
+foreach ($ranges as $sw => $sws) {
        printf("case 0x%08X:\n", $sw);
-       $sp = 1;
-       foreach ($specs as list($start, $end, $step)) {
-               if ($end) {
-                       if ($step > 1) {
-                               die("\nUNEXPECTED: step>1\n");
-                               printf("\tfor (i=0x%08X; i <= 0x%08X; i+= %d) { if (i == ch) return 1; }\n", $start, $end, $step);
+       printf(" switch((ch & 0x%08X) >> %d) {\n", $m, $b2);
+       foreach ($sws as $sw2 => $specs) {
+               printf(" case 0x%08X:\n", $sw2);
+               $sp = 2;
+               $start = null;
+               foreach ($specs as $index => $spec) {
+                       if ($spec) {
+                               list($start, $end, $step) = $spec;
+                               if (isset($labels[$sw][$sw2])) {
+                                       $label = $labels[$sw][$sw2];
+                                       if ((!$end && $label == $start) || ($end && $label >= $start && $label <= $end)) {
+                                               printf("%sc_%08X:;\n", sp($sp), $label);
+                                       }
+                               }
+                               if ($end) {
+                                       if ($step > 1) {
+                                               die("\nUNEXPECTED: step>1\n");
+                                               printf("\tfor (i=0x%08X; i <= 0x%08X; i+= %d) { if (i == ch) return 1; }\n", $start, $end, $step);
+                                       } else {
+                                               printf("%sif (ch >= 0x%08X) {\n", sp($sp), $start);
+                                               printf("%sif (ch <= 0x%08X) return 1;\n", sp(++$sp), $end);
+                                       }
+                               } else {
+                                       printf("%sif (ch == 0x%08X) return 1;\n", sp($sp), $start);
+                               }                       
                        } else {
-                               //printf(" if (ch >= 0x%08X && ch <= 0x%08X) return 1;\n", $start, $end);
-                               printf("%sif (ch >= 0x%08X) {\n", sp($sp), $start);
-                               printf("%sif (ch <= 0x%08X) return 1;\n", sp(++$sp), $end);
+                               if (isset($gotos[$sw][$sw2]) && !$start) {
+                                       if (isset($specs[$index + 1])) {
+                                               list($next) = $specs[$index + 1];
+                                               printf("%sif (ch < 0x%08X)\n ", sp($sp), $next);
+                                       }
+                                       $goto = $gotos[$sw][$sw2];
+                                       printf("%sgoto c_%08X;\n", sp($sp), $goto);
+                                       $start = $goto;
+                               }
                        }
-               } else {
-                       printf("%sif (ch == 0x%08X) return 1;\n", sp($sp), $start);
                }
+               if ($sp > 2) {
+                       printf("  %s\n", sp($sp-2, "}"));
+               }
+               printf("  break;\n");
        }
-       printf(" %s\n break;\n", sp(--$sp, "}"));
+       printf(" }\n break;\n");
 }
 printf("}\n");