AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-11771 move FilteredBreakIterator from i18n to common

Browse Source 
X-SVN-Rev: 37676
This commit is contained in:
Steven R. Loomis 2015-07-16 21:02:06 +00:00
parent 77cd9e6aa4
commit 9edacf9fa9
9 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/common/Makefile.in
View File

@ -99,7 +99,7 @@ chariter.o schriter.o uchriter.o uiter.o \
patternprops.o uchar.o uprops.o ucase.o propname.o ubidi_props.o ubidi.o ubidiwrt.o ubidiln.o ushape.o \
uscript.o uscript_props.o usc_impl.o unames.o \
utrie.o utrie2.o utrie2_builder.o bmpset.o unisetspan.o uset_props.o uniset_props.o uniset_closure.o uset.o uniset.o usetiter.o ruleiter.o caniter.o unifilt.o unifunct.o \
uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o \
uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o filteredbrk.o \
rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o \
serv.o servnotf.o servls.o servlk.o servlkf.o servrbf.o servslkf.o \
uidna.o usprep.o uts46.o punycode.o \

6
icu4c/source/common/common.vcxproj
View File

@ -232,6 +232,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="filteredbrk.cpp" />
<ClCompile Include="ubidi.c" />
<ClCompile Include="ubidi_props.c" />
<ClCompile Include="ubidiln.c" />
@ -398,7 +399,7 @@
<ClCompile Include="uchar.c" />
<ClCompile Include="unames.cpp" />
<ClCompile Include="unifiedcache.cpp">
<DisableLanguageExtensions>false</DisableLanguageExtensions>
<DisableLanguageExtensions>false</DisableLanguageExtensions>
</ClCompile>
<ClCompile Include="unifilt.cpp" />
<ClCompile Include="unifunct.cpp" />
@ -624,6 +625,7 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="unicode\filteredbrk.h" />
<ClInclude Include="ustrenum.h" />
<ClInclude Include="utrie.h" />
<ClInclude Include="utrie2.h" />
@ -1769,4 +1771,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

6
icu4c/source/common/common.vcxproj.filters
View File

@ -575,6 +575,9 @@
<ClCompile Include="uloc_keytype.cpp">
<Filter>locales &amp; resources</Filter>
</ClCompile>
<ClCompile Include="filteredbrk.cpp">
<Filter>break iteration</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ubidi_props.h">
@ -862,6 +865,9 @@
<ClInclude Include="patternprops.h">
<Filter>properties &amp; sets</Filter>
</ClInclude>
<ClInclude Include="unicode\filteredbrk.h">
<Filter>break iteration</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="common.rc">

6
icu4c/source/i18n/filteredbrk.cpp → icu4c/source/common/filteredbrk.cpp
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2014, International Business Machines Corporation and
* Copyright (C) 2014-2015, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@ -52,7 +52,7 @@ static int8_t U_CALLCONV compareUnicodeString(UElement t1, UElement t2) {
/**
* A UVector which implements a set of strings.
*/
class U_I18N_API UStringSet : public UVector {
class U_COMMON_API UStringSet : public UVector {
public:
UStringSet(UErrorCode &status) : UVector(uprv_deleteUObject,
uhash_compareUnicodeString,
@ -298,7 +298,7 @@ int32_t SimpleFilteredSentenceBreakIterator::next() {
/**
* Concrete implementation of builder class.
*/
class U_I18N_API SimpleFilteredBreakIteratorBuilder : public FilteredBreakIteratorBuilder {
class U_COMMON_API SimpleFilteredBreakIteratorBuilder : public FilteredBreakIteratorBuilder {
public:
virtual ~SimpleFilteredBreakIteratorBuilder();
SimpleFilteredBreakIteratorBuilder(const Locale &fromLocale, UErrorCode &status);

4
icu4c/source/i18n/unicode/filteredbrk.h → icu4c/source/common/unicode/filteredbrk.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2014, International Business Machines
* Copyright (C) 1997-2015, International Business Machines
* Corporation and others. All Rights Reserved.
********************************************************************************
*/
@ -44,7 +44,7 @@ U_NAMESPACE_BEGIN
*
* @internal technology preview
*/
class U_I18N_API FilteredBreakIteratorBuilder : public UObject {
class U_COMMON_API FilteredBreakIteratorBuilder : public UObject {
public:
/**
* destructor.

2
icu4c/source/i18n/Makefile.in
View File

@ -94,7 +94,7 @@ uspoof.o uspoof_impl.o uspoof_build.o uspoof_conf.o uspoof_wsconf.o decfmtst.o s
ztrans.o zrule.o vzone.o fphdlimp.o fpositer.o ufieldpositer.o locdspnm.o \
decNumber.o decContext.o alphaindex.o tznames.o tznames_impl.o tzgnames.o \
tzfmt.o compactdecimalformat.o gender.o region.o scriptset.o identifier_info.o \
uregion.o reldatefmt.o quantityformatter.o measunit.o filteredbrk.o \
uregion.o reldatefmt.o quantityformatter.o measunit.o \
sharedbreakiterator.o scientificnumberformatter.o
## Header files to install

4
icu4c/source/i18n/i18n.vcxproj
View File

@ -244,7 +244,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="filteredbrk.cpp" />
<ClCompile Include="region.cpp" />
<ClCompile Include="uregion.cpp" />
<ClCompile Include="alphaindex.cpp" />
@ -668,7 +667,6 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="unicode\filteredbrk.h" />
<ClInclude Include="usrchimp.h" />
<ClInclude Include="astro.h" />
<CustomBuild Include="unicode\basictz.h">
@ -1717,4 +1715,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

10
icu4c/source/i18n/i18n.vcxproj.filters
View File

@ -510,9 +510,6 @@
<ClCompile Include="uregion.cpp">
<Filter>formatting</Filter>
</ClCompile>
<ClCompile Include="filteredbrk.cpp">
<Filter>misc</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="bocsu.cpp">
@ -1213,9 +1210,4 @@
<Filter>formatting</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<ClInclude Include="unicode\filteredbrk.h">
<Filter>misc</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>

17
icu4c/source/test/depstest/dependencies.txt
View File

@ -175,6 +175,11 @@ group: breakiterator
rbbi.o rbbinode.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o
rbbidata.o rbbirb.o
dictionarydata.o dictbe.o
# Folded 'filteredbrk' in to this group.
# it depends on global new/delete and STL. Not recording these here.
# http://bugs.icu-project.org/trac/ticket/10990
filteredbrk.o
deps
resourcebundle service_registration
schriter utext uniset_core uniset_props
@ -740,7 +745,6 @@ library: i18n
region localedata genderinfo charset_detector spoof_detection
alphabetic_index collation collation_builder string_search
formatting formattable_cnv regex regex_cnv translit
filteredbreakiterator
universal_time_scale
uclean_i18n
@ -907,17 +911,6 @@ group: translit
formatting # for Transliterator::getDisplayName()
uclean_i18n
# This is off by default, UCONFIG_NO_FILTERED_BREAK_ITERATION=0
# so, you will see warnings:
#Info: group filteredbreakiterator does not need to depend on breakiterator
#Info: group filteredbreakiterator does not need to depend on ucharstriebuilder
group: filteredbreakiterator
filteredbrk.o
deps
breakiterator ucharstriebuilder
# depends on global new/delete and STL. Not recording these here.
# http://bugs.icu-project.org/trac/ticket/10990
group: universal_time_scale
utmscale.o