mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-07 14:31:31 +00:00
Add UnicodeSet class to i18n
X-Trac-URL: https://ssl.icu-project.org/trac/ticket/34 git-svn-id: http://source.icu-project.org/repos/icu/icu/trunk@83 0a8b766c-62c9-45f9-954d-7f2943c9ead0
This commit is contained in:
Alan Liu
parent
20e38a9967
commit
0eac03ef5a
7 changed files with 2110 additions and 60 deletions
|
|
@ -241,6 +241,10 @@ SOURCE=.\unicdcm.cpp
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\uniset.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\unum.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -265,7 +269,7 @@ SOURCE=.\brkiter.h
|
|||
InputPath=.\brkiter.h
|
||||
|
||||
"..\..\include\brkiter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy brkiter.h ..\..\include
|
||||
copy brkiter.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -275,7 +279,7 @@ InputPath=.\brkiter.h
|
|||
InputPath=.\brkiter.h
|
||||
|
||||
"..\..\include\brkiter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy brkiter.h ..\..\include
|
||||
copy brkiter.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -292,7 +296,7 @@ SOURCE=.\calendar.h
|
|||
InputPath=.\calendar.h
|
||||
|
||||
"..\..\include\calendar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy calendar.h ..\..\include
|
||||
copy calendar.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -302,7 +306,7 @@ InputPath=.\calendar.h
|
|||
InputPath=.\calendar.h
|
||||
|
||||
"..\..\include\calendar.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy calendar.h ..\..\include
|
||||
copy calendar.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -319,7 +323,7 @@ SOURCE=.\choicfmt.h
|
|||
InputPath=.\choicfmt.h
|
||||
|
||||
"..\..\include\choicfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy choicfmt.h ..\..\include
|
||||
copy choicfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -329,7 +333,7 @@ InputPath=.\choicfmt.h
|
|||
InputPath=.\choicfmt.h
|
||||
|
||||
"..\..\include\choicfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy choicfmt.h ..\..\include
|
||||
copy choicfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -350,7 +354,7 @@ SOURCE=.\coleitr.h
|
|||
InputPath=.\coleitr.h
|
||||
|
||||
"..\..\include\coleitr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy coleitr.h ..\..\include
|
||||
copy coleitr.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -360,7 +364,7 @@ InputPath=.\coleitr.h
|
|||
InputPath=.\coleitr.h
|
||||
|
||||
"..\..\include\coleitr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy coleitr.h ..\..\include
|
||||
copy coleitr.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -377,7 +381,7 @@ SOURCE=.\coll.h
|
|||
InputPath=.\coll.h
|
||||
|
||||
"..\..\include\coll.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy coll.h ..\..\include
|
||||
copy coll.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -387,7 +391,7 @@ InputPath=.\coll.h
|
|||
InputPath=.\coll.h
|
||||
|
||||
"..\..\include\coll.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy coll.h ..\..\include
|
||||
copy coll.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -408,7 +412,7 @@ SOURCE=.\datefmt.h
|
|||
InputPath=.\datefmt.h
|
||||
|
||||
"..\..\include\datefmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy datefmt.h ..\..\include
|
||||
copy datefmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -418,7 +422,7 @@ InputPath=.\datefmt.h
|
|||
InputPath=.\datefmt.h
|
||||
|
||||
"..\..\include\datefmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy datefmt.h ..\..\include
|
||||
copy datefmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -435,7 +439,7 @@ SOURCE=.\dcfmtsym.h
|
|||
InputPath=.\dcfmtsym.h
|
||||
|
||||
"..\..\include\dcfmtsym.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy dcfmtsym.h ..\..\include
|
||||
copy dcfmtsym.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -445,7 +449,7 @@ InputPath=.\dcfmtsym.h
|
|||
InputPath=.\dcfmtsym.h
|
||||
|
||||
"..\..\include\dcfmtsym.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy dcfmtsym.h ..\..\include
|
||||
copy dcfmtsym.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -462,7 +466,7 @@ SOURCE=.\decimfmt.h
|
|||
InputPath=.\decimfmt.h
|
||||
|
||||
"..\..\include\decimfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy decimfmt.h ..\..\include
|
||||
copy decimfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -472,7 +476,7 @@ InputPath=.\decimfmt.h
|
|||
InputPath=.\decimfmt.h
|
||||
|
||||
"..\..\include\decimfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy decimfmt.h ..\..\include
|
||||
copy decimfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -489,7 +493,7 @@ SOURCE=.\dtfmtsym.h
|
|||
InputPath=.\dtfmtsym.h
|
||||
|
||||
"..\..\include\dtfmtsym.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy dtfmtsym.h ..\..\include
|
||||
copy dtfmtsym.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -499,7 +503,7 @@ InputPath=.\dtfmtsym.h
|
|||
InputPath=.\dtfmtsym.h
|
||||
|
||||
"..\..\include\dtfmtsym.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy dtfmtsym.h ..\..\include
|
||||
copy dtfmtsym.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -516,7 +520,7 @@ SOURCE=.\fieldpos.h
|
|||
InputPath=.\fieldpos.h
|
||||
|
||||
"..\..\include\fieldpos.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy fieldpos.h ..\..\include
|
||||
copy fieldpos.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -526,7 +530,7 @@ InputPath=.\fieldpos.h
|
|||
InputPath=.\fieldpos.h
|
||||
|
||||
"..\..\include\fieldpos.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy fieldpos.h ..\..\include
|
||||
copy fieldpos.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -543,7 +547,7 @@ SOURCE=.\fmtable.h
|
|||
InputPath=.\fmtable.h
|
||||
|
||||
"..\..\include\fmtable.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy fmtable.h ..\..\include
|
||||
copy fmtable.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -553,7 +557,7 @@ InputPath=.\fmtable.h
|
|||
InputPath=.\fmtable.h
|
||||
|
||||
"..\..\include\fmtable.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy fmtable.h ..\..\include
|
||||
copy fmtable.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -570,7 +574,7 @@ SOURCE=.\format.h
|
|||
InputPath=.\format.h
|
||||
|
||||
"..\..\include\format.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy format.h ..\..\include
|
||||
copy format.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -580,7 +584,7 @@ InputPath=.\format.h
|
|||
InputPath=.\format.h
|
||||
|
||||
"..\..\include\format.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy format.h ..\..\include
|
||||
copy format.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -597,7 +601,7 @@ SOURCE=.\gregocal.h
|
|||
InputPath=.\gregocal.h
|
||||
|
||||
"..\..\include\gregocal.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy gregocal.h ..\..\include
|
||||
copy gregocal.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -607,7 +611,7 @@ InputPath=.\gregocal.h
|
|||
InputPath=.\gregocal.h
|
||||
|
||||
"..\..\include\gregocal.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy gregocal.h ..\..\include
|
||||
copy gregocal.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -628,7 +632,7 @@ SOURCE=.\msgfmt.h
|
|||
InputPath=.\msgfmt.h
|
||||
|
||||
"..\..\include\msgfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy msgfmt.h ..\..\include
|
||||
copy msgfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -638,7 +642,7 @@ InputPath=.\msgfmt.h
|
|||
InputPath=.\msgfmt.h
|
||||
|
||||
"..\..\include\msgfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy msgfmt.h ..\..\include
|
||||
copy msgfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -655,7 +659,7 @@ SOURCE=.\numfmt.h
|
|||
InputPath=.\numfmt.h
|
||||
|
||||
"..\..\include\numfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy numfmt.h ..\..\include
|
||||
copy numfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -665,7 +669,7 @@ InputPath=.\numfmt.h
|
|||
InputPath=.\numfmt.h
|
||||
|
||||
"..\..\include\numfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy numfmt.h ..\..\include
|
||||
copy numfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -682,7 +686,7 @@ SOURCE=.\parsepos.h
|
|||
InputPath=.\parsepos.h
|
||||
|
||||
"..\..\include\parsepos.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy parsepos.h ..\..\include
|
||||
copy parsepos.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -692,7 +696,7 @@ InputPath=.\parsepos.h
|
|||
InputPath=.\parsepos.h
|
||||
|
||||
"..\..\include\parsepos.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy parsepos.h ..\..\include
|
||||
copy parsepos.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -713,7 +717,7 @@ SOURCE=.\simpletz.h
|
|||
InputPath=.\simpletz.h
|
||||
|
||||
"..\..\include\simpletz.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy simpletz.h ..\..\include
|
||||
copy simpletz.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -723,7 +727,7 @@ InputPath=.\simpletz.h
|
|||
InputPath=.\simpletz.h
|
||||
|
||||
"..\..\include\simpletz.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy simpletz.h ..\..\include
|
||||
copy simpletz.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -744,7 +748,7 @@ SOURCE=.\smpdtfmt.h
|
|||
InputPath=.\smpdtfmt.h
|
||||
|
||||
"..\..\include\smpdtfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy smpdtfmt.h ..\..\include
|
||||
copy smpdtfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -754,7 +758,7 @@ InputPath=.\smpdtfmt.h
|
|||
InputPath=.\smpdtfmt.h
|
||||
|
||||
"..\..\include\smpdtfmt.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy smpdtfmt.h ..\..\include
|
||||
copy smpdtfmt.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -771,7 +775,7 @@ SOURCE=.\sortkey.h
|
|||
InputPath=.\sortkey.h
|
||||
|
||||
"..\..\include\sortkey.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy sortkey.h ..\..\include
|
||||
copy sortkey.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -781,7 +785,7 @@ InputPath=.\sortkey.h
|
|||
InputPath=.\sortkey.h
|
||||
|
||||
"..\..\include\sortkey.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy sortkey.h ..\..\include
|
||||
copy sortkey.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -806,7 +810,7 @@ SOURCE=.\tblcoll.h
|
|||
InputPath=.\tblcoll.h
|
||||
|
||||
"..\..\include\tblcoll.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy tblcoll.h ..\..\include
|
||||
copy tblcoll.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -816,7 +820,7 @@ InputPath=.\tblcoll.h
|
|||
InputPath=.\tblcoll.h
|
||||
|
||||
"..\..\include\tblcoll.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy tblcoll.h ..\..\include
|
||||
copy tblcoll.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -837,7 +841,7 @@ SOURCE=.\timezone.h
|
|||
InputPath=.\timezone.h
|
||||
|
||||
"..\..\include\timezone.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy timezone.h ..\..\include
|
||||
copy timezone.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -847,7 +851,7 @@ InputPath=.\timezone.h
|
|||
InputPath=.\timezone.h
|
||||
|
||||
"..\..\include\timezone.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy timezone.h ..\..\include
|
||||
copy timezone.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -872,7 +876,7 @@ SOURCE=.\ubrk.h
|
|||
InputPath=.\ubrk.h
|
||||
|
||||
"..\..\include\ubrk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy ubrk.h ..\..\include
|
||||
copy ubrk.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -882,7 +886,7 @@ InputPath=.\ubrk.h
|
|||
InputPath=.\ubrk.h
|
||||
|
||||
"..\..\include\ubrk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy ubrk.h ..\..\include
|
||||
copy ubrk.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -899,7 +903,7 @@ SOURCE=.\ucal.h
|
|||
InputPath=.\ucal.h
|
||||
|
||||
"..\..\include\ucal.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy ucal.h ..\..\include
|
||||
copy ucal.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -909,7 +913,7 @@ InputPath=.\ucal.h
|
|||
InputPath=.\ucal.h
|
||||
|
||||
"..\..\include\ucal.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy ucal.h ..\..\include
|
||||
copy ucal.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -926,7 +930,7 @@ SOURCE=.\ucol.h
|
|||
InputPath=.\ucol.h
|
||||
|
||||
"..\..\include\ucol.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy ucol.h ..\..\include
|
||||
copy ucol.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -936,7 +940,7 @@ InputPath=.\ucol.h
|
|||
InputPath=.\ucol.h
|
||||
|
||||
"..\..\include\ucol.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy ucol.h ..\..\include
|
||||
copy ucol.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -953,7 +957,7 @@ SOURCE=.\udat.h
|
|||
InputPath=.\udat.h
|
||||
|
||||
"..\..\include\udat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy udat.h ..\..\include
|
||||
copy udat.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -963,7 +967,7 @@ InputPath=.\udat.h
|
|||
InputPath=.\udat.h
|
||||
|
||||
"..\..\include\udat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy udat.h ..\..\include
|
||||
copy udat.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -980,7 +984,7 @@ SOURCE=.\umsg.h
|
|||
InputPath=.\umsg.h
|
||||
|
||||
"..\..\include\umsg.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy umsg.h ..\..\include
|
||||
copy umsg.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -990,7 +994,7 @@ InputPath=.\umsg.h
|
|||
InputPath=.\umsg.h
|
||||
|
||||
"..\..\include\umsg.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy umsg.h ..\..\include
|
||||
copy umsg.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -1003,6 +1007,33 @@ SOURCE=.\unicdcm.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\uniset.h
|
||||
|
||||
!IF "$(CFG)" == "i18n - Win32 Release"
|
||||
|
||||
# Begin Custom Build
|
||||
InputPath=.\uniset.h
|
||||
|
||||
"..\..\include\uniset.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy uniset.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ELSEIF "$(CFG)" == "i18n - Win32 Debug"
|
||||
|
||||
# Begin Custom Build
|
||||
InputPath=.\uniset.h
|
||||
|
||||
"..\..\include\uniset.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy uniset.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\unum.h
|
||||
|
||||
!IF "$(CFG)" == "i18n - Win32 Release"
|
||||
|
|
@ -1011,7 +1042,7 @@ SOURCE=.\unum.h
|
|||
InputPath=.\unum.h
|
||||
|
||||
"..\..\include\unum.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy unum.h ..\..\include
|
||||
copy unum.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
@ -1021,7 +1052,7 @@ InputPath=.\unum.h
|
|||
InputPath=.\unum.h
|
||||
|
||||
"..\..\include\unum.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
|
||||
copy unum.h ..\..\include
|
||||
copy unum.h ..\..\include
|
||||
|
||||
# End Custom Build
|
||||
|
||||
|
|
|
|||
1277
source/i18n/uniset.cpp
Normal file
1277
source/i18n/uniset.cpp
Normal file
File diff suppressed because it is too large
Load diff
587
source/i18n/uniset.h
Normal file
587
source/i18n/uniset.h
Normal file
|
|
@ -0,0 +1,587 @@
|
|||
#ifndef UNICODESET_H
|
||||
#define UNICODESET_H
|
||||
|
||||
#include "utypes.h"
|
||||
#include "unistr.h"
|
||||
#include "parsepos.h"
|
||||
|
||||
/**
|
||||
* A mutable set of Unicode characters. Objects of this class
|
||||
* represent <em>character classes</em> used in regular expressions.
|
||||
* Such classes specify a subset of the set of all Unicode characters,
|
||||
* which in this implementation is the characters from U+0000 to
|
||||
* U+FFFF, ignoring surrogates.
|
||||
*
|
||||
* <p>This class supports two APIs. The first is modeled after Java 2's
|
||||
* <code>java.util.Set</code> interface, although this class does not
|
||||
* implement that interface. All methods of <code>Set</code> are
|
||||
* supported, with the modification that they take a character range
|
||||
* or single character instead of an <code>Object</code>, and they
|
||||
* take a <code>UnicodeSet</code> instead of a <code>Collection</code>.
|
||||
*
|
||||
* <p>The second API is the
|
||||
* <code>applyPattern()</code>/<code>toPattern()</code> API from the
|
||||
* <code>java.text.Format</code>-derived classes. Unlike the
|
||||
* methods that add characters, add categories, and control the logic
|
||||
* of the set, the method <code>applyPattern()</code> sets all
|
||||
* attributes of a <code>UnicodeSet</code> at once, based on a
|
||||
* string pattern.
|
||||
*
|
||||
* <p>In addition, the set complement operation is supported through
|
||||
* the <code>complement()</code> method.
|
||||
*
|
||||
* <p><b>Pattern syntax</b></p>
|
||||
*
|
||||
* Patterns are accepted by the constructors and the
|
||||
* <code>applyPattern()</code> methods and returned by the
|
||||
* <code>toPattern()</code> method. These patterns follow a syntax
|
||||
* similar to that employed by version 8 regular expression character
|
||||
* classes:
|
||||
*
|
||||
* <blockquote><code>
|
||||
* pattern := ('[' '^'? item* ']') | ('[:' '^'? category ':]')<br>
|
||||
* item := char | (char '-' char) | pattern-expr<br>
|
||||
* pattern-expr := pattern | pattern-expr pattern | pattern-expr op pattern<br>
|
||||
* op := '&' | '-'<br>
|
||||
* special := '[' | ']' | '-'<br>
|
||||
* char := <em>any character that is not</em> special |
|
||||
* ('\' <em>any character</em>) |
|
||||
* ('\\u' hex hex hex hex)<br>
|
||||
* hex := <em>any hex digit, as defined by </em>Character.digit(c, 16)
|
||||
* </code>
|
||||
*
|
||||
* <br>Legend:
|
||||
*
|
||||
* <table>
|
||||
* <tr><td width=20%><code>a:=b</code>
|
||||
* <td><code>a</code> may be replaced by
|
||||
* <code>b</code>
|
||||
* <tr><td><code>a?</code>
|
||||
* <td>zero or one instance of <code>a</code><br>
|
||||
* <tr><td><code>a*</code>
|
||||
* <td>one or more instances of <code>a</code><br>
|
||||
* <tr><td><code>a|b</code>
|
||||
* <td>either <code>a</code> or <code>b</code><br>
|
||||
* <tr><td><code>'a'</code>
|
||||
* <td>the literal string between the quotes
|
||||
* </table>
|
||||
* </blockquote>
|
||||
*
|
||||
* Patterns specify individual characters, ranges of characters, and
|
||||
* Unicode character categories. When elements are concatenated, they
|
||||
* specify their union. To complement a set, place a '^' immediately
|
||||
* after the opening '[' or '[:'. In any other location, '^' has no
|
||||
* special meaning.
|
||||
*
|
||||
* <p>Ranges are indicated by placing two a '-' between two
|
||||
* characters, as in "a-z". This specifies the range of all
|
||||
* characters from the left to the right, in Unicode order. If the
|
||||
* left and right characters are the same, then the range consists of
|
||||
* just that character. If the left character is greater than the
|
||||
* right character it is a syntax error. If a '-' occurs as the first
|
||||
* character after the opening '[' or '[^', or if it occurs as the
|
||||
* last character before the closing ']', then it is taken as a
|
||||
* literal. Thus "[a\-b]", "[-ab]", and "[ab-]" all indicate the same
|
||||
* set of three characters, 'a', 'b', and '-'.
|
||||
*
|
||||
* <p>Sets may be intersected using the '&' operator or the asymmetric
|
||||
* set difference may be taken using the '-' operator, for example,
|
||||
* "[[:L:]&[\u0000-\u0FFF]]" indicates the set of all Unicode letters
|
||||
* with values less than 4096. Operators ('&' and '|') have equal
|
||||
* precedence and bind left-to-right. Thus
|
||||
* "[[:L:]-[a-z]-[\u0100-\u01FF]]" is equivalent to
|
||||
* "[[[:L:]-[a-z]]-[\u0100-\u01FF]]". This only really matters for
|
||||
* difference; intersection is commutative.
|
||||
*
|
||||
* <table>
|
||||
* <tr valign=top><td nowrap><code>[a]</code><td>The set containing 'a'
|
||||
* <tr valign=top><td nowrap><code>[a-z]</code><td>The set containing 'a'
|
||||
* through 'z' and all letters in between, in Unicode order
|
||||
* <tr valign=top><td nowrap><code>[^a-z]</code><td>The set containing
|
||||
* all characters but 'a' through 'z',
|
||||
* that is, U+0000 through 'a'-1 and 'z'+1 through U+FFFF
|
||||
* <tr valign=top><td nowrap><code>[[<em>pat1</em>][<em>pat2</em>]]</code>
|
||||
* <td>The union of sets specified by <em>pat1</em> and <em>pat2</em>
|
||||
* <tr valign=top><td nowrap><code>[[<em>pat1</em>]&[<em>pat2</em>]]</code>
|
||||
* <td>The intersection of sets specified by <em>pat1</em> and <em>pat2</em>
|
||||
* <tr valign=top><td nowrap><code>[[<em>pat1</em>]-[<em>pat2</em>]]</code>
|
||||
* <td>The asymmetric difference of sets specified by <em>pat1</em> and
|
||||
* <em>pat2</em>
|
||||
* <tr valign=top><td nowrap><code>[:Lu:]</code>
|
||||
* <td>The set of characters belonging to the given
|
||||
* Unicode category, as defined by <code>Character.getType()</code>; in
|
||||
* this case, Unicode uppercase letters
|
||||
* <tr valign=top><td nowrap><code>[:L:]</code>
|
||||
* <td>The set of characters belonging to all Unicode categories
|
||||
* starting wih 'L', that is, <code>[[:Lu:][:Ll:][:Lt:][:Lm:][:Lo:]]</code>.
|
||||
* </table>
|
||||
*
|
||||
* <p><b>Character categories.</b>
|
||||
*
|
||||
* Character categories are specified using the POSIX-like syntax
|
||||
* '[:Lu:]'. The complement of a category is specified by inserting
|
||||
* '^' after the opening '[:'. The following category names are
|
||||
* recognized. Actual determination of category data uses
|
||||
* <code>Character.getType()</code>, so it reflects the underlying
|
||||
* implmementation used by <code>Character</code>. As of Java 2 and
|
||||
* JDK 1.1.8, this is Unicode <b>2.x.x - fill in version here</b>.
|
||||
*
|
||||
* <pre>
|
||||
* Normative
|
||||
* Mn = Mark, Non-Spacing
|
||||
* Mc = Mark, Spacing Combining
|
||||
* Me = Mark, Enclosing
|
||||
*
|
||||
* Nd = Number, Decimal Digit
|
||||
* Nl = Number, Letter
|
||||
* No = Number, Other
|
||||
*
|
||||
* Zs = Separator, Space
|
||||
* Zl = Separator, Line
|
||||
* Zp = Separator, Paragraph
|
||||
*
|
||||
* Cc = Other, Control
|
||||
* Cf = Other, Format
|
||||
* Cs = Other, Surrogate
|
||||
* Co = Other, Private Use
|
||||
* Cn = Other, Not Assigned
|
||||
*
|
||||
* Informative
|
||||
* Lu = Letter, Uppercase
|
||||
* Ll = Letter, Lowercase
|
||||
* Lt = Letter, Titlecase
|
||||
* Lm = Letter, Modifier
|
||||
* Lo = Letter, Other
|
||||
*
|
||||
* Pc = Punctuation, Connector
|
||||
* Pd = Punctuation, Dash
|
||||
* Ps = Punctuation, Open
|
||||
* Pe = Punctuation, Close
|
||||
* *Pi = Punctuation, Initial quote
|
||||
* *Pf = Punctuation, Final quote
|
||||
* Po = Punctuation, Other
|
||||
*
|
||||
* Sm = Symbol, Math
|
||||
* Sc = Symbol, Currency
|
||||
* Sk = Symbol, Modifier
|
||||
* So = Symbol, Other
|
||||
* </pre>
|
||||
* *Unsupported by Java (and hence unsupported by UnicodeSet).
|
||||
*
|
||||
* @author Alan Liu
|
||||
* @version $RCSfile: uniset.h,v $ $Revision: 1.1 $ $Date: 1999/10/20 22:06:52 $
|
||||
*/
|
||||
class U_I18N_API UnicodeSet {
|
||||
|
||||
/**
|
||||
* The internal representation is a StringBuffer of even length.
|
||||
* Each pair of characters represents a range that is included in
|
||||
* the set. A single character c is represented as cc. Thus, the
|
||||
* ranges in the set are (a,b), a and b inclusive, where a =
|
||||
* pairs.charAt(i) and b = pairs.charAt(i+1) for all even i, 0 <=
|
||||
* i <= pairs.length()-2. Pairs are always stored in ascending
|
||||
* Unicode order. Pairs are always stored in shortest form. For
|
||||
* example, if the pair "hh", representing the single character
|
||||
* 'h', is added to the pairs list "agik", representing the ranges
|
||||
* 'a'-'g' and 'i'-'k', the result is "ak", not "aghhik".
|
||||
*/
|
||||
UnicodeString pairs;
|
||||
|
||||
static const UnicodeString CATEGORY_NAMES;
|
||||
|
||||
/**
|
||||
* A cache mapping character category integers, as returned by
|
||||
* Character.getType(), to pairs strings. Entries are initially
|
||||
* null and are created on demand.
|
||||
*/
|
||||
static UnicodeString* CATEGORY_PAIRS_CACHE;
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// Debugging and testing
|
||||
//----------------------------------------------------------------
|
||||
|
||||
public:
|
||||
|
||||
/**
|
||||
* Return the representation of this set as a list of character
|
||||
* ranges. Ranges are listed in ascending Unicode order. For
|
||||
* example, the set [a-zA-M3] is represented as "33AMaz".
|
||||
*/
|
||||
const UnicodeString& getPairs() const;
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// Public API
|
||||
//----------------------------------------------------------------
|
||||
|
||||
public:
|
||||
|
||||
/**
|
||||
* Constructs an empty set.
|
||||
*/
|
||||
UnicodeSet();
|
||||
|
||||
/**
|
||||
* Constructs a set from the given pattern. See the class
|
||||
* description for the syntax of the pattern language.
|
||||
* @param pattern a string specifying what characters are in the set
|
||||
* @exception <code>IllegalArgumentException</code> if the pattern
|
||||
* contains a syntax error.
|
||||
*/
|
||||
UnicodeSet(const UnicodeString& pattern,
|
||||
UErrorCode& status);
|
||||
|
||||
/**
|
||||
* Constructs a set from the given pattern, optionally ignoring
|
||||
* white space. See the class description for the syntax of the
|
||||
* pattern language.
|
||||
* @param pattern a string specifying what characters are in the set
|
||||
* @param ignoreSpaces if <code>true</code>, all spaces in the
|
||||
* pattern are ignored, except those preceded by '\\'. Spaces are
|
||||
* those characters for which <code>Character.isSpaceChar()</code>
|
||||
* is <code>true</code>.
|
||||
* @exception <code>IllegalArgumentException</code> if the pattern
|
||||
* contains a syntax error.
|
||||
*/
|
||||
UnicodeSet(const UnicodeString& pattern, bool_t ignoreSpaces,
|
||||
UErrorCode& status);
|
||||
|
||||
/**
|
||||
* Constructs a set from the given Unicode character category.
|
||||
* @param category an integer indicating the character category as
|
||||
* returned by <code>Character.getType()</code>.
|
||||
* @exception <code>IllegalArgumentException</code> if the given
|
||||
* category is invalid.
|
||||
*/
|
||||
UnicodeSet(int8_t category, UErrorCode& status);
|
||||
|
||||
/**
|
||||
* Modifies this set to represent the set specified by the given
|
||||
* pattern, optionally ignoring white space. See the class
|
||||
* description for the syntax of the pattern language.
|
||||
* @param pattern a string specifying what characters are in the set
|
||||
* @param ignoreSpaces if <code>true</code>, all spaces in the
|
||||
* pattern are ignored. Spaces are those characters for which
|
||||
* <code>Character.isSpaceChar()</code> is <code>true</code>.
|
||||
* Characters preceded by '\\' are escaped, losing any special
|
||||
* meaning they otherwise have. Spaces may be included by
|
||||
* escaping them.
|
||||
* @exception <code>IllegalArgumentException</code> if the pattern
|
||||
* contains a syntax error.
|
||||
*/
|
||||
virtual void applyPattern(const UnicodeString& pattern,
|
||||
bool_t ignoreSpaces,
|
||||
UErrorCode& status);
|
||||
|
||||
/**
|
||||
* Modifies this set to represent the set specified by the given
|
||||
* pattern. See the class description for the syntax of the pattern
|
||||
* language.
|
||||
* @param pattern a string specifying what characters are in the set
|
||||
* @exception <code>IllegalArgumentException</code> if the pattern
|
||||
* contains a syntax error.
|
||||
*/
|
||||
void applyPattern(const UnicodeString& pattern,
|
||||
UErrorCode& status);
|
||||
|
||||
/**
|
||||
* Returns a string representation of this set. If the result of
|
||||
* calling this function is passed to a UnicodeSet constructor, it
|
||||
* will produce another set that is equal to this one.
|
||||
*/
|
||||
virtual UnicodeString& toPattern(UnicodeString& result) const;
|
||||
|
||||
/**
|
||||
* Returns the number of elements in this set (its cardinality). If this
|
||||
* set contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
|
||||
* <tt>Integer.MAX_VALUE</tt>.
|
||||
*
|
||||
* @return the number of elements in this set (its cardinality).
|
||||
*/
|
||||
virtual int32_t size() const;
|
||||
|
||||
/**
|
||||
* Returns <tt>true</tt> if this set contains no elements.
|
||||
*
|
||||
* @return <tt>true</tt> if this set contains no elements.
|
||||
*/
|
||||
virtual bool_t isEmpty() const;
|
||||
|
||||
/**
|
||||
* Returns <tt>true</tt> if this set contains the specified range
|
||||
* of chars.
|
||||
*
|
||||
* @return <tt>true</tt> if this set contains the specified range
|
||||
* of chars.
|
||||
*/
|
||||
virtual bool_t contains(UChar first, UChar last) const;
|
||||
|
||||
/**
|
||||
* Returns <tt>true</tt> if this set contains the specified char.
|
||||
*
|
||||
* @return <tt>true</tt> if this set contains the specified char.
|
||||
*/
|
||||
virtual bool_t contains(UChar c) const;
|
||||
|
||||
/**
|
||||
* Adds the specified range to this set if it is not already
|
||||
* present. If this set already contains the specified range,
|
||||
* the call leaves this set unchanged. If <code>last > first</code>
|
||||
* then an empty range is added, leaving the set unchanged.
|
||||
*
|
||||
* @param first first character, inclusive, of range to be added
|
||||
* to this set.
|
||||
* @param last last character, inclusive, of range to be added
|
||||
* to this set.
|
||||
*/
|
||||
virtual void add(UChar first, UChar last);
|
||||
|
||||
/**
|
||||
* Adds the specified character to this set if it is not already
|
||||
* present. If this set already contains the specified character,
|
||||
* the call leaves this set unchanged.
|
||||
*/
|
||||
virtual void add(UChar c);
|
||||
|
||||
/**
|
||||
* Removes the specified range from this set if it is present.
|
||||
* The set will not contain the specified range once the call
|
||||
* returns. If <code>last > first</code> then an empty range is
|
||||
* removed, leaving the set unchanged.
|
||||
*
|
||||
* @param first first character, inclusive, of range to be removed
|
||||
* from this set.
|
||||
* @param last last character, inclusive, of range to be removed
|
||||
* from this set.
|
||||
*/
|
||||
virtual void remove(UChar first, UChar last);
|
||||
|
||||
/**
|
||||
* Removes the specified character from this set if it is present.
|
||||
* The set will not contain the specified range once the call
|
||||
* returns.
|
||||
*/
|
||||
virtual void remove(UChar c);
|
||||
|
||||
/**
|
||||
* Returns <tt>true</tt> if the specified set is a <i>subset</i>
|
||||
* of this set.
|
||||
*
|
||||
* @param c set to be checked for containment in this set.
|
||||
* @return <tt>true</tt> if this set contains all of the elements of the
|
||||
* specified set.
|
||||
*/
|
||||
virtual bool_t containsAll(const UnicodeSet& c) const;
|
||||
|
||||
/**
|
||||
* Adds all of the elements in the specified set to this set if
|
||||
* they're not already present. This operation effectively
|
||||
* modifies this set so that its value is the <i>union</i> of the two
|
||||
* sets. The behavior of this operation is unspecified if the specified
|
||||
* collection is modified while the operation is in progress.
|
||||
*
|
||||
* @param c set whose elements are to be added to this set.
|
||||
* @see #add(char, char)
|
||||
*/
|
||||
virtual void addAll(const UnicodeSet& c);
|
||||
|
||||
/**
|
||||
* Retains only the elements in this set that are contained in the
|
||||
* specified set. In other words, removes from this set all of
|
||||
* its elements that are not contained in the specified set. This
|
||||
* operation effectively modifies this set so that its value is
|
||||
* the <i>intersection</i> of the two sets.
|
||||
*
|
||||
* @param c set that defines which elements this set will retain.
|
||||
*/
|
||||
virtual void retainAll(const UnicodeSet& c);
|
||||
|
||||
/**
|
||||
* Removes from this set all of its elements that are contained in the
|
||||
* specified set. This operation effectively modifies this
|
||||
* set so that its value is the <i>asymmetric set difference</i> of
|
||||
* the two sets.
|
||||
*
|
||||
* @param c set that defines which elements will be removed from
|
||||
* this set.
|
||||
*/
|
||||
virtual void removeAll(const UnicodeSet& c);
|
||||
|
||||
/**
|
||||
* Inverts this set. This operation modifies this set so that
|
||||
* its value is its complement. This is equivalent to the pseudo code:
|
||||
* <code>this = new CharSet("[\u0000-\uFFFF]").removeAll(this)</code>.
|
||||
*/
|
||||
virtual void complement();
|
||||
|
||||
/**
|
||||
* Removes all of the elements from this set. This set will be
|
||||
* empty after this call returns.
|
||||
*/
|
||||
virtual void clear();
|
||||
|
||||
/**
|
||||
* Compares the specified object with this set for equality. Returns
|
||||
* <tt>true</tt> if the specified object is also a set, the two sets
|
||||
* have the same size, and every member of the specified set is
|
||||
* contained in this set (or equivalently, every member of this set is
|
||||
* contained in the specified set).
|
||||
*
|
||||
* @param o Object to be compared for equality with this set.
|
||||
* @return <tt>true</tt> if the specified Object is equal to this set.
|
||||
*/
|
||||
virtual bool_t operator==(const UnicodeSet& o) const;
|
||||
|
||||
bool_t operator!=(const UnicodeSet& o) const;
|
||||
|
||||
/**
|
||||
* Returns the hash code value for this set.
|
||||
*
|
||||
* @return the hash code value for this set.
|
||||
* @see Object#hashCode()
|
||||
*/
|
||||
virtual int32_t hashCode() const;
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// Implementation: Pattern parsing
|
||||
//----------------------------------------------------------------
|
||||
|
||||
private:
|
||||
|
||||
/**
|
||||
* Parses the given pattern, starting at the given position. The
|
||||
* character at pattern.charAt(pos.getIndex()) must be '[', or the
|
||||
* parse fails. Parsing continues until the corresponding closing
|
||||
* ']'. If a syntax error is encountered between the opening and
|
||||
* closing brace, the parse fails. Upon return from a successful
|
||||
* parse, the ParsePosition is updated to point to the character
|
||||
* following the closing ']', and a StringBuffer containing a
|
||||
* pairs list for the parsed pattern is returned. This method calls
|
||||
* itself recursively to parse embedded subpatterns.
|
||||
*
|
||||
* @param pattern the string containing the pattern to be parsed.
|
||||
* The portion of the string from pos.getIndex(), which must be a
|
||||
* '[', to the corresponding closing ']', is parsed.
|
||||
* @param pos upon entry, the position at which to being parsing.
|
||||
* The character at pattern.charAt(pos.getIndex()) must be a '['.
|
||||
* Upon return from a successful parse, pos.getIndex() is either
|
||||
* the character after the closing ']' of the parsed pattern, or
|
||||
* pattern.length() if the closing ']' is the last character of
|
||||
* the pattern string.
|
||||
* @return a StringBuffer containing a pairs list for the parsed
|
||||
* substring of <code>pattern</code>
|
||||
* @exception IllegalArgumentException if the parse fails.
|
||||
*/
|
||||
static UnicodeString& parse(UnicodeString& pairsBuf /*result*/,
|
||||
const UnicodeString& pattern,
|
||||
ParsePosition& pos,
|
||||
UErrorCode& status);
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// Implementation: Efficient in-place union & difference
|
||||
//----------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Performs a union operation: adds the range 'c'-'d' to the given
|
||||
* pairs list. The pairs list is modified in place. The result
|
||||
* is normalized (in order and as short as possible). For
|
||||
* example, addPair("am", 'l', 'q') => "aq". addPair("ampz", 'n',
|
||||
* 'o') => "az".
|
||||
*/
|
||||
static void addPair(UnicodeString& pairs, UChar c, UChar d);
|
||||
|
||||
/**
|
||||
* Performs an asymmetric difference: removes the range 'c'-'d'
|
||||
* from the pairs list. The pairs list is modified in place. The
|
||||
* result is normalized (in order and as short as possible). For
|
||||
* example, removePair("am", 'l', 'q') => "ak".
|
||||
* removePair("ampz", 'l', 'q') => "akrz".
|
||||
*/
|
||||
static void removePair(UnicodeString& pairs, UChar c, UChar d);
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// Implementation: Fundamental operators
|
||||
//----------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Changes the pairs list to represent the complement of the set it
|
||||
* currently represents. The pairs list will be normalized (in
|
||||
* order and in shortest possible form) if the original pairs list
|
||||
* was normalized.
|
||||
*/
|
||||
static void doComplement(UnicodeString& pairs);
|
||||
|
||||
/**
|
||||
* Given two pairs lists, changes the first in place to represent
|
||||
* the union of the two sets.
|
||||
*/
|
||||
static void doUnion(UnicodeString& pairs, const UnicodeString& c2);
|
||||
|
||||
/**
|
||||
* Given two pairs lists, changes the first in place to represent
|
||||
* the asymmetric difference of the two sets.
|
||||
*/
|
||||
static void doDifference(UnicodeString& pairs, const UnicodeString& pairs2);
|
||||
|
||||
/**
|
||||
* Given two pairs lists, changes the first in place to represent
|
||||
* the intersection of the two sets.
|
||||
*/
|
||||
static void doIntersection(UnicodeString& pairs, const UnicodeString& c2);
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// Implementation: Generation of pairs for Unicode categories
|
||||
//----------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Returns a pairs string for the given category, given its name.
|
||||
* The category name must be either a two-letter name, such as
|
||||
* "Lu", or a one letter name, such as "L". One-letter names
|
||||
* indicate the logical union of all two-letter names that start
|
||||
* with that letter. Case is significant. If the name starts
|
||||
* with the character '^' then the complement of the given
|
||||
* character set is returned.
|
||||
*
|
||||
* Although individual categories such as "Lu" are cached, we do
|
||||
* not currently cache single-letter categories such as "L" or
|
||||
* complements such as "^Lu" or "^L". It would be easy to cache
|
||||
* these as well in a hashtable should the need arise.
|
||||
*/
|
||||
static UnicodeString& getCategoryPairs(UnicodeString& result,
|
||||
const UnicodeString& catName,
|
||||
UErrorCode& status);
|
||||
|
||||
/**
|
||||
* Returns a pairs string for the given category. This string is
|
||||
* cached and returned again if this method is called again with
|
||||
* the same parameter.
|
||||
*/
|
||||
static const UnicodeString& getCategoryPairs(int8_t cat);
|
||||
|
||||
//----------------------------------------------------------------
|
||||
// Implementation: Utility methods
|
||||
//----------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Returns the character after the given position, or '\uFFFF' if
|
||||
* there is none.
|
||||
*/
|
||||
static UChar charAfter(const UnicodeString& str, int32_t i);
|
||||
|
||||
/**
|
||||
* TEMPORARY WORKAROUND UNTIL Unicode::digit() exists.
|
||||
* Return the digit value of the given UChar, or -1. The radix
|
||||
* value is ignored for now and hardcoded as 16.
|
||||
*/
|
||||
static int8_t digit(UChar c, int8_t radix);
|
||||
};
|
||||
|
||||
inline void UnicodeSet::applyPattern(const UnicodeString& pattern,
|
||||
UErrorCode& status) {
|
||||
applyPattern(pattern, FALSE, status);
|
||||
}
|
||||
|
||||
inline bool_t UnicodeSet::operator!=(const UnicodeSet& o) const {
|
||||
return !operator==(o);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -327,6 +327,10 @@ SOURCE=.\ucdtest.cpp
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\usettest.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ustrtest.cpp
|
||||
# End Source File
|
||||
# End Group
|
||||
|
|
@ -571,6 +575,14 @@ SOURCE=.\ucdtest.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\i18n\uniset.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\usettest.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\ustrtest.h
|
||||
# End Source File
|
||||
# End Group
|
||||
|
|
|
|||
|
|
@ -35,15 +35,15 @@
|
|||
#include "dtfmttst.h" // DateFormatTest
|
||||
#include "tmsgfmt.h" // TestMessageFormat
|
||||
#include "dtfmrgts.h" // DateFormatRegressionTest
|
||||
#include "msfmrgts.h" // MessageFormatRegressionTest
|
||||
#include "miscdtfm.h" // DateFormatMiscTests
|
||||
#include "msfmrgts.h" // MessageFormatRegressionTest
|
||||
#include "miscdtfm.h" // DateFormatMiscTests
|
||||
#include "nmfmtrt.h" // NumberFormatRoundTripTest
|
||||
#include "numrgts.h" // NumberFormatRegressionTest
|
||||
#include "dtfmtrtts.h" // DateFormatRoundTripTest
|
||||
#include "pptest.h" // ParsePositionTest
|
||||
#include "calregts.h" // CalendarRegressionTest
|
||||
#include "dtfmtrtts.h" // DateFormatRoundTripTest
|
||||
#include "pptest.h" // ParsePositionTest
|
||||
#include "calregts.h" // CalendarRegressionTest
|
||||
#include "tzregts.h" // TimeZoneRegressionTest
|
||||
|
||||
#include "usettest.h" // UnicodeSetTest
|
||||
|
||||
void IntlTestFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, char* par )
|
||||
{
|
||||
|
|
@ -296,6 +296,15 @@ void IntlTestFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, ch
|
|||
callTest( test, par );
|
||||
}
|
||||
break;
|
||||
|
||||
case 26:
|
||||
name = "UnicodeSetTest";
|
||||
if (exec) {
|
||||
logln("UnicodeSetTest---"); logln();
|
||||
UnicodeSetTest test;
|
||||
callTest(test, par);
|
||||
}
|
||||
break;
|
||||
/*
|
||||
case 28:
|
||||
name = "DateFormatSymbolsCAPI";
|
||||
|
|
@ -414,6 +423,7 @@ void IntlTestFormat::runIndexedTest( int32_t index, bool_t exec, char* &name, ch
|
|||
}
|
||||
break;
|
||||
*/
|
||||
|
||||
default: name = ""; break; //needed to end loop
|
||||
}
|
||||
if (exec) {
|
||||
|
|
|
|||
108
source/test/intltest/usettest.cpp
Normal file
108
source/test/intltest/usettest.cpp
Normal file
|
|
@ -0,0 +1,108 @@
|
|||
#include "utypes.h"
|
||||
#include "usettest.h"
|
||||
#include "uniset.h"
|
||||
|
||||
#define CASE(id,test) case id: \
|
||||
name = #test; \
|
||||
if (exec) { \
|
||||
logln(#test "---"); \
|
||||
logln((UnicodeString)""); \
|
||||
test(); \
|
||||
} \
|
||||
break;
|
||||
|
||||
void
|
||||
UnicodeSetTest::runIndexedTest(int32_t index, bool_t exec,
|
||||
char* &name, char* par) {
|
||||
// if (exec) logln((UnicodeString)"TestSuite UnicodeSetTest");
|
||||
switch (index) {
|
||||
CASE(0,Test1)
|
||||
|
||||
default: name = ""; break;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
UnicodeSetTest::Test1() {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
|
||||
UnicodeSet set; // Construct empty set
|
||||
set.add('a', 'z');
|
||||
expect(set, "az");
|
||||
set.remove('m', 'p');
|
||||
expect(set, "alqz");
|
||||
set.remove('e', 'g');
|
||||
expect(set, "adhlqz");
|
||||
set.remove('d', 'i');
|
||||
expect(set, "acjlqz");
|
||||
set.remove('c', 'r');
|
||||
expect(set, "absz");
|
||||
set.add('f', 'q');
|
||||
expect(set, "abfqsz");
|
||||
set.remove('a', 'g');
|
||||
expect(set, "hqsz");
|
||||
set.remove('a', 'z');
|
||||
expect(set, "");
|
||||
|
||||
set.applyPattern("[[a-m]&[d-z]&[k-y]]", status);
|
||||
if (U_FAILURE(status)) {
|
||||
errln("FAIL: Unexpected pattern parse failure");
|
||||
return;
|
||||
}
|
||||
expect(set, "km");
|
||||
|
||||
set.applyPattern("[[a-z]-[m-y]-[d-r]]", status);
|
||||
if (U_FAILURE(status)) {
|
||||
errln("FAIL: Unexpected pattern parse failure");
|
||||
return;
|
||||
}
|
||||
expect(set, "aczz");
|
||||
|
||||
set.applyPattern("[a\\-z]", status);
|
||||
if (U_FAILURE(status)) {
|
||||
errln("FAIL: Unexpected pattern parse failure");
|
||||
return;
|
||||
}
|
||||
expect(set, "--aazz");
|
||||
set.applyPattern("[-az]", status);
|
||||
if (U_FAILURE(status)) {
|
||||
errln("FAIL: Unexpected pattern parse failure");
|
||||
return;
|
||||
}
|
||||
expect(set, "--aazz");
|
||||
set.applyPattern("[az-]", status);
|
||||
if (U_FAILURE(status)) {
|
||||
errln("FAIL: Unexpected pattern parse failure");
|
||||
return;
|
||||
}
|
||||
expect(set, "--aazz");
|
||||
}
|
||||
|
||||
void
|
||||
UnicodeSetTest::expect(const UnicodeSet& set, const UnicodeString& expectedPairs) {
|
||||
if (set.getPairs() != expectedPairs) {
|
||||
errln(UnicodeString("FAIL: Expected pair list \"") +
|
||||
escape(expectedPairs) + "\", got \"" +
|
||||
escape(set.getPairs()) + '"');
|
||||
}
|
||||
}
|
||||
|
||||
static char toHexString(int32_t i) { return i + (i < 10 ? '0' : ('A' - 10)); }
|
||||
|
||||
UnicodeString
|
||||
UnicodeSetTest::escape(const UnicodeString& s) {
|
||||
UnicodeString buf;
|
||||
for (int32_t i=0; i<s.size(); ++i)
|
||||
{
|
||||
UChar c = s[(UTextOffset)i];
|
||||
if (c <= (UChar)0x7F) buf += c;
|
||||
else {
|
||||
buf += '\\'; buf += 'U';
|
||||
buf += toHexString((c & 0xF000) >> 12);
|
||||
buf += toHexString((c & 0x0F00) >> 8);
|
||||
buf += toHexString((c & 0x00F0) >> 4);
|
||||
buf += toHexString(c & 0x000F);
|
||||
}
|
||||
}
|
||||
return buf;
|
||||
}
|
||||
25
source/test/intltest/usettest.h
Normal file
25
source/test/intltest/usettest.h
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
#ifndef _TESTUNISET
|
||||
#define _TESTUNISET
|
||||
|
||||
#include "utypes.h"
|
||||
#include "intltest.h"
|
||||
|
||||
class UnicodeSet;
|
||||
class UnicodeString;
|
||||
|
||||
/**
|
||||
* UnicodeSet test
|
||||
*/
|
||||
class UnicodeSetTest: public IntlTest {
|
||||
|
||||
void runIndexedTest(int32_t index, bool_t exec, char* &name, char* par=NULL);
|
||||
|
||||
private:
|
||||
|
||||
void Test1();
|
||||
|
||||
void expect(const UnicodeSet& set, const UnicodeString& expectedPairs);
|
||||
static UnicodeString escape(const UnicodeString& s);
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Reference in a new issue