Backed out changeset 1d3177608997 (bug 1081858)

intl/unicharutil/tools/genUnicodePropertyData.pl

@@ -22,7 +22,6 @@
 #       - BidiBrackets.txt
 #       - HangulSyllableType.txt
 #       - LineBreak.txt
-#       - EastAsianWidth.txt
 #       - ReadMe.txt (to record version/date of the UCD)
 #       - Unihan_Variants.txt (from Unihan.zip)
 #     though this may change if we find a need for additional properties.
@@ -232,15 +231,6 @@ my %lineBreakCode = ( # ordering matches ICU's ULineBreak enum
   "RI" => 39
 );
 
-my %eastAsianWidthCode = (
-  "N" => 0,
-  "A" => 1,
-  "H" => 2,
-  "W" => 3,
-  "F" => 4,
-  "Na" => 5
-);
-
 # initialize default properties
 my @script;
 my @category;
@@ -257,7 +247,6 @@ my @fullWidth;
 my @fullWidthInverse;
 my @verticalOrientation;
 my @lineBreak;
-my @eastAsianWidthFWH;
 for (my $i = 0; $i < 0x110000; ++$i) {
     $script[$i] = $scriptCode{"UNKNOWN"};
     $category[$i] = $catCode{"UNASSIGNED"};
@@ -272,7 +261,6 @@ for (my $i = 0; $i < 0x110000; ++$i) {
     $fullWidthInverse[$i] = 0;
     $verticalOrientation[$i] = 1; # default for unlisted codepoints is 'R'
     $lineBreak[$i] = $lineBreakCode{"XX"};
-    $eastAsianWidthFWH[$i] = 0;
 }
 
 # blocks where the default for bidi category is not L
@@ -534,29 +522,6 @@ while (<FH>) {
 }
 close FH;
 
-# read EastAsianWidth.txt
-open FH, "< $UNICODE/EastAsianWidth.txt" or die "can't open UCD file EastAsianWidth.txt\n";
-push @versionInfo, "";
-while (<FH>) {
-    chomp;
-    push @versionInfo, $_;
-    last if /Date:/;
-}
-while (<FH>) {
-    s/#.*//;
-    if (m/([0-9A-F]{4,6})(?:\.\.([0-9A-F]{4,6}))*\s*;\s*([^ ]+)/) {
-        my $start = hex "0x$1";
-        my $end = (defined $2) ? hex "0x$2" : $start;
-        my $eaw = $3;
-        warn "unknown EastAsianWidth class" unless exists $eastAsianWidthCode{$eaw};
-        my $isFWH = ($eaw =~ m/^[FWH]$/) ? 1 : 0;
-        for (my $i = $start; $i <= $end; ++$i) {
-            $eastAsianWidthFWH[$i] = $isFWH;
-        }
-    }
-}
-close FH;
-
 # read xidmodifications.txt
 open FH, "< $UNICODE/security/xidmodifications.txt" or die "can't open UCD file xidmodifications.txt\n";
 push @versionInfo, "";
@@ -754,17 +719,15 @@ struct nsCharProps2 {
 sub sprintCharProps2_full
 {
   my $usv = shift;
-  return sprintf("{%d,%d,%d,%d,%d,%d,%d,%d,%d},",
-                 $script[$usv], $pairedBracketType[$usv],
-                 $eastAsianWidthFWH[$usv], $category[$usv],
+  return sprintf("{%d,%d,%d,%d,%d,%d,%d,%d},",
+                 $script[$usv], $pairedBracketType[$usv], $category[$usv],
                  $bidicategory[$usv], $xidmod[$usv], $numericvalue[$usv],
                  $verticalOrientation[$usv], $lineBreak[$usv]);
 }
 $type = q|
 struct nsCharProps2 {
   unsigned char mScriptCode:8;
-  unsigned char mPairedBracketType:2;
-  unsigned char mEastAsianWidthFWH:1;
+  unsigned char mPairedBracketType:3; // only 2 bits actually needed
   unsigned char mCategory:5;
   unsigned char mBidiCategory:5;
   unsigned char mXidmod:4;

intl/unicharutil/util/nsUnicodeProperties.cpp

@@ -60,7 +60,6 @@ GetCharProps2(uint32_t aCh)
 #else
         uint8_t(Script::UNKNOWN),
         PAIRED_BRACKET_TYPE_NONE,
-        0, // EastAsianWidthFWH
         HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED,
         eCharType_LeftToRight,
         XIDMOD_NOT_CHARS,

intl/unicharutil/util/nsUnicodeScriptCodes.h

@@ -11,7 +11,7 @@
  */
 
 /*
- * Created on Wed Oct 26 09:12:45 2016 from UCD data files with version info:
+ * Created on Tue Oct 25 10:05:43 2016 from UCD data files with version info:
  *
 
 # Date: 2015-06-16, 20:24:00 GMT [KW]
@@ -47,9 +47,6 @@ Standard.
 # LineBreak-8.0.0.txt
 # Date: 2015-02-13, 09:15:00 GMT [KW, LI]
 
-# EastAsianWidth-8.0.0.txt
-# Date: 2015-02-10, 21:00:00 GMT [KW, LI]
-
 # File: xidmodifications.txt
 # Version: 8.0.0
 # Generated: 2015-05-17, 03:09:04 GMT
@@ -95,8 +92,7 @@ struct nsCharProps2 {
 
 struct nsCharProps2 {
   unsigned char mScriptCode:8;
-  unsigned char mPairedBracketType:2;
-  unsigned char mEastAsianWidthFWH:1;
+  unsigned char mPairedBracketType:3; // only 2 bits actually needed
   unsigned char mCategory:5;
   unsigned char mBidiCategory:5;
   unsigned char mXidmod:4;