Remove Unicode.h
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Feb 2014 18:38:54 +0000 (18:38 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Feb 2014 18:38:54 +0000 (18:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=128106

Reviewed by Anders Carlsson.

* GNUmakefile.list.am: Removed files.
* WTF.vcxproj/WTF.vcxproj: Ditto.
* WTF.vcxproj/WTF.vcxproj.filters: Ditto.
* WTF.xcodeproj/project.pbxproj: Ditto.
* wtf/CMakeLists.txt: Ditto.

* wtf/unicode/ScriptCodesFromICU.h: Removed.
* wtf/unicode/Unicode.h: Removed.
* wtf/unicode/UnicodeMacrosFromICU.h: Removed.
* wtf/unicode/icu/UnicodeIcu.h: Removed.
* wtf/unicode/wchar/UnicodeWchar.cpp: Removed.
* wtf/unicode/wchar/UnicodeWchar.h: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WTF/ChangeLog
Source/WTF/GNUmakefile.list.am
Source/WTF/WTF.vcxproj/WTF.vcxproj
Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
Source/WTF/WTF.xcodeproj/project.pbxproj
Source/WTF/wtf/CMakeLists.txt
Source/WTF/wtf/unicode/ScriptCodesFromICU.h [deleted file]
Source/WTF/wtf/unicode/Unicode.h [deleted file]
Source/WTF/wtf/unicode/UnicodeMacrosFromICU.h [deleted file]
Source/WTF/wtf/unicode/icu/UnicodeIcu.h [deleted file]
Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp [deleted file]
Source/WTF/wtf/unicode/wchar/UnicodeWchar.h [deleted file]

index 0d4a024d36cb3fc48fc37f30627ead263788f57c..1d363c72383a913634be2a7a61bdfa47709b9025 100644 (file)
@@ -1,3 +1,23 @@
+2014-02-03  Darin Adler  <darin@apple.com>
+
+        Remove Unicode.h
+        https://bugs.webkit.org/show_bug.cgi?id=128106
+
+        Reviewed by Anders Carlsson.
+
+        * GNUmakefile.list.am: Removed files.
+        * WTF.vcxproj/WTF.vcxproj: Ditto.
+        * WTF.vcxproj/WTF.vcxproj.filters: Ditto.
+        * WTF.xcodeproj/project.pbxproj: Ditto.
+        * wtf/CMakeLists.txt: Ditto.
+
+        * wtf/unicode/ScriptCodesFromICU.h: Removed.
+        * wtf/unicode/Unicode.h: Removed.
+        * wtf/unicode/UnicodeMacrosFromICU.h: Removed.
+        * wtf/unicode/icu/UnicodeIcu.h: Removed.
+        * wtf/unicode/wchar/UnicodeWchar.cpp: Removed.
+        * wtf/unicode/wchar/UnicodeWchar.h: Removed.
+
 2014-01-25  Darin Adler  <darin@apple.com>
 
         Stop using Unicode.h
index 54fedb1b3f78460c5a8d7ea07da652d6651963c3..237ab98e1623f2d615a8a2db13bad1e56c1d0cd2 100644 (file)
@@ -251,10 +251,6 @@ wtf_sources += \
     Source/WTF/wtf/unicode/CharacterNames.h \
     Source/WTF/wtf/unicode/Collator.h \
     Source/WTF/wtf/unicode/CollatorDefault.cpp \
-    Source/WTF/wtf/unicode/ScriptCodesFromICU.h \
     Source/WTF/wtf/unicode/UTF8.cpp \
     Source/WTF/wtf/unicode/UTF8.h \
-    Source/WTF/wtf/unicode/Unicode.h \
-    Source/WTF/wtf/unicode/UnicodeMacrosFromICU.h \
-    Source/WTF/wtf/unicode/icu/CollatorICU.cpp \
-    Source/WTF/wtf/unicode/icu/UnicodeIcu.h
+    Source/WTF/wtf/unicode/icu/CollatorICU.cpp
index 991a0392226bec97076b6861f61a7740bf7739a6..440afe1d645f52b773f9e1d656aff450a778567b 100644 (file)
     <ClInclude Include="..\wtf\threads\BinarySemaphore.h" />
     <ClInclude Include="..\wtf\unicode\CharacterNames.h" />
     <ClInclude Include="..\wtf\unicode\Collator.h" />
-    <ClInclude Include="..\wtf\unicode\icu\UnicodeIcu.h" />
-    <ClInclude Include="..\wtf\unicode\Unicode.h" />
-    <ClInclude Include="..\wtf\unicode\UnicodeMacrosFromICU.h" />
     <ClInclude Include="..\wtf\unicode\UTF8.h" />
     <ClInclude Include="..\wtf\ValueCheck.h" />
     <ClInclude Include="..\wtf\Vector.h" />
index 7028072c0b2b9c185f5b6d38d5844273b5dc0884..2241a85b7d5be375c6377dae760e255e10d55110 100644 (file)
     <ClInclude Include="..\wtf\threadspecific.h">
       <Filter>wtf</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\unicode\icu\UnicodeIcu.h">
-      <Filter>wtf\unicode\icu</Filter>
-    </ClInclude>
     <ClInclude Include="..\wtf\unicode\CharacterNames.h">
       <Filter>wtf\unicode</Filter>
     </ClInclude>
     <ClInclude Include="..\wtf\unicode\Collator.h">
       <Filter>wtf\unicode</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\unicode\Unicode.h">
-      <Filter>wtf\unicode</Filter>
-    </ClInclude>
-    <ClInclude Include="..\wtf\unicode\UnicodeMacrosFromICU.h">
-      <Filter>wtf\unicode</Filter>
-    </ClInclude>
     <ClInclude Include="..\wtf\unicode\UTF8.h">
       <Filter>wtf\unicode</Filter>
     </ClInclude>
index 543c123c2796ef7135cc0224d8463b06f6a45454..fe2755c717d126c70593c5317985c1bcb3e30e7f 100644 (file)
                A8A4745F151A825B004123FF /* Collator.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4734A151A825B004123FF /* Collator.h */; };
                A8A47460151A825B004123FF /* CollatorDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A4734B151A825B004123FF /* CollatorDefault.cpp */; };
                A8A47463151A825B004123FF /* CollatorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47350151A825B004123FF /* CollatorICU.cpp */; };
-               A8A47464151A825B004123FF /* UnicodeIcu.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47351151A825B004123FF /* UnicodeIcu.h */; };
-               A8A47466151A825B004123FF /* ScriptCodesFromICU.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47354151A825B004123FF /* ScriptCodesFromICU.h */; };
-               A8A47467151A825B004123FF /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47355151A825B004123FF /* Unicode.h */; };
-               A8A47468151A825B004123FF /* UnicodeMacrosFromICU.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47356151A825B004123FF /* UnicodeMacrosFromICU.h */; };
                A8A47469151A825B004123FF /* UTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47357151A825B004123FF /* UTF8.cpp */; };
                A8A4746A151A825B004123FF /* UTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47358151A825B004123FF /* UTF8.h */; };
                A8A4746D151A825B004123FF /* UnionFind.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4735C151A825B004123FF /* UnionFind.h */; };
                A8A4734A151A825B004123FF /* Collator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Collator.h; sourceTree = "<group>"; };
                A8A4734B151A825B004123FF /* CollatorDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollatorDefault.cpp; sourceTree = "<group>"; };
                A8A47350151A825B004123FF /* CollatorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollatorICU.cpp; sourceTree = "<group>"; };
-               A8A47351151A825B004123FF /* UnicodeIcu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnicodeIcu.h; sourceTree = "<group>"; };
-               A8A47354151A825B004123FF /* ScriptCodesFromICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptCodesFromICU.h; sourceTree = "<group>"; };
-               A8A47355151A825B004123FF /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unicode.h; sourceTree = "<group>"; };
-               A8A47356151A825B004123FF /* UnicodeMacrosFromICU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnicodeMacrosFromICU.h; sourceTree = "<group>"; };
                A8A47357151A825B004123FF /* UTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UTF8.cpp; sourceTree = "<group>"; };
                A8A47358151A825B004123FF /* UTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UTF8.h; sourceTree = "<group>"; };
                A8A4735C151A825B004123FF /* UnionFind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnionFind.h; sourceTree = "<group>"; };
                                A8A47349151A825B004123FF /* CharacterNames.h */,
                                A8A4734A151A825B004123FF /* Collator.h */,
                                A8A4734B151A825B004123FF /* CollatorDefault.cpp */,
-                               A8A47354151A825B004123FF /* ScriptCodesFromICU.h */,
-                               A8A47355151A825B004123FF /* Unicode.h */,
-                               A8A47356151A825B004123FF /* UnicodeMacrosFromICU.h */,
                                A8A47357151A825B004123FF /* UTF8.cpp */,
                                A8A47358151A825B004123FF /* UTF8.h */,
                        );
                        isa = PBXGroup;
                        children = (
                                A8A47350151A825B004123FF /* CollatorICU.cpp */,
-                               A8A47351151A825B004123FF /* UnicodeIcu.h */,
                        );
                        path = icu;
                        sourceTree = "<group>";
                                1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */,
                                14F3B0F715E45E4600210069 /* SaturatedArithmetic.h in Headers */,
                                1469419616EAAFF80024E146 /* SchedulePair.h in Headers */,
-                               A8A47466151A825B004123FF /* ScriptCodesFromICU.h in Headers */,
                                A8A4741F151A825B004123FF /* SegmentedVector.h in Headers */,
                                A8A47420151A825B004123FF /* SentinelLinkedList.h in Headers */,
                                A8A47422151A825B004123FF /* SHA1.h in Headers */,
                                A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */,
                                A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */,
                                149EF16316BBFE0D000A4331 /* TriState.h in Headers */,
-                               A8A47467151A825B004123FF /* Unicode.h in Headers */,
-                               A8A47464151A825B004123FF /* UnicodeIcu.h in Headers */,
-                               A8A47468151A825B004123FF /* UnicodeMacrosFromICU.h in Headers */,
                                A8A4746D151A825B004123FF /* UnionFind.h in Headers */,
                                A8A4746A151A825B004123FF /* UTF8.h in Headers */,
                                A8A473B9151A825B004123FF /* utils.h in Headers */,
index 0efabb19e524150fa1d1bf0fccee1f85a368fa1f..35ba4e46f1926dd0ce3088bb1377ccabbee5b118 100644 (file)
@@ -142,7 +142,6 @@ set(WTF_HEADERS
     unicode/CharacterNames.h
     unicode/Collator.h
     unicode/UTF8.h
-    unicode/Unicode.h
 )
 
 set(WTF_SOURCES
@@ -223,9 +222,6 @@ set(WTF_LIBRARIES
     ${CMAKE_DL_LIBS}
 )
 
-list(APPEND WTF_HEADERS
-    unicode/icu/UnicodeIcu.h
-)
 list(APPEND WTF_SOURCES
     unicode/icu/CollatorICU.cpp
 )
diff --git a/Source/WTF/wtf/unicode/ScriptCodesFromICU.h b/Source/WTF/wtf/unicode/ScriptCodesFromICU.h
deleted file mode 100644 (file)
index 4760399..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *   Copyright (C) 1997-2006, International Business Machines
- *   Corporation and others.  All Rights Reserved.
- */
-
-#ifndef WTF_ScriptCodesFromICU_h
-#define WTF_ScriptCodesFromICU_h
-
-/**
- * Constants for ISO 15924 script codes.
- *
- * Many of these script codes - those from Unicode's ScriptNames.txt -
- * are character property values for Unicode's Script property.
- * See UAX #24 Script Names (http://www.unicode.org/reports/tr24/).
- *
- * Starting with ICU 3.6, constants for most ISO 15924 script codes
- * are included (currently excluding private-use codes Qaaa..Qabx).
- * For scripts for which there are codes in ISO 15924 but which are not
- * used in the Unicode Character Database (UCD), there are no Unicode characters
- * associated with those scripts.
- *
- * For example, there are no characters that have a UCD script code of
- * Hans or Hant. All Han ideographs have the Hani script code.
- * The Hans and Hant script codes are used with CLDR data.
- *
- * ISO 15924 script codes are included for use with CLDR and similar.
- *
- * @stable ICU 2.2
- */
-typedef enum UScriptCode {
-      USCRIPT_INVALID_CODE = -1,
-      USCRIPT_COMMON       =  0 , /* Zyyy */
-      USCRIPT_INHERITED    =  1,  /* Qaai */
-      USCRIPT_ARABIC       =  2,  /* Arab */
-      USCRIPT_ARMENIAN     =  3,  /* Armn */
-      USCRIPT_BENGALI      =  4,  /* Beng */
-      USCRIPT_BOPOMOFO     =  5,  /* Bopo */
-      USCRIPT_CHEROKEE     =  6,  /* Cher */
-      USCRIPT_COPTIC       =  7,  /* Copt */
-      USCRIPT_CYRILLIC     =  8,  /* Cyrl */
-      USCRIPT_DESERET      =  9,  /* Dsrt */
-      USCRIPT_DEVANAGARI   = 10,  /* Deva */
-      USCRIPT_ETHIOPIC     = 11,  /* Ethi */
-      USCRIPT_GEORGIAN     = 12,  /* Geor */
-      USCRIPT_GOTHIC       = 13,  /* Goth */
-      USCRIPT_GREEK        = 14,  /* Grek */
-      USCRIPT_GUJARATI     = 15,  /* Gujr */
-      USCRIPT_GURMUKHI     = 16,  /* Guru */
-      USCRIPT_HAN          = 17,  /* Hani */
-      USCRIPT_HANGUL       = 18,  /* Hang */
-      USCRIPT_HEBREW       = 19,  /* Hebr */
-      USCRIPT_HIRAGANA     = 20,  /* Hira */
-      USCRIPT_KANNADA      = 21,  /* Knda */
-      USCRIPT_KATAKANA     = 22,  /* Kana */
-      USCRIPT_KHMER        = 23,  /* Khmr */
-      USCRIPT_LAO          = 24,  /* Laoo */
-      USCRIPT_LATIN        = 25,  /* Latn */
-      USCRIPT_MALAYALAM    = 26,  /* Mlym */
-      USCRIPT_MONGOLIAN    = 27,  /* Mong */
-      USCRIPT_MYANMAR      = 28,  /* Mymr */
-      USCRIPT_OGHAM        = 29,  /* Ogam */
-      USCRIPT_OLD_ITALIC   = 30,  /* Ital */
-      USCRIPT_ORIYA        = 31,  /* Orya */
-      USCRIPT_RUNIC        = 32,  /* Runr */
-      USCRIPT_SINHALA      = 33,  /* Sinh */
-      USCRIPT_SYRIAC       = 34,  /* Syrc */
-      USCRIPT_TAMIL        = 35,  /* Taml */
-      USCRIPT_TELUGU       = 36,  /* Telu */
-      USCRIPT_THAANA       = 37,  /* Thaa */
-      USCRIPT_THAI         = 38,  /* Thai */
-      USCRIPT_TIBETAN      = 39,  /* Tibt */
-      /** Canadian_Aboriginal script. @stable ICU 2.6 */
-      USCRIPT_CANADIAN_ABORIGINAL = 40,  /* Cans */
-      /** Canadian_Aboriginal script (alias). @stable ICU 2.2 */
-      USCRIPT_UCAS         = USCRIPT_CANADIAN_ABORIGINAL,
-      USCRIPT_YI           = 41,  /* Yiii */
-      USCRIPT_TAGALOG      = 42,  /* Tglg */
-      USCRIPT_HANUNOO      = 43,  /* Hano */
-      USCRIPT_BUHID        = 44,  /* Buhd */
-      USCRIPT_TAGBANWA     = 45,  /* Tagb */
-
-      /* New scripts in Unicode 4 @stable ICU 2.6 */
-      USCRIPT_BRAILLE      = 46,  /* Brai */
-      USCRIPT_CYPRIOT      = 47,  /* Cprt */
-      USCRIPT_LIMBU        = 48,  /* Limb */
-      USCRIPT_LINEAR_B     = 49,  /* Linb */
-      USCRIPT_OSMANYA      = 50,  /* Osma */
-      USCRIPT_SHAVIAN      = 51,  /* Shaw */
-      USCRIPT_TAI_LE       = 52,  /* Tale */
-      USCRIPT_UGARITIC     = 53,  /* Ugar */
-
-      /** New script code in Unicode 4.0.1 @stable ICU 3.0 */
-      USCRIPT_KATAKANA_OR_HIRAGANA = 54,/*Hrkt */
-      
-#ifndef U_HIDE_DRAFT_API
-      /* New scripts in Unicode 4.1 @draft ICU 3.4 */
-      USCRIPT_BUGINESE      = 55, /* Bugi */
-      USCRIPT_GLAGOLITIC    = 56, /* Glag */
-      USCRIPT_KHAROSHTHI    = 57, /* Khar */
-      USCRIPT_SYLOTI_NAGRI  = 58, /* Sylo */
-      USCRIPT_NEW_TAI_LUE   = 59, /* Talu */
-      USCRIPT_TIFINAGH      = 60, /* Tfng */
-      USCRIPT_OLD_PERSIAN   = 61, /* Xpeo */
-
-      /* New script codes from ISO 15924 @draft ICU 3.6 */
-      USCRIPT_BALINESE                      = 62, /* Bali */
-      USCRIPT_BATAK                         = 63, /* Batk */
-      USCRIPT_BLISSYMBOLS                   = 64, /* Blis */
-      USCRIPT_BRAHMI                        = 65, /* Brah */
-      USCRIPT_CHAM                          = 66, /* Cham */
-      USCRIPT_CIRTH                         = 67, /* Cirt */
-      USCRIPT_OLD_CHURCH_SLAVONIC_CYRILLIC  = 68, /* Cyrs */
-      USCRIPT_DEMOTIC_EGYPTIAN              = 69, /* Egyd */
-      USCRIPT_HIERATIC_EGYPTIAN             = 70, /* Egyh */
-      USCRIPT_EGYPTIAN_HIEROGLYPHS          = 71, /* Egyp */
-      USCRIPT_KHUTSURI                      = 72, /* Geok */
-      USCRIPT_SIMPLIFIED_HAN                = 73, /* Hans */
-      USCRIPT_TRADITIONAL_HAN               = 74, /* Hant */
-      USCRIPT_PAHAWH_HMONG                  = 75, /* Hmng */
-      USCRIPT_OLD_HUNGARIAN                 = 76, /* Hung */
-      USCRIPT_HARAPPAN_INDUS                = 77, /* Inds */
-      USCRIPT_JAVANESE                      = 78, /* Java */
-      USCRIPT_KAYAH_LI                      = 79, /* Kali */
-      USCRIPT_LATIN_FRAKTUR                 = 80, /* Latf */
-      USCRIPT_LATIN_GAELIC                  = 81, /* Latg */
-      USCRIPT_LEPCHA                        = 82, /* Lepc */
-      USCRIPT_LINEAR_A                      = 83, /* Lina */
-      USCRIPT_MANDAEAN                      = 84, /* Mand */
-      USCRIPT_MAYAN_HIEROGLYPHS             = 85, /* Maya */
-      USCRIPT_MEROITIC                      = 86, /* Mero */
-      USCRIPT_NKO                           = 87, /* Nkoo */
-      USCRIPT_ORKHON                        = 88, /* Orkh */
-      USCRIPT_OLD_PERMIC                    = 89, /* Perm */
-      USCRIPT_PHAGS_PA                      = 90, /* Phag */
-      USCRIPT_PHOENICIAN                    = 91, /* Phnx */
-      USCRIPT_PHONETIC_POLLARD              = 92, /* Plrd */
-      USCRIPT_RONGORONGO                    = 93, /* Roro */
-      USCRIPT_SARATI                        = 94, /* Sara */
-      USCRIPT_ESTRANGELO_SYRIAC             = 95, /* Syre */
-      USCRIPT_WESTERN_SYRIAC                = 96, /* Syrj */
-      USCRIPT_EASTERN_SYRIAC                = 97, /* Syrn */
-      USCRIPT_TENGWAR                       = 98, /* Teng */
-      USCRIPT_VAI                           = 99, /* Vaii */
-      USCRIPT_VISIBLE_SPEECH                = 100, /* Visp */
-      USCRIPT_CUNEIFORM                     = 101,/* Xsux */
-      USCRIPT_UNWRITTEN_LANGUAGES           = 102,/* Zxxx */
-      USCRIPT_UNKNOWN                       = 103,/* Zzzz */ /* Unknown="Code for uncoded script", for unassigned code points */
-      /* Private use codes from Qaaa - Qabx are not supported*/
-#endif /* U_HIDE_DRAFT_API */
-      USCRIPT_CODE_LIMIT    = 104
-} UScriptCode;
-
-#endif
diff --git a/Source/WTF/wtf/unicode/Unicode.h b/Source/WTF/wtf/unicode/Unicode.h
deleted file mode 100644 (file)
index 84f7773..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  Copyright (C) 2006 George Staikos <staikos@kde.org>
- *  Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved.
- *  Copyright (C) 2007-2009 Torch Mobile, Inc.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WTF_UNICODE_H
-#define WTF_UNICODE_H
-
-#include <wtf/Assertions.h>
-
-// Define platform neutral 8 bit character type (L is for Latin-1).
-typedef unsigned char LChar;
-
-#include <wtf/unicode/icu/UnicodeIcu.h>
-
-static_assert(sizeof(UChar) == 2, "UChar must be two bytes!");
-
-#endif // WTF_UNICODE_H
diff --git a/Source/WTF/wtf/unicode/UnicodeMacrosFromICU.h b/Source/WTF/wtf/unicode/UnicodeMacrosFromICU.h
deleted file mode 100644 (file)
index 09a7036..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright (C) 1999-2004, International Business Machines Corporation and others.  All Rights Reserved.
- *
- */
-
-#ifndef UnicodeMacrosFromICU_h
-#define UnicodeMacrosFromICU_h
-
-// some defines from ICU
-
-#define U_IS_BMP(c) ((UChar32)(c)<=0xffff)
-#define U16_IS_LEAD(c) (((c)&0xfffffc00)==0xd800)
-#define U16_IS_TRAIL(c) (((c)&0xfffffc00)==0xdc00)
-#define U16_SURROGATE_OFFSET ((0xd800<<10UL)+0xdc00-0x10000)
-#define U16_GET_SUPPLEMENTARY(lead, trail) \
-    (((UChar32)(lead)<<10UL)+(UChar32)(trail)-U16_SURROGATE_OFFSET)
-
-#define U16_LEAD(supplementary) (UChar)(((supplementary)>>10)+0xd7c0)
-#define U16_TRAIL(supplementary) (UChar)(((supplementary)&0x3ff)|0xdc00)
-#define U16_LENGTH(c) ((uint32_t)(c) <= 0xffff ? 1 : 2)
-
-#define U_IS_SUPPLEMENTARY(c) ((UChar32)((c)-0x10000)<=0xfffff)
-#define U_IS_SURROGATE(c) (((c)&0xfffff800)==0xd800)
-#define U16_IS_SINGLE(c) !U_IS_SURROGATE(c)
-#define U16_IS_SURROGATE(c) U_IS_SURROGATE(c)
-#define U16_IS_SURROGATE_LEAD(c) (((c)&0x400)==0)
-
-#define U16_GET(s, start, i, length, c) { \
-    (c)=(s)[i]; \
-    if(U16_IS_SURROGATE(c)) { \
-        uint16_t __c2; \
-        if(U16_IS_SURROGATE_LEAD(c)) { \
-            if((i)+1<(length) && U16_IS_TRAIL(__c2=(s)[(i)+1])) { \
-                (c)=U16_GET_SUPPLEMENTARY((c), __c2); \
-            } \
-        } else { \
-            if((i)-1>=(start) && U16_IS_LEAD(__c2=(s)[(i)-1])) { \
-                (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \
-            } \
-        } \
-    } \
-}
-
-#define U16_PREV(s, start, i, c) { \
-    (c)=(s)[--(i)]; \
-    if(U16_IS_TRAIL(c)) { \
-        uint16_t __c2; \
-        if((i)>(start) && U16_IS_LEAD(__c2=(s)[(i)-1])) { \
-            --(i); \
-            (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \
-        } \
-    } \
-}
-
-#define U16_BACK_1(s, start, i) { \
-    if(U16_IS_TRAIL((s)[--(i)]) && (i)>(start) && U16_IS_LEAD((s)[(i)-1])) { \
-        --(i); \
-    } \
-}
-
-#define U16_NEXT(s, i, length, c) { \
-    (c)=(s)[(i)++]; \
-    if(U16_IS_LEAD(c)) { \
-        uint16_t __c2; \
-        if((i)<(length) && U16_IS_TRAIL(__c2=(s)[(i)])) { \
-            ++(i); \
-            (c)=U16_GET_SUPPLEMENTARY((c), __c2); \
-        } \
-    } \
-}
-
-#define U16_FWD_1(s, i, length) { \
-    if(U16_IS_LEAD((s)[(i)++]) && (i)<(length) && U16_IS_TRAIL((s)[i])) { \
-        ++(i); \
-    } \
-}
-
-#define U_MASK(x) ((uint32_t)1<<(x))
-
-#define U8_MAX_LENGTH 4
-
-#define U8_APPEND_UNSAFE(s, i, c) { \
-    if((uint32_t)(c)<=0x7f) { \
-        (s)[(i)++]=(uint8_t)(c); \
-    } else { \
-        if((uint32_t)(c)<=0x7ff) { \
-            (s)[(i)++]=(uint8_t)(((c)>>6)|0xc0); \
-        } else { \
-            if((uint32_t)(c)<=0xffff) { \
-                (s)[(i)++]=(uint8_t)(((c)>>12)|0xe0); \
-            } else { \
-                (s)[(i)++]=(uint8_t)(((c)>>18)|0xf0); \
-                (s)[(i)++]=(uint8_t)((((c)>>12)&0x3f)|0x80); \
-            } \
-            (s)[(i)++]=(uint8_t)((((c)>>6)&0x3f)|0x80); \
-        } \
-        (s)[(i)++]=(uint8_t)(((c)&0x3f)|0x80); \
-    } \
-}
-#endif
diff --git a/Source/WTF/wtf/unicode/icu/UnicodeIcu.h b/Source/WTF/wtf/unicode/icu/UnicodeIcu.h
deleted file mode 100644 (file)
index 0a386b5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright (C) 2006 George Staikos <staikos@kde.org>
- *  Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
- *  Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this library; see the file COPYING.LIB.  If not, write to
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef WTF_UNICODE_ICU_H
-#define WTF_UNICODE_ICU_H
-
-#include <stdlib.h>
-#include <unicode/uchar.h>
-#include <unicode/uscript.h>
-#include <unicode/ustring.h>
-#include <unicode/utf16.h>
-
-#endif // WTF_UNICODE_ICU_H
diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.cpp
deleted file mode 100644 (file)
index dfdc73d..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2012 Patrick Gansterer <paroga@paroga.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "UnicodeWchar.h"
-
-#include <algorithm>
-
-int unorm_normalize(const UChar*, int32_t, UNormalizationMode, int32_t, UChar*, int32_t, UErrorCode*)
-{
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
-UCharDirection u_charDirection(UChar32)
-{
-    return U_LEFT_TO_RIGHT; // FIXME: implement!
-}
-
-UChar32 u_charMirror(UChar32 character)
-{
-    // FIXME: Implement this.
-    return character;
-}
-
-int8_t u_charType(UChar32)
-{
-    // FIXME: Implement this.
-    return U_CHAR_CATEGORY_UNKNOWN;
-}
-
-uint8_t u_getCombiningClass(UChar32)
-{
-    // FIXME: Implement this.
-    return 0;
-}
-
-int u_getIntPropertyValue(UChar32, UProperty property)
-{
-    switch (property) {
-    case UCHAR_DECOMPOSITION_TYPE:
-        // FIXME: Implement this.
-        return U_DT_NONE;
-    case UCHAR_LINE_BREAK:
-        // FIXME: Implement this.
-        return U_LB_UNKNOWN;
-    }
-
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
-int u_memcasecmp(const UChar* a, const UChar* b, int length, unsigned options)
-{
-    for (int i = 0; i < length; ++i) {
-        UChar c1 = u_foldCase(a[i], options);
-        UChar c2 = u_foldCase(b[i], options);
-        if (c1 != c2)
-            return c1 - c2;
-    }
-
-    return 0;
-}
-
-template<wint_t Function(wint_t)>
-static inline int convertWithFunction(UChar* result, int resultLength, const UChar* source, int sourceLength, UErrorCode& status)
-{
-    UChar* resultIterator = result;
-    UChar* resultEnd = result + std::min(resultLength, sourceLength);
-    while (resultIterator < resultEnd)
-        *resultIterator++ = Function(*source++);
-
-    if (sourceLength < resultLength)
-        *resultIterator = '\0';
-
-    status = sourceLength > resultLength ? U_ERROR : U_ZERO_ERROR;
-    return sourceLength;
-}
-
-int u_strFoldCase(UChar* result, int resultLength, const UChar* source, int sourceLength, unsigned options, UErrorCode* status)
-{
-    ASSERT_UNUSED(options, options == U_FOLD_CASE_DEFAULT);
-    return convertWithFunction<towlower>(result, resultLength, source, sourceLength, *status);
-}
-
-int u_strToLower(UChar* result, int resultLength, const UChar* source, int sourceLength, const char*, UErrorCode* status)
-{
-    return convertWithFunction<towlower>(result, resultLength, source, sourceLength, *status);
-}
-
-int u_strToUpper(UChar* result, int resultLength, const UChar* source, int sourceLength, const char*, UErrorCode* status)
-{
-    return convertWithFunction<towupper>(result, resultLength, source, sourceLength, *status);
-}
diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h
deleted file mode 100644 (file)
index 08212b6..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2012 Patrick Gansterer <paroga@paroga.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WTF_UnicodeWchar_h
-#define WTF_UnicodeWchar_h
-
-#include <stdint.h>
-#include <wchar.h>
-#include <wtf/unicode/ScriptCodesFromICU.h>
-#include <wtf/unicode/UnicodeMacrosFromICU.h>
-
-typedef wchar_t UChar;
-typedef uint32_t UChar32;
-
-enum UBlockCode { UBLOCK_UNKNOWN, UBLOCK_ARABIC };
-
-enum UCharCategory {
-    U_CHAR_CATEGORY_UNKNOWN,
-    U_PARAGRAPH_SEPARATOR,
-    U_SPACE_SEPARATOR
-};
-
-enum UCharDirection {
-    U_LEFT_TO_RIGHT,
-    U_RIGHT_TO_LEFT,
-    U_EUROPEAN_NUMBER,
-    U_EUROPEAN_NUMBER_SEPARATOR,
-    U_EUROPEAN_NUMBER_TERMINATOR,
-    U_ARABIC_NUMBER,
-    U_COMMON_NUMBER_SEPARATOR,
-    U_BLOCK_SEPARATOR,
-    U_SEGMENT_SEPARATOR,
-    U_WHITE_SPACE_NEUTRAL,
-    U_OTHER_NEUTRAL,
-    U_LEFT_TO_RIGHT_EMBEDDING,
-    U_LEFT_TO_RIGHT_OVERRIDE,
-    U_RIGHT_TO_LEFT_ARABIC,
-    U_RIGHT_TO_LEFT_EMBEDDING,
-    U_RIGHT_TO_LEFT_OVERRIDE,
-    U_POP_DIRECTIONAL_FORMAT,
-    U_DIR_NON_SPACING_MARK,
-    U_BOUNDARY_NEUTRAL
-};
-
-enum UDecompositionType { U_DT_NONE, U_DT_COMPAT, U_DT_FONT };
-
-enum UErrorCode { U_ZERO_ERROR = 0, U_ERROR };
-
-enum ULineBreak { U_LB_UNKNOWN, U_LB_COMPLEX_CONTEXT, U_LB_CONDITIONAL_JAPANESE_STARTER, U_LB_IDEOGRAPHIC };
-
-enum UNormalizationMode { UNORM_NFC };
-
-enum UProperty { UCHAR_DECOMPOSITION_TYPE, UCHAR_LINE_BREAK };
-
-enum { UNORM_UNICODE_3_2 };
-
-// FIXME: Would be good to define all of these in terms of UCharCategory constants, but until u_charType
-// is implemented, that's not really worth the time.
-
-#define U_GC_CC_MASK 0
-#define U_GC_CS_MASK 0
-#define U_GC_CF_MASK 0
-#define U_GC_CN_MASK 0
-#define U_GC_LL_MASK 0
-#define U_GC_LM_MASK 0
-#define U_GC_LO_MASK 0
-#define U_GC_LT_MASK 0
-#define U_GC_LU_MASK 0
-#define U_GC_MC_MASK 0
-#define U_GC_MN_MASK 0
-#define U_GC_ND_MASK 0
-#define U_GC_NL_MASK 0
-#define U_GC_PC_MASK 0
-#define U_GC_PE_MASK 0
-#define U_GC_PF_MASK 0
-#define U_GC_PI_MASK 0
-#define U_GC_PO_MASK 0
-#define U_GC_PS_MASK 0
-#define U_GC_ZL_MASK 0
-#define U_GC_ZP_MASK 0
-
-#define U_GC_L_MASK 0
-#define U_GC_M_MASK 0
-#define U_GC_Z_MASK 0
-
-#define U_SUCCESS(status) ((status) <= 0)
-#define U_FAILURE(status) ((status) > 0)
-
-#define U_FOLD_CASE_DEFAULT 0
-
-#define U_GET_GC_MASK(c) U_MASK(u_charType(c))
-
-inline UBlockCode ublock_getCode(UChar32 character) { return (character & ~0xFF) == 0x600 ? UBLOCK_ARABIC : UBLOCK_UNKNOWN; }
-WTF_EXPORT_PRIVATE int unorm_normalize(const UChar* source, int32_t sourceLength, UNormalizationMode mode, int32_t options, UChar* result, int32_t resultLength, UErrorCode* status);
-WTF_EXPORT_PRIVATE UCharDirection u_charDirection(UChar32);
-WTF_EXPORT_PRIVATE UChar32 u_charMirror(UChar32);
-WTF_EXPORT_PRIVATE int8_t u_charType(UChar32);
-inline UChar32 u_foldCase(UChar32 character, unsigned options) { ASSERT_UNUSED(options, options == U_FOLD_CASE_DEFAULT); return towlower(character); }
-WTF_EXPORT_PRIVATE uint8_t u_getCombiningClass(UChar32);
-WTF_EXPORT_PRIVATE int u_getIntPropertyValue(UChar32, UProperty);
-inline bool u_isalnum(UChar32 character) { return iswalnum(character); }
-inline bool u_isprint(UChar32 character) { return iswprint(character); }
-inline bool u_ispunct(UChar32 character) { return iswpunct(character); }
-inline bool u_isspace(UChar32 character) { return iswspace(character); }
-WTF_EXPORT_PRIVATE int u_memcasecmp(const UChar*, const UChar*, int sourceLength, unsigned options);
-inline bool u_print(UChar32 character) { return iswprint(character); }
-WTF_EXPORT_PRIVATE int u_strFoldCase(UChar* result, int resultLength, const UChar* source, int sourceLength, unsigned options, UErrorCode*);
-WTF_EXPORT_PRIVATE int u_strToLower(UChar* result, int resultLength, const UChar* source, int sourceLength, const char* locale, UErrorCode*);
-WTF_EXPORT_PRIVATE int u_strToUpper(UChar* result, int resultLength, const UChar* source, int sourceLength, const char* locale, UErrorCode*);
-inline UChar32 u_tolower(UChar32 character) { return towlower(character); }
-inline UChar32 u_totitle(UChar32 character) { return towupper(character); }
-inline UChar32 u_toupper(UChar32 character) { return towupper(character); }
-
-#endif // WTF_UnicodeWchar_h