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

ICU-8571 remove udraft.h etc. & genheaders.pl, use #ifndef U_HIDE_DRAFT_API etc. instead

Browse Source 
X-SVN-Rev: 30447
This commit is contained in:
Markus Scherer 2011-08-01 02:20:46 +00:00
parent ef45a40133
commit 4e30dc4c14
96 changed files with 506 additions and 1020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -717,10 +717,6 @@ icu4c/source/tools/genctd/genctd.vcproj.*.*.user
icu4c/source/tools/genctd/release
icu4c/source/tools/genctd/x64
icu4c/source/tools/genctd/x86
icu4c/source/tools/gendraft/udeprctd.h
icu4c/source/tools/gendraft/udraft.h
icu4c/source/tools/gendraft/uintrnal.h
icu4c/source/tools/gendraft/usystem.h
icu4c/source/tools/gennorm2/*.d
icu4c/source/tools/gennorm2/*.o
icu4c/source/tools/gennorm2/*.pdb

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

@ -694,48 +694,6 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="unicode\udeprctd.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="unicode\udraft.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="unicode\uintrnal.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
@ -754,20 +712,6 @@
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="umutex.h" />
<CustomBuild Include="unicode\uobslete.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="uposixdefs.h" />
<CustomBuild Include="unicode\urename.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
@ -780,20 +724,6 @@
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="unicode\usystem.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
</CustomBuild>

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

@ -835,27 +835,12 @@
<CustomBuild Include="unicode\uconfig.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\udeprctd.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\udraft.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\uintrnal.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\umachine.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\uobslete.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\urename.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\usystem.h">
<Filter>configuration</Filter>
</CustomBuild>
<CustomBuild Include="unicode\utrace.h">
<Filter>configuration</Filter>
</CustomBuild>

3
icu4c/source/common/unicode/appendable.h
View File

@ -23,6 +23,8 @@
#include "unicode/utypes.h"
#include "unicode/uobject.h"
#ifndef U_HIDE_DRAFT_API
U_NAMESPACE_BEGIN
class UnicodeString;
@ -233,4 +235,5 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // __APPENDABLE_H__

6
icu4c/source/common/unicode/brkiter.h
View File

@ -506,6 +506,7 @@ public:
*/
Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;
#ifndef U_HIDE_INTERNAL_API
/** Get the locale for this break iterator object. You can choose between valid and actual locale.
* @param type type of the locale we're looking for (valid or actual)
* @param status error code for the operation
@ -513,6 +514,7 @@ public:
* @internal
*/
const char *getLocaleID(ULocDataLocaleType type, UErrorCode& status) const;
#endif /* U_HIDE_INTERNAL_API */
/**
* Set the subject text string upon which the break iterator is operating
@ -537,7 +539,7 @@ public:
* @param status Receives errors detected by this function.
* @return *this
*
* @draft ICU 5.0
* @draft ICU 49
*/
virtual BreakIterator &refreshInputText(UText *input, UErrorCode &status) = 0;
@ -550,6 +552,8 @@ public:
friend class ICUBreakIteratorService;
protected:
// Do not enclose protected default/copy constructors with #ifndef U_HIDE_INTERNAL_API
// or else the compiler will create a public ones.
/** @internal */
BreakIterator();
/** @internal */

2
icu4c/source/common/unicode/bytestream.h
View File

@ -201,6 +201,7 @@ public:
* @stable ICU 4.2
*/
UBool Overflowed() const { return overflowed_; }
#ifndef U_HIDE_DRAFT_API
/**
* Returns the number of bytes appended to the sink.
* If Overflowed() then NumberOfBytesAppended()>NumberOfBytesWritten()
@ -209,6 +210,7 @@ public:
* @draft ICU 4.6
*/
int32_t NumberOfBytesAppended() const { return appended_; }
#endif /* U_HIDE_DRAFT_API */
private:
char* outbuf_;
const int32_t capacity_;

3
icu4c/source/common/unicode/bytestrie.h
View File

@ -25,6 +25,8 @@
#include "unicode/uobject.h"
#include "unicode/ustringtrie.h"
#ifndef U_HIDE_DRAFT_API
U_NAMESPACE_BEGIN
class ByteSink;
@ -516,4 +518,5 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // __BYTESTRIE_H__

5
icu4c/source/common/unicode/bytestriebuilder.h
View File

@ -20,6 +20,8 @@
#include "unicode/stringpiece.h"
#include "unicode/stringtriebuilder.h"
#ifndef U_HIDE_DRAFT_API
U_NAMESPACE_BEGIN
class BytesTrieElement;
@ -130,6 +132,7 @@ private:
virtual int32_t getMinLinearMatch() const { return BytesTrie::kMinLinearMatch; }
virtual int32_t getMaxLinearMatchLength() const { return BytesTrie::kMaxLinearMatchLength; }
#ifndef U_HIDE_INTERNAL_API
/**
* @internal
*/
@ -141,6 +144,7 @@ private:
private:
const char *s;
};
#endif /* U_HIDE_INTERNAL_API */
virtual Node *createLinearMatchNode(int32_t i, int32_t byteIndex, int32_t length,
Node *nextNode) const;
@ -167,4 +171,5 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // __BYTESTRIEBUILDER_H__

6
icu4c/source/common/unicode/caniter.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 1996-2010, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 1996-2011, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
@ -116,6 +116,7 @@ public:
*/
void setSource(const UnicodeString &newSource, UErrorCode &status);
#ifndef U_HIDE_INTERNAL_API
/**
* Dumb recursive implementation of permutation.
* TODO: optimize
@ -126,6 +127,7 @@ public:
* @internal
*/
static void U_EXPORT2 permute(UnicodeString &source, UBool skipZeros, Hashtable *result, UErrorCode &status);
#endif /* U_HIDE_INTERNAL_API */
/**
* ICU "poor man's RTTI", returns a UClassID for this class.

4
icu4c/source/common/unicode/icudataver.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2009-2010, International Business Machines
* Copyright (C) 2009-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -12,6 +12,7 @@
#include "unicode/utypes.h"
#ifndef U_HIDE_INTERNAL_API
/**
* @internal ICU 4.4
*/
@ -53,5 +54,6 @@ U_INTERNAL UBool U_EXPORT2 u_isDataOlder(UVersionInfo dataVersionFillin, UBool *
* @internal ICU 4.4
*/
U_INTERNAL void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
#endif

5
icu4c/source/common/unicode/icuplug.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 2009-2010, International Business Machines
* Copyright (C) 2009-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
******************************************************************************
@ -110,6 +110,7 @@
/* === Basic types === */
#ifndef U_HIDE_INTERNAL_API
/**
* @{
* Opaque structure passed to/from a plugin.
@ -365,6 +366,6 @@ uplug_loadPlugFromLibrary(const char *libName, const char *sym, const char *conf
*/
U_CAPI void U_EXPORT2
uplug_removePlug(UPlugData *plug, UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
#endif

2
icu4c/source/common/unicode/idna.h
View File

@ -23,6 +23,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_IDNA
#ifndef U_HIDE_DRAFT_API
#include "unicode/bytestream.h"
#include "unicode/stringpiece.h"
@ -323,5 +324,6 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // UCONFIG_NO_IDNA
#endif // __IDNA_H__

4
icu4c/source/common/unicode/locid.h
View File

@ -447,6 +447,7 @@ public:
*/
int32_t getKeywordValue(const char* keywordName, char *buffer, int32_t bufferCapacity, UErrorCode &status) const;
#ifndef U_HIDE_INTERNAL_API
/**
* Set the value for a keyword.
*
@ -459,6 +460,7 @@ public:
* @internal
*/
void setKeywordValue(const char* keywordName, const char* keywordValue, UErrorCode &status);
#endif /* U_HIDE_INTERNAL_API */
/**
* returns the locale's three-letter language code, as specified
@ -683,11 +685,13 @@ public:
virtual UClassID getDynamicClassID() const;
protected: /* only protected for testing purposes. DO NOT USE. */
#ifndef U_HIDE_INTERNAL_API
/**
* Set this from a single POSIX style locale string.
* @internal
*/
void setFromPOSIXID(const char *posixID);
#endif /* U_HIDE_INTERNAL_API */
private:
/**

2
icu4c/source/common/unicode/messagepattern.h
View File

@ -23,6 +23,7 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/parseerr.h"
#include "unicode/unistr.h"
@ -927,6 +928,7 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // !UCONFIG_NO_FORMATTING
#endif // __MESSAGEPATTERN_H__

14
icu4c/source/common/unicode/rbbi.h
View File

@ -170,6 +170,7 @@ protected:
// constructors
//=======================================================================
#ifndef U_HIDE_INTERNAL_API
/**
* Constant to be used in the constructor
* RuleBasedBreakIterator(RBBIDataHeader*, EDontAdopt, UErrorCode &);
@ -203,6 +204,7 @@ protected:
* @internal
*/
RuleBasedBreakIterator(const RBBIDataHeader* data, enum EDontAdopt dontAdopt, UErrorCode &status);
#endif /* U_HIDE_INTERNAL_API */
friend class RBBIRuleBuilder;
@ -239,9 +241,7 @@ public:
UParseError &parseError,
UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Contruct a RuleBasedBreakIterator from a set of precompiled binary rules.
* Binary rules are obtained from RulesBasedBreakIterator::getBinaryRules().
@ -268,7 +268,7 @@ public:
RuleBasedBreakIterator(const uint8_t *compiledRules,
uint32_t ruleLength,
UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* This constructor uses the udata interface to create a BreakIterator
@ -656,7 +656,7 @@ public:
* @param status Receives errors detected by this function.
* @return *this
*
* @draft ICU 5.0
* @draft ICU 49
*/
virtual RuleBasedBreakIterator &refreshInputText(UText *input, UErrorCode &status);
@ -696,12 +696,14 @@ protected:
*/
virtual void setBreakType(int32_t type);
#ifndef U_HIDE_INTERNAL_API
/**
* Common initialization function, used by constructors and bufferClone.
* (Also used by DictionaryBasedBreakIterator::createBufferClone().)
* @internal
*/
void init();
#endif /* U_HIDE_INTERNAL_API */
private:
@ -729,6 +731,7 @@ private:
protected:
#ifndef U_HIDE_INTERNAL_API
/**
* This is the function that actually implements dictionary-based
* breaking. Covering at least the range from startPos to endPos,
@ -744,6 +747,7 @@ protected:
* @internal
*/
int32_t checkDictionary(int32_t startPos, int32_t endPos, UBool reverse);
#endif /* U_HIDE_INTERNAL_API */
private:

8
icu4c/source/common/unicode/resbund.h
View File

@ -1,7 +1,7 @@
/*
******************************************************************************
*
* Copyright (C) 1996-2007, International Business Machines Corporation
* Copyright (C) 1996-2011, International Business Machines Corporation
* and others. All Rights Reserved.
*
******************************************************************************
@ -409,6 +409,7 @@ public:
getStringEx(const char* key,
UErrorCode& status) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the version number associated with this ResourceBundle as a string. Please
* use getVersion, as this method is going to be deprecated.
@ -420,6 +421,7 @@ public:
*/
const char*
getVersionNumber(void) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the version number associated with this ResourceBundle as a UVersionInfo array.
@ -431,6 +433,7 @@ public:
void
getVersion(UVersionInfo versionInfo) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the Locale associated with this ResourceBundle.
*
@ -439,6 +442,7 @@ public:
*/
const Locale&
getLocale(void) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the Locale associated with this ResourceBundle.
@ -452,12 +456,14 @@ public:
*/
const Locale
getLocale(ULocDataLocaleType type, UErrorCode &status) const;
#ifndef U_HIDE_INTERNAL_API
/**
* This API implements multilevel fallback
* @internal
*/
ResourceBundle
getWithFallback(const char* key, UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
*

4
icu4c/source/common/unicode/stringpiece.h
View File

@ -134,6 +134,7 @@ class U_COMMON_API StringPiece : public UMemory {
*/
void clear() { ptr_ = NULL; length_ = 0; }
#ifndef U_HIDE_DRAFT_API
/**
* Reset the stringpiece to refer to new data.
* @param xdata pointer the new string data. Need not be nul terminated.
@ -148,6 +149,7 @@ class U_COMMON_API StringPiece : public UMemory {
* @draft ICU 4.8
*/
void set(const char* str);
#endif /* U_HIDE_DRAFT_API */
/**
* Removes the first n string units.
@ -198,6 +200,7 @@ class U_COMMON_API StringPiece : public UMemory {
}
};
#ifndef U_HIDE_DRAFT_API
/**
* Global operator == for StringPiece
* @param x The first StringPiece to compare.
@ -218,6 +221,7 @@ operator==(const StringPiece& x, const StringPiece& y);
inline UBool operator!=(const StringPiece& x, const StringPiece& y) {
return !(x == y);
}
#endif /* U_HIDE_DRAFT_API */
U_NAMESPACE_END

13
icu4c/source/common/unicode/stringtriebuilder.h
View File

@ -18,6 +18,8 @@
#include "unicode/utypes.h"
#include "unicode/uobject.h"
#ifndef U_HIDE_DRAFT_API
// Forward declaration.
struct UHashtable;
typedef struct UHashtable UHashtable;
@ -55,17 +57,22 @@ U_NAMESPACE_BEGIN
*/
class U_COMMON_API StringTrieBuilder : public UObject {
public:
#ifndef U_HIDE_INTERNAL_API
/** @internal */
static UBool hashNode(const void *node);
/** @internal */
static UBool equalNodes(const void *left, const void *right);
#endif /* U_HIDE_INTERNAL_API */
protected:
// Do not enclose the protected default constructor with #ifndef U_HIDE_INTERNAL_API
// or else the compiler will create a public default constructor.
/** @internal */
StringTrieBuilder();
/** @internal */
virtual ~StringTrieBuilder();
#ifndef U_HIDE_INTERNAL_API
/** @internal */
void createCompactBuilder(int32_t sizeGuess, UErrorCode &errorCode);
/** @internal */
@ -78,14 +85,17 @@ protected:
int32_t writeNode(int32_t start, int32_t limit, int32_t unitIndex);
/** @internal */
int32_t writeBranchSubNode(int32_t start, int32_t limit, int32_t unitIndex, int32_t length);
#endif /* U_HIDE_INTERNAL_API */
class Node;
#ifndef U_HIDE_INTERNAL_API
/** @internal */
Node *makeNode(int32_t start, int32_t limit, int32_t unitIndex, UErrorCode &errorCode);
/** @internal */
Node *makeBranchSubNode(int32_t start, int32_t limit, int32_t unitIndex,
int32_t length, UErrorCode &errorCode);
#endif /* U_HIDE_INTERNAL_API */
/** @internal */
virtual int32_t getElementStringLength(int32_t i) const = 0;
@ -117,6 +127,7 @@ protected:
/** @internal */
virtual int32_t getMaxLinearMatchLength() const = 0;
#ifndef U_HIDE_INTERNAL_API
// max(BytesTrie::kMaxBranchLinearSubNodeLength, UCharsTrie::kMaxBranchLinearSubNodeLength).
/** @internal */
static const int32_t kMaxBranchLinearSubNodeLength=5;
@ -354,6 +365,7 @@ protected:
int32_t length;
Node *next; // A branch sub-node.
};
#endif /* U_HIDE_INTERNAL_API */
/** @internal */
virtual Node *createLinearMatchNode(int32_t i, int32_t unitIndex, int32_t length,
@ -377,4 +389,5 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // __STRINGTRIEBUILDER_H__

6
icu4c/source/common/unicode/ubidi.h
View File

@ -446,6 +446,7 @@ enum UBiDiDirection {
* @stable ICU 2.0
*/
UBIDI_MIXED,
#ifndef U_HIDE_DRAFT_API
/** No strongly directional text.
* <p>As return value for <code>ubidi_getBaseDirection()</code>, it means
* that the source string is missing or empty, or contains neither left-to-right
@ -453,6 +454,7 @@ enum UBiDiDirection {
* @draft ICU 4.6
*/
UBIDI_NEUTRAL
#endif /* U_HIDE_DRAFT_API */
};
/** @stable ICU 2.0 */
@ -1044,6 +1046,7 @@ ubidi_setReorderingOptions(UBiDi *pBiDi, uint32_t reorderingOptions);
U_STABLE uint32_t U_EXPORT2
ubidi_getReorderingOptions(UBiDi *pBiDi);
#ifndef U_HIDE_DRAFT_API
/**
* Set the context before a call to ubidi_setPara().<p>
*
@ -1133,6 +1136,7 @@ ubidi_setContext(UBiDi *pBiDi,
const UChar *prologue, int32_t proLength,
const UChar *epilogue, int32_t epiLength,
UErrorCode *pErrorCode);
#endif /* U_HIDE_DRAFT_API */
/**
* Perform the Unicode Bidi algorithm. It is defined in the
@ -1288,6 +1292,7 @@ ubidi_setLine(const UBiDi *pParaBiDi,
U_STABLE UBiDiDirection U_EXPORT2
ubidi_getDirection(const UBiDi *pBiDi);
#ifndef U_HIDE_DRAFT_API
/**
* Gets the base direction of the text provided according
* to the Unicode Bidirectional Algorithm. The base direction
@ -1317,6 +1322,7 @@ ubidi_getDirection(const UBiDi *pBiDi);
*/
U_DRAFT UBiDiDirection U_EXPORT2
ubidi_getBaseDirection(const UChar *text, int32_t length );
#endif /* U_HIDE_DRAFT_API */
/**
* Get the pointer to the text.

6
icu4c/source/common/unicode/ubrk.h
View File

@ -495,7 +495,7 @@ ubrk_getRuleStatusVec(UBreakIterator *bi, int32_t *fillInVec, int32_t capacity,
U_STABLE const char* U_EXPORT2
ubrk_getLocaleByType(const UBreakIterator *bi, ULocDataLocaleType type, UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Set the subject text string upon which the break iterator is operating
* without changing any other aspect of the state.
@ -519,13 +519,13 @@ ubrk_getLocaleByType(const UBreakIterator *bi, ULocDataLocaleType type, UErrorCo
* @param text The new (moved) text string.
* @param status Receives errors detected by this function.
*
* @draft ICU 5.0
* @draft ICU 49
*/
U_DRAFT void U_EXPORT2
ubrk_refreshUText(UBreakIterator *bi,
UText *text,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_BREAK_ITERATION */

4
icu4c/source/common/unicode/uchar.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2010, International Business Machines
* Copyright (C) 1997-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -560,6 +560,7 @@ typedef enum UProperty {
/** One more than the last constant for string Unicode properties. @stable ICU 2.4 */
UCHAR_STRING_LIMIT=0x400D,
#ifndef U_HIDE_DRAFT_API
/** Provisional property Script_Extensions (new in Unicode 6.0).
As a provisional property, it may be modified or removed
in future versions of the Unicode Standard, and thus in ICU.
@ -573,6 +574,7 @@ typedef enum UProperty {
/** One more than the last constant for Unicode properties with unusual value types.
* @draft ICU 4.6 */
UCHAR_OTHER_PROPERTY_LIMIT=0x7001,
#endif /* U_HIDE_DRAFT_API */
/** Represents a nonexistent or invalid property or property value. @stable ICU 2.4 */
UCHAR_INVALID_CODE = -1

3
icu4c/source/common/unicode/ucharstrie.h
View File

@ -26,6 +26,8 @@
#include "unicode/uobject.h"
#include "unicode/ustringtrie.h"
#ifndef U_HIDE_DRAFT_API
U_NAMESPACE_BEGIN
class Appendable;
@ -573,4 +575,5 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // __UCHARSTRIE_H__

3
icu4c/source/common/unicode/ucharstriebuilder.h
View File

@ -20,6 +20,8 @@
#include "unicode/ucharstrie.h"
#include "unicode/unistr.h"
#ifndef U_HIDE_DRAFT_API
U_NAMESPACE_BEGIN
class UCharsTrieElement;
@ -171,4 +173,5 @@ private:
U_NAMESPACE_END
#endif /* U_HIDE_DRAFT_API */
#endif // __UCHARSTRIEBUILDER_H__

6
icu4c/source/common/unicode/uclean.h
View File

@ -1,9 +1,7 @@
/*
******************************************************************************
* *
* Copyright (C) 2001-2009, International Business Machines *
* Corporation and others. All Rights Reserved. *
* *
* Copyright (C) 2001-2011, International Business Machines
* Corporation and others. All Rights Reserved.
******************************************************************************
* file name: uclean.h
* encoding: US-ASCII

2
icu4c/source/common/unicode/ucnv.h
View File

@ -2027,6 +2027,7 @@ ucnv_fromUCountPending(const UConverter* cnv, UErrorCode* status);
U_STABLE int32_t U_EXPORT2
ucnv_toUCountPending(const UConverter* cnv, UErrorCode* status);
#ifndef U_HIDE_DRAFT_API
/**
* Returns whether or not the charset of the converter has a fixed number of bytes
* per charset character.
@ -2044,6 +2045,7 @@ ucnv_toUCountPending(const UConverter* cnv, UErrorCode* status);
*/
U_DRAFT UBool U_EXPORT2
ucnv_isFixedWidth(UConverter *cnv, UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif

48
icu4c/source/common/unicode/udeprctd.h
View File

@ -1,48 +0,0 @@
/*
*******************************************************************************
* Copyright (C) 2004-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
* file name: udeprctd.h
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* Created by: genheaders.pl, a perl script written by Ram Viswanadha
*
* Contains data for commenting out APIs.
* Gets included by umachine.h
*
* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHAT
* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
*/
#ifndef UDEPRCTD_H
#define UDEPRCTD_H
#ifdef U_HIDE_DEPRECATED_API
# if U_DISABLE_RENAMING
# define ucol_getContractions ucol_getContractions_DEPRECATED_API_DO_NOT_USE
# define ucol_getLocale ucol_getLocale_DEPRECATED_API_DO_NOT_USE
# define ures_countArrayItems ures_countArrayItems_DEPRECATED_API_DO_NOT_USE
# define ures_getLocale ures_getLocale_DEPRECATED_API_DO_NOT_USE
# define ures_getVersionNumber ures_getVersionNumber_DEPRECATED_API_DO_NOT_USE
# define utrans_getAvailableID utrans_getAvailableID_DEPRECATED_API_DO_NOT_USE
# define utrans_getID utrans_getID_DEPRECATED_API_DO_NOT_USE
# define utrans_unregister utrans_unregister_DEPRECATED_API_DO_NOT_USE
# else
# define ucol_getContractions_48 ucol_getContractions_DEPRECATED_API_DO_NOT_USE
# define ucol_getLocale_48 ucol_getLocale_DEPRECATED_API_DO_NOT_USE
# define ures_countArrayItems_48 ures_countArrayItems_DEPRECATED_API_DO_NOT_USE
# define ures_getLocale_48 ures_getLocale_DEPRECATED_API_DO_NOT_USE
# define ures_getVersionNumber_48 ures_getVersionNumber_DEPRECATED_API_DO_NOT_USE
# define utrans_getAvailableID_48 utrans_getAvailableID_DEPRECATED_API_DO_NOT_USE
# define utrans_getID_48 utrans_getID_DEPRECATED_API_DO_NOT_USE
# define utrans_unregister_48 utrans_unregister_DEPRECATED_API_DO_NOT_USE
# endif /* U_DISABLE_RENAMING */
#endif /* U_HIDE_DEPRECATED_API */
#endif /* UDEPRCTD_H */

92
icu4c/source/common/unicode/udraft.h
View File

@ -1,92 +0,0 @@
/*
*******************************************************************************
* Copyright (C) 2004-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
* file name: udraft.h
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* Created by: genheaders.pl, a perl script written by Ram Viswanadha
*
* Contains data for commenting out APIs.
* Gets included by umachine.h
*
* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHAT
* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
*/
#ifndef UDRAFT_H
#define UDRAFT_H
#ifdef U_HIDE_DRAFT_API
# if U_DISABLE_RENAMING
# define StringPiece StringPiece_DRAFT_API_DO_NOT_USE
# define ubidi_getBaseDirection ubidi_getBaseDirection_DRAFT_API_DO_NOT_USE
# define ubidi_setContext ubidi_setContext_DRAFT_API_DO_NOT_USE
# define ucal_getFieldDifference ucal_getFieldDifference_DRAFT_API_DO_NOT_USE
# define ucal_openTimeZoneIDEnumeration ucal_openTimeZoneIDEnumeration_DRAFT_API_DO_NOT_USE
# define ucnv_isFixedWidth ucnv_isFixedWidth_DRAFT_API_DO_NOT_USE
# define ucol_getEquivalentReorderCodes ucol_getEquivalentReorderCodes_DRAFT_API_DO_NOT_USE
# define ucol_getReorderCodes ucol_getReorderCodes_DRAFT_API_DO_NOT_USE
# define ucol_setReorderCodes ucol_setReorderCodes_DRAFT_API_DO_NOT_USE
# define ucurr_isAvailable ucurr_isAvailable_DRAFT_API_DO_NOT_USE
# define uidna_close uidna_close_DRAFT_API_DO_NOT_USE
# define uidna_openUTS46 uidna_openUTS46_DRAFT_API_DO_NOT_USE
# define uloc_forLanguageTag uloc_forLanguageTag_DRAFT_API_DO_NOT_USE
# define uloc_toLanguageTag uloc_toLanguageTag_DRAFT_API_DO_NOT_USE
# define unorm2_getDecomposition unorm2_getDecomposition_DRAFT_API_DO_NOT_USE
# define uregex_end64 uregex_end64_DRAFT_API_DO_NOT_USE
# define uregex_find64 uregex_find64_DRAFT_API_DO_NOT_USE
# define uregex_getFindProgressCallback uregex_getFindProgressCallback_DRAFT_API_DO_NOT_USE
# define uregex_lookingAt64 uregex_lookingAt64_DRAFT_API_DO_NOT_USE
# define uregex_matches64 uregex_matches64_DRAFT_API_DO_NOT_USE
# define uregex_patternUText uregex_patternUText_DRAFT_API_DO_NOT_USE
# define uregex_regionEnd64 uregex_regionEnd64_DRAFT_API_DO_NOT_USE
# define uregex_regionStart64 uregex_regionStart64_DRAFT_API_DO_NOT_USE
# define uregex_reset64 uregex_reset64_DRAFT_API_DO_NOT_USE
# define uregex_setFindProgressCallback uregex_setFindProgressCallback_DRAFT_API_DO_NOT_USE
# define uregex_setRegion64 uregex_setRegion64_DRAFT_API_DO_NOT_USE
# define uregex_setRegionAndStart uregex_setRegionAndStart_DRAFT_API_DO_NOT_USE
# define uregex_start64 uregex_start64_DRAFT_API_DO_NOT_USE
# define uscript_getScriptExtensions uscript_getScriptExtensions_DRAFT_API_DO_NOT_USE
# define uscript_hasScript uscript_hasScript_DRAFT_API_DO_NOT_USE
# else
# define StringPiece_48 StringPiece_DRAFT_API_DO_NOT_USE
# define ubidi_getBaseDirection_48 ubidi_getBaseDirection_DRAFT_API_DO_NOT_USE
# define ubidi_setContext_48 ubidi_setContext_DRAFT_API_DO_NOT_USE
# define ucal_getFieldDifference_48 ucal_getFieldDifference_DRAFT_API_DO_NOT_USE
# define ucal_openTimeZoneIDEnumeration_48 ucal_openTimeZoneIDEnumeration_DRAFT_API_DO_NOT_USE
# define ucnv_isFixedWidth_48 ucnv_isFixedWidth_DRAFT_API_DO_NOT_USE
# define ucol_getEquivalentReorderCodes_48 ucol_getEquivalentReorderCodes_DRAFT_API_DO_NOT_USE
# define ucol_getReorderCodes_48 ucol_getReorderCodes_DRAFT_API_DO_NOT_USE
# define ucol_setReorderCodes_48 ucol_setReorderCodes_DRAFT_API_DO_NOT_USE
# define ucurr_isAvailable_48 ucurr_isAvailable_DRAFT_API_DO_NOT_USE
# define uidna_close_48 uidna_close_DRAFT_API_DO_NOT_USE
# define uidna_openUTS46_48 uidna_openUTS46_DRAFT_API_DO_NOT_USE
# define uloc_forLanguageTag_48 uloc_forLanguageTag_DRAFT_API_DO_NOT_USE
# define uloc_toLanguageTag_48 uloc_toLanguageTag_DRAFT_API_DO_NOT_USE
# define unorm2_getDecomposition_48 unorm2_getDecomposition_DRAFT_API_DO_NOT_USE
# define uregex_end64_48 uregex_end64_DRAFT_API_DO_NOT_USE
# define uregex_find64_48 uregex_find64_DRAFT_API_DO_NOT_USE
# define uregex_getFindProgressCallback_48 uregex_getFindProgressCallback_DRAFT_API_DO_NOT_USE
# define uregex_lookingAt64_48 uregex_lookingAt64_DRAFT_API_DO_NOT_USE
# define uregex_matches64_48 uregex_matches64_DRAFT_API_DO_NOT_USE
# define uregex_patternUText_48 uregex_patternUText_DRAFT_API_DO_NOT_USE
# define uregex_regionEnd64_48 uregex_regionEnd64_DRAFT_API_DO_NOT_USE
# define uregex_regionStart64_48 uregex_regionStart64_DRAFT_API_DO_NOT_USE
# define uregex_reset64_48 uregex_reset64_DRAFT_API_DO_NOT_USE
# define uregex_setFindProgressCallback_48 uregex_setFindProgressCallback_DRAFT_API_DO_NOT_USE
# define uregex_setRegion64_48 uregex_setRegion64_DRAFT_API_DO_NOT_USE
# define uregex_setRegionAndStart_48 uregex_setRegionAndStart_DRAFT_API_DO_NOT_USE
# define uregex_start64_48 uregex_start64_DRAFT_API_DO_NOT_USE
# define uscript_getScriptExtensions_48 uscript_getScriptExtensions_DRAFT_API_DO_NOT_USE
# define uscript_hasScript_48 uscript_hasScript_DRAFT_API_DO_NOT_USE
# endif /* U_DISABLE_RENAMING */
#endif /* U_HIDE_DRAFT_API */
#endif /* UDRAFT_H */

2
icu4c/source/common/unicode/uenum.h
View File

@ -157,6 +157,7 @@ uenum_reset(UEnumeration* en, UErrorCode* status);
#if U_SHOW_CPLUSPLUS_API
#ifndef U_HIDE_DRAFT_API
/**
* Given a StringEnumeration, wrap it in a UEnumeration. The
* StringEnumeration is adopted; after this call, the caller must not
@ -168,6 +169,7 @@ uenum_reset(UEnumeration* en, UErrorCode* status);
*/
U_CAPI UEnumeration* U_EXPORT2
uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec);
#endif /* U_HIDE_DRAFT_API */
#endif

4
icu4c/source/common/unicode/uidna.h
View File

@ -62,6 +62,7 @@ enum {
* @stable ICU 2.6
*/
UIDNA_USE_STD3_RULES=2,
#ifndef U_HIDE_DRAFT_API
/**
* IDNA option to check for whether the input conforms to the BiDi rules.
* For use in static worker and factory methods.
@ -106,8 +107,10 @@ enum {
* @draft ICU 49
*/
UIDNA_CHECK_CONTEXTO=0x40
#endif /* U_HIDE_DRAFT_API */
};
#ifndef U_HIDE_DRAFT_API
/**
* Opaque C service object type for the new IDNA API.
* @draft ICU 4.6
@ -503,6 +506,7 @@ enum {
*/
UIDNA_ERROR_CONTEXTO_DIGITS=0x4000
};
#endif /* U_HIDE_DRAFT_API */
/* IDNA2003 API ------------------------------------------------------------- */

238
icu4c/source/common/unicode/uintrnal.h
View File

@ -1,238 +0,0 @@
/*
*******************************************************************************
* Copyright (C) 2004-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
* file name: uintrnal.h
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* Created by: genheaders.pl, a perl script written by Ram Viswanadha
*
* Contains data for commenting out APIs.
* Gets included by umachine.h
*
* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHAT
* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
*/
#ifndef UINTRNAL_H
#define UINTRNAL_H
#ifdef U_HIDE_INTERNAL_API
# if U_DISABLE_RENAMING
# define RegexPatternDump RegexPatternDump_INTERNAL_API_DO_NOT_USE
# define bms_close bms_close_INTERNAL_API_DO_NOT_USE
# define bms_empty bms_empty_INTERNAL_API_DO_NOT_USE
# define bms_getData bms_getData_INTERNAL_API_DO_NOT_USE
# define bms_open bms_open_INTERNAL_API_DO_NOT_USE
# define bms_search bms_search_INTERNAL_API_DO_NOT_USE
# define bms_setTargetString bms_setTargetString_INTERNAL_API_DO_NOT_USE
# define pl_addFontRun pl_addFontRun_INTERNAL_API_DO_NOT_USE
# define pl_addLocaleRun pl_addLocaleRun_INTERNAL_API_DO_NOT_USE
# define pl_addValueRun pl_addValueRun_INTERNAL_API_DO_NOT_USE
# define pl_close pl_close_INTERNAL_API_DO_NOT_USE
# define pl_closeFontRuns pl_closeFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_closeLine pl_closeLine_INTERNAL_API_DO_NOT_USE
# define pl_closeLocaleRuns pl_closeLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_closeValueRuns pl_closeValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_countLineRuns pl_countLineRuns_INTERNAL_API_DO_NOT_USE
# define pl_getAscent pl_getAscent_INTERNAL_API_DO_NOT_USE
# define pl_getDescent pl_getDescent_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunCount pl_getFontRunCount_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunFont pl_getFontRunFont_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunLastLimit pl_getFontRunLastLimit_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunLimit pl_getFontRunLimit_INTERNAL_API_DO_NOT_USE
# define pl_getLeading pl_getLeading_INTERNAL_API_DO_NOT_USE
# define pl_getLineAscent pl_getLineAscent_INTERNAL_API_DO_NOT_USE
# define pl_getLineDescent pl_getLineDescent_INTERNAL_API_DO_NOT_USE
# define pl_getLineLeading pl_getLineLeading_INTERNAL_API_DO_NOT_USE
# define pl_getLineVisualRun pl_getLineVisualRun_INTERNAL_API_DO_NOT_USE
# define pl_getLineWidth pl_getLineWidth_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunCount pl_getLocaleRunCount_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunLastLimit pl_getLocaleRunLastLimit_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunLimit pl_getLocaleRunLimit_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunLocale pl_getLocaleRunLocale_INTERNAL_API_DO_NOT_USE
# define pl_getParagraphLevel pl_getParagraphLevel_INTERNAL_API_DO_NOT_USE
# define pl_getTextDirection pl_getTextDirection_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunCount pl_getValueRunCount_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunLastLimit pl_getValueRunLastLimit_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunLimit pl_getValueRunLimit_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunValue pl_getValueRunValue_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunAscent pl_getVisualRunAscent_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunDescent pl_getVisualRunDescent_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunDirection pl_getVisualRunDirection_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunFont pl_getVisualRunFont_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunGlyphCount pl_getVisualRunGlyphCount_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunGlyphToCharMap pl_getVisualRunGlyphToCharMap_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunGlyphs pl_getVisualRunGlyphs_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunLeading pl_getVisualRunLeading_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunPositions pl_getVisualRunPositions_INTERNAL_API_DO_NOT_USE
# define pl_line pl_line_INTERNAL_API_DO_NOT_USE
# define pl_nextLine pl_nextLine_INTERNAL_API_DO_NOT_USE
# define pl_openEmptyFontRuns pl_openEmptyFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_openEmptyLocaleRuns pl_openEmptyLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_openEmptyValueRuns pl_openEmptyValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_openFontRuns pl_openFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_openLocaleRuns pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_openValueRuns pl_openValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_paragraph pl_paragraph_INTERNAL_API_DO_NOT_USE
# define pl_reflow pl_reflow_INTERNAL_API_DO_NOT_USE
# define pl_resetFontRuns pl_resetFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_resetLocaleRuns pl_resetLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_resetValueRuns pl_resetValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_visualRun pl_visualRun_INTERNAL_API_DO_NOT_USE
# define ucd_close ucd_close_INTERNAL_API_DO_NOT_USE
# define ucd_flushCache ucd_flushCache_INTERNAL_API_DO_NOT_USE
# define ucd_freeCache ucd_freeCache_INTERNAL_API_DO_NOT_USE
# define ucd_getCollator ucd_getCollator_INTERNAL_API_DO_NOT_USE
# define ucd_open ucd_open_INTERNAL_API_DO_NOT_USE
# define ucol_equals ucol_equals_INTERNAL_API_DO_NOT_USE
# define ucol_forceHanImplicit ucol_forceHanImplicit_INTERNAL_API_DO_NOT_USE
# define ucol_forgetUCA ucol_forgetUCA_INTERNAL_API_DO_NOT_USE
# define ucol_getAttributeOrDefault ucol_getAttributeOrDefault_INTERNAL_API_DO_NOT_USE
# define ucol_getUnsafeSet ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE
# define ucol_nextProcessed ucol_nextProcessed_INTERNAL_API_DO_NOT_USE
# define ucol_previousProcessed ucol_previousProcessed_INTERNAL_API_DO_NOT_USE
# define udat_applyPatternRelative udat_applyPatternRelative_INTERNAL_API_DO_NOT_USE
# define udat_toPatternRelativeDate udat_toPatternRelativeDate_INTERNAL_API_DO_NOT_USE
# define udat_toPatternRelativeTime udat_toPatternRelativeTime_INTERNAL_API_DO_NOT_USE
# define uplug_getConfiguration uplug_getConfiguration_INTERNAL_API_DO_NOT_USE
# define uplug_getContext uplug_getContext_INTERNAL_API_DO_NOT_USE
# define uplug_getCurrentLevel uplug_getCurrentLevel_INTERNAL_API_DO_NOT_USE
# define uplug_getLibrary uplug_getLibrary_INTERNAL_API_DO_NOT_USE
# define uplug_getLibraryName uplug_getLibraryName_INTERNAL_API_DO_NOT_USE
# define uplug_getPlugLevel uplug_getPlugLevel_INTERNAL_API_DO_NOT_USE
# define uplug_getPlugLoadStatus uplug_getPlugLoadStatus_INTERNAL_API_DO_NOT_USE
# define uplug_getPlugName uplug_getPlugName_INTERNAL_API_DO_NOT_USE
# define uplug_getSymbolName uplug_getSymbolName_INTERNAL_API_DO_NOT_USE
# define uplug_loadPlugFromEntrypoint uplug_loadPlugFromEntrypoint_INTERNAL_API_DO_NOT_USE
# define uplug_loadPlugFromLibrary uplug_loadPlugFromLibrary_INTERNAL_API_DO_NOT_USE
# define uplug_nextPlug uplug_nextPlug_INTERNAL_API_DO_NOT_USE
# define uplug_removePlug uplug_removePlug_INTERNAL_API_DO_NOT_USE
# define uplug_setContext uplug_setContext_INTERNAL_API_DO_NOT_USE
# define uplug_setPlugLevel uplug_setPlugLevel_INTERNAL_API_DO_NOT_USE
# define uplug_setPlugName uplug_setPlugName_INTERNAL_API_DO_NOT_USE
# define uplug_setPlugNoUnload uplug_setPlugNoUnload_INTERNAL_API_DO_NOT_USE
# define uprv_getDefaultCodepage uprv_getDefaultCodepage_INTERNAL_API_DO_NOT_USE
# define uprv_getDefaultLocaleID uprv_getDefaultLocaleID_INTERNAL_API_DO_NOT_USE
# define ures_openFillIn ures_openFillIn_INTERNAL_API_DO_NOT_USE
# define usearch_search usearch_search_INTERNAL_API_DO_NOT_USE
# define usearch_searchBackwards usearch_searchBackwards_INTERNAL_API_DO_NOT_USE
# define utf8_appendCharSafeBody utf8_appendCharSafeBody_INTERNAL_API_DO_NOT_USE
# define utf8_back1SafeBody utf8_back1SafeBody_INTERNAL_API_DO_NOT_USE
# define utf8_countTrailBytes utf8_countTrailBytes_INTERNAL_API_DO_NOT_USE
# define utf8_nextCharSafeBody utf8_nextCharSafeBody_INTERNAL_API_DO_NOT_USE
# define utf8_prevCharSafeBody utf8_prevCharSafeBody_INTERNAL_API_DO_NOT_USE
# else
# define RegexPatternDump_48 RegexPatternDump_INTERNAL_API_DO_NOT_USE
# define bms_close_48 bms_close_INTERNAL_API_DO_NOT_USE
# define bms_empty_48 bms_empty_INTERNAL_API_DO_NOT_USE
# define bms_getData_48 bms_getData_INTERNAL_API_DO_NOT_USE
# define bms_open_48 bms_open_INTERNAL_API_DO_NOT_USE
# define bms_search_48 bms_search_INTERNAL_API_DO_NOT_USE
# define bms_setTargetString_48 bms_setTargetString_INTERNAL_API_DO_NOT_USE
# define pl_addFontRun_48 pl_addFontRun_INTERNAL_API_DO_NOT_USE
# define pl_addLocaleRun_48 pl_addLocaleRun_INTERNAL_API_DO_NOT_USE
# define pl_addValueRun_48 pl_addValueRun_INTERNAL_API_DO_NOT_USE
# define pl_closeFontRuns_48 pl_closeFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_closeLine_48 pl_closeLine_INTERNAL_API_DO_NOT_USE
# define pl_closeLocaleRuns_48 pl_closeLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_closeValueRuns_48 pl_closeValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_close_48 pl_close_INTERNAL_API_DO_NOT_USE
# define pl_countLineRuns_48 pl_countLineRuns_INTERNAL_API_DO_NOT_USE
# define pl_getAscent_48 pl_getAscent_INTERNAL_API_DO_NOT_USE
# define pl_getDescent_48 pl_getDescent_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunCount_48 pl_getFontRunCount_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunFont_48 pl_getFontRunFont_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunLastLimit_48 pl_getFontRunLastLimit_INTERNAL_API_DO_NOT_USE
# define pl_getFontRunLimit_48 pl_getFontRunLimit_INTERNAL_API_DO_NOT_USE
# define pl_getLeading_48 pl_getLeading_INTERNAL_API_DO_NOT_USE
# define pl_getLineAscent_48 pl_getLineAscent_INTERNAL_API_DO_NOT_USE
# define pl_getLineDescent_48 pl_getLineDescent_INTERNAL_API_DO_NOT_USE
# define pl_getLineLeading_48 pl_getLineLeading_INTERNAL_API_DO_NOT_USE
# define pl_getLineVisualRun_48 pl_getLineVisualRun_INTERNAL_API_DO_NOT_USE
# define pl_getLineWidth_48 pl_getLineWidth_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunCount_48 pl_getLocaleRunCount_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunLastLimit_48 pl_getLocaleRunLastLimit_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunLimit_48 pl_getLocaleRunLimit_INTERNAL_API_DO_NOT_USE
# define pl_getLocaleRunLocale_48 pl_getLocaleRunLocale_INTERNAL_API_DO_NOT_USE
# define pl_getParagraphLevel_48 pl_getParagraphLevel_INTERNAL_API_DO_NOT_USE
# define pl_getTextDirection_48 pl_getTextDirection_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunCount_48 pl_getValueRunCount_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunLastLimit_48 pl_getValueRunLastLimit_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunLimit_48 pl_getValueRunLimit_INTERNAL_API_DO_NOT_USE
# define pl_getValueRunValue_48 pl_getValueRunValue_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunAscent_48 pl_getVisualRunAscent_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunDescent_48 pl_getVisualRunDescent_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunDirection_48 pl_getVisualRunDirection_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunFont_48 pl_getVisualRunFont_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunGlyphCount_48 pl_getVisualRunGlyphCount_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunGlyphToCharMap_48 pl_getVisualRunGlyphToCharMap_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunGlyphs_48 pl_getVisualRunGlyphs_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunLeading_48 pl_getVisualRunLeading_INTERNAL_API_DO_NOT_USE
# define pl_getVisualRunPositions_48 pl_getVisualRunPositions_INTERNAL_API_DO_NOT_USE
# define pl_line_48 pl_line_INTERNAL_API_DO_NOT_USE
# define pl_nextLine_48 pl_nextLine_INTERNAL_API_DO_NOT_USE
# define pl_openEmptyFontRuns_48 pl_openEmptyFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_openEmptyLocaleRuns_48 pl_openEmptyLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_openEmptyValueRuns_48 pl_openEmptyValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_openFontRuns_48 pl_openFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_openLocaleRuns_48 pl_openLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_openValueRuns_48 pl_openValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_paragraph_48 pl_paragraph_INTERNAL_API_DO_NOT_USE
# define pl_reflow_48 pl_reflow_INTERNAL_API_DO_NOT_USE
# define pl_resetFontRuns_48 pl_resetFontRuns_INTERNAL_API_DO_NOT_USE
# define pl_resetLocaleRuns_48 pl_resetLocaleRuns_INTERNAL_API_DO_NOT_USE
# define pl_resetValueRuns_48 pl_resetValueRuns_INTERNAL_API_DO_NOT_USE
# define pl_visualRun_48 pl_visualRun_INTERNAL_API_DO_NOT_USE
# define ucd_close_48 ucd_close_INTERNAL_API_DO_NOT_USE
# define ucd_flushCache_48 ucd_flushCache_INTERNAL_API_DO_NOT_USE
# define ucd_freeCache_48 ucd_freeCache_INTERNAL_API_DO_NOT_USE
# define ucd_getCollator_48 ucd_getCollator_INTERNAL_API_DO_NOT_USE
# define ucd_open_48 ucd_open_INTERNAL_API_DO_NOT_USE
# define ucol_equals_48 ucol_equals_INTERNAL_API_DO_NOT_USE
# define ucol_forceHanImplicit_48 ucol_forceHanImplicit_INTERNAL_API_DO_NOT_USE
# define ucol_forgetUCA_48 ucol_forgetUCA_INTERNAL_API_DO_NOT_USE
# define ucol_getAttributeOrDefault_48 ucol_getAttributeOrDefault_INTERNAL_API_DO_NOT_USE
# define ucol_getUnsafeSet_48 ucol_getUnsafeSet_INTERNAL_API_DO_NOT_USE
# define ucol_nextProcessed_48 ucol_nextProcessed_INTERNAL_API_DO_NOT_USE
# define ucol_previousProcessed_48 ucol_previousProcessed_INTERNAL_API_DO_NOT_USE
# define udat_applyPatternRelative_48 udat_applyPatternRelative_INTERNAL_API_DO_NOT_USE
# define udat_toPatternRelativeDate_48 udat_toPatternRelativeDate_INTERNAL_API_DO_NOT_USE
# define udat_toPatternRelativeTime_48 udat_toPatternRelativeTime_INTERNAL_API_DO_NOT_USE
# define uplug_getConfiguration_48 uplug_getConfiguration_INTERNAL_API_DO_NOT_USE
# define uplug_getContext_48 uplug_getContext_INTERNAL_API_DO_NOT_USE
# define uplug_getCurrentLevel_48 uplug_getCurrentLevel_INTERNAL_API_DO_NOT_USE
# define uplug_getLibraryName_48 uplug_getLibraryName_INTERNAL_API_DO_NOT_USE
# define uplug_getLibrary_48 uplug_getLibrary_INTERNAL_API_DO_NOT_USE
# define uplug_getPlugLevel_48 uplug_getPlugLevel_INTERNAL_API_DO_NOT_USE
# define uplug_getPlugLoadStatus_48 uplug_getPlugLoadStatus_INTERNAL_API_DO_NOT_USE
# define uplug_getPlugName_48 uplug_getPlugName_INTERNAL_API_DO_NOT_USE
# define uplug_getSymbolName_48 uplug_getSymbolName_INTERNAL_API_DO_NOT_USE
# define uplug_loadPlugFromEntrypoint_48 uplug_loadPlugFromEntrypoint_INTERNAL_API_DO_NOT_USE
# define uplug_loadPlugFromLibrary_48 uplug_loadPlugFromLibrary_INTERNAL_API_DO_NOT_USE
# define uplug_nextPlug_48 uplug_nextPlug_INTERNAL_API_DO_NOT_USE
# define uplug_removePlug_48 uplug_removePlug_INTERNAL_API_DO_NOT_USE
# define uplug_setContext_48 uplug_setContext_INTERNAL_API_DO_NOT_USE
# define uplug_setPlugLevel_48 uplug_setPlugLevel_INTERNAL_API_DO_NOT_USE
# define uplug_setPlugName_48 uplug_setPlugName_INTERNAL_API_DO_NOT_USE
# define uplug_setPlugNoUnload_48 uplug_setPlugNoUnload_INTERNAL_API_DO_NOT_USE
# define uprv_getDefaultCodepage_48 uprv_getDefaultCodepage_INTERNAL_API_DO_NOT_USE
# define uprv_getDefaultLocaleID_48 uprv_getDefaultLocaleID_INTERNAL_API_DO_NOT_USE
# define ures_openFillIn_48 ures_openFillIn_INTERNAL_API_DO_NOT_USE
# define usearch_searchBackwards_48 usearch_searchBackwards_INTERNAL_API_DO_NOT_USE
# define usearch_search_48 usearch_search_INTERNAL_API_DO_NOT_USE
# define utf8_appendCharSafeBody_48 utf8_appendCharSafeBody_INTERNAL_API_DO_NOT_USE
# define utf8_back1SafeBody_48 utf8_back1SafeBody_INTERNAL_API_DO_NOT_USE
# define utf8_countTrailBytes_48 utf8_countTrailBytes_INTERNAL_API_DO_NOT_USE
# define utf8_nextCharSafeBody_48 utf8_nextCharSafeBody_INTERNAL_API_DO_NOT_USE
# define utf8_prevCharSafeBody_48 utf8_prevCharSafeBody_INTERNAL_API_DO_NOT_USE
# endif /* U_DISABLE_RENAMING */
#endif /* U_HIDE_INTERNAL_API */
#endif /* UINTRNAL_H */

13
icu4c/source/common/unicode/uloc.h
View File

@ -286,12 +286,14 @@
*/
#define ULOC_KEYWORD_SEPARATOR '@'
#ifndef U_HIDE_DRAFT_API
/**
* Unicode code point for '@' separating keywords from the locale string.
* @see ULOC_KEYWORD_SEPARATOR
* @draft ICU 4.6
*/
#define ULOC_KEYWORD_SEPARATOR_UNICODE 0x40
#endif /* U_HIDE_DRAFT_API */
/**
* Invariant character for assigning value to a keyword
@ -299,12 +301,14 @@
*/
#define ULOC_KEYWORD_ASSIGN '='
#ifndef U_HIDE_DRAFT_API
/**
* Unicode code point for '=' for assigning value to a keyword.
* @see ULOC_KEYWORD_ASSIGN
* @draft ICU 4.6
*/
#define ULOC_KEYWORD_ASSIGN_UNICODE 0x3D
#endif /* U_HIDE_DRAFT_API */
/**
* Invariant character separating keywords
@ -312,12 +316,14 @@
*/
#define ULOC_KEYWORD_ITEM_SEPARATOR ';'
#ifndef U_HIDE_DRAFT_API
/**
* Unicode code point for ';' separating keywords
* @see ULOC_KEYWORD_ITEM_SEPARATOR
* @draft ICU 4.6
*/
#define ULOC_KEYWORD_ITEM_SEPARATOR_UNICODE 0x3B
#endif /* U_HIDE_DRAFT_API */
/**
* Constants for *_getLocale()
@ -353,7 +359,6 @@ typedef enum {
ULOC_DATA_LOCALE_TYPE_LIMIT = 3
} ULocDataLocaleType ;
/**
* Gets ICU's default locale.
* The returned string is a snapshot in time, and will remain valid
@ -1065,7 +1070,8 @@ uloc_minimizeSubtags(const char* localeID,
int32_t minimizedLocaleIDCapacity,
UErrorCode* err);
/**
#ifndef U_HIDE_DRAFT_API
/**
* Returns a locale ID for the specified BCP47 language tag string.
* If the specified language tag contains any ill-formed subtags,
* the first such subtag and all following subtags are ignored.
@ -1095,7 +1101,7 @@ uloc_forLanguageTag(const char* langtag,
int32_t* parsedLength,
UErrorCode* err);
/**
/**
* Returns a well-formed language tag for this locale ID.
* <p>
* <b>Note</b>: When <code>strict</code> is FALSE, any locale
@ -1122,5 +1128,6 @@ uloc_toLanguageTag(const char* localeID,
int32_t langtagCapacity,
UBool strict,
UErrorCode* err);
#endif /* U_HIDE_DRAFT_API */
#endif /*_ULOC*/

4
icu4c/source/common/unicode/uniset.h
View File

@ -377,6 +377,7 @@ public:
UnicodeSet(const UnicodeString& pattern,
UErrorCode& status);
#ifndef U_HIDE_INTERNAL_API
/**
* Constructs a set from the given pattern. See the class
* description for the syntax of the pattern language.
@ -393,6 +394,7 @@ public:
uint32_t options,
const SymbolTable* symbols,
UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Constructs a set from the given pattern. See the class description
@ -589,6 +591,7 @@ public:
UnicodeSet& applyPattern(const UnicodeString& pattern,
UErrorCode& status);
#ifndef U_HIDE_INTERNAL_API
/**
* Modifies this set to represent the set specified by the given
* pattern, optionally ignoring Unicode Pattern_White_Space characters.
@ -609,6 +612,7 @@ public:
uint32_t options,
const SymbolTable* symbols,
UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Parses the given pattern, starting at the given position. The

2
icu4c/source/common/unicode/unorm2.h
View File

@ -259,6 +259,7 @@ unorm2_append(const UNormalizer2 *norm2,
const UChar *second, int32_t secondLength,
UErrorCode *pErrorCode);
#ifndef U_HIDE_DRAFT_API
/**
* Gets the decomposition mapping of c. Equivalent to unorm2_normalize(string(c))
* on a UNORM2_DECOMPOSE UNormalizer2 instance, but much faster.
@ -291,6 +292,7 @@ unorm2_getDecomposition(const UNormalizer2 *norm2,
*/
U_DRAFT uint8_t U_EXPORT2
unorm2_getCombiningClass(const UNormalizer2 *norm2, UChar32 c);
#endif /* U_HIDE_DRAFT_API */
/**
* Tests if the string is normalized.

3
icu4c/source/common/unicode/uobject.h
View File

@ -301,6 +301,7 @@ protected:
// UBool instanceOf(UClassID type) const;
};
#ifndef U_HIDE_INTERNAL_API
/**
* This is a simple macro to add ICU RTTI to an ICU object implementation.
* This does not go into the header. This should only be used in *.cpp files.
@ -359,7 +360,7 @@ protected:
return myClass::getStaticClassID(); \
}
*/
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_END

32
icu4c/source/common/unicode/uobslete.h
View File

@ -1,32 +0,0 @@
/*
*******************************************************************************
* Copyright (C) 2004-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
* file name: uobslete.h
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* Created by: genheaders.pl, a perl script written by Ram Viswanadha
*
* Contains data for commenting out APIs.
* Gets included by umachine.h
*
* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHAT
* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
*/
#ifndef UOBSLETE_H
#define UOBSLETE_H
#ifdef U_HIDE_OBSOLETE_API
# if U_DISABLE_RENAMING
# else
# endif /* U_DISABLE_RENAMING */
#endif /* U_HIDE_OBSOLETE_API */
#endif /* UOBSLETE_H */

11
icu4c/source/common/unicode/ures.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1997-2010, International Business Machines
* Copyright (C) 1997-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*
@ -208,6 +208,7 @@ ures_openU(const UChar* packageName,
const char* locale,
UErrorCode* status);
#ifndef U_HIDE_DEPRECATED_API
/**
* Returns the number of strings/arrays in resource bundles.
* Better to use ures_getSize, as this function will be deprecated.
@ -228,6 +229,7 @@ U_DEPRECATED int32_t U_EXPORT2
ures_countArrayItems(const UResourceBundle* resourceBundle,
const char* resourceKey,
UErrorCode* err);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Close a resource bundle, all pointers returned from the various ures_getXXX calls
* on this particular bundle should be considered invalid henceforth.
@ -258,6 +260,7 @@ U_NAMESPACE_END
#endif
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the version number associated with this ResourceBundle as a string. Please
* use ures_getVersion as this function is going to be deprecated.
@ -270,6 +273,7 @@ U_NAMESPACE_END
*/
U_DEPRECATED const char* U_EXPORT2
ures_getVersionNumber(const UResourceBundle* resourceBundle);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the version number associated with this ResourceBundle as an
@ -284,6 +288,7 @@ U_STABLE void U_EXPORT2
ures_getVersion(const UResourceBundle* resB,
UVersionInfo versionInfo);
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the name of the Locale associated with this ResourceBundle. This API allows
* you to query for the real locale of the resource. For example, if you requested
@ -299,7 +304,7 @@ ures_getVersion(const UResourceBundle* resB,
U_DEPRECATED const char* U_EXPORT2
ures_getLocale(const UResourceBundle* resourceBundle,
UErrorCode* status);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the name of the Locale associated with this ResourceBundle.
@ -319,6 +324,7 @@ ures_getLocaleByType(const UResourceBundle* resourceBundle,
UErrorCode* status);
#ifndef U_HIDE_INTERNAL_API
/**
* Same as ures_open() but uses the fill-in parameter instead of allocating
* a bundle, if r!=NULL.
@ -340,6 +346,7 @@ ures_openFillIn(UResourceBundle *r,
const char* packageName,
const char* localeID,
UErrorCode* status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Returns a string from a string resource type

2
icu4c/source/common/unicode/uscript.h
View File

@ -442,6 +442,7 @@ uscript_getShortName(UScriptCode scriptCode);
U_STABLE UScriptCode U_EXPORT2
uscript_getScript(UChar32 codepoint, UErrorCode *err);
#ifndef U_HIDE_DRAFT_API
/**
* Is code point c used in script sc?
* That is, does code point c have the Script property value sc,
@ -488,5 +489,6 @@ U_DRAFT int32_t U_EXPORT2
uscript_getScriptExtensions(UChar32 c,
UScriptCode *scripts, int32_t capacity,
UErrorCode *errorCode);
#endif /* U_HIDE_DRAFT_API */
#endif

4
icu4c/source/common/unicode/uset.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2002-2010, International Business Machines
* Copyright (C) 2002-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -91,11 +91,13 @@ enum {
*/
USET_ADD_CASE_MAPPINGS = 4,
#ifndef U_HIDE_INTERNAL_API
/**
* Enough for any single-code point set
* @internal
*/
USET_SERIALIZED_STATIC_ARRAY_CAPACITY=8
#endif /* U_HIDE_INTERNAL_API */
};
/**

2
icu4c/source/common/unicode/ushape.h
View File

@ -451,6 +451,7 @@ u_shapeArabic(const UChar *source, int32_t sourceLength,
*/
#define U_SHAPE_SPACES_RELATIVE_TO_TEXT_MASK 0x4000000
#ifndef U_HIDE_DRAFT_API
/**
* If this option is used, shaping will use the new Unicode code point for TAIL (i.e. 0xFE73).
* If this option is not specified (Default), old unofficial Unicode TAIL code point is used (i.e. 0x200B)
@ -470,5 +471,6 @@ u_shapeArabic(const UChar *source, int32_t sourceLength,
* @draft ICU 4.8
*/
#define U_SHAPE_TAIL_TYPE_MASK 0x8000000
#endif /* U_HIDE_DRAFT_API */
#endif

3
icu4c/source/common/unicode/ustringtrie.h
View File

@ -22,6 +22,8 @@
#include "unicode/utypes.h"
#ifndef U_HIDE_DRAFT_API
/**
* Return values for BytesTrie::next(), UCharsTrie::next() and similar methods.
* @see USTRINGTRIE_MATCHES
@ -91,4 +93,5 @@ enum UStringTrieResult {
*/
#define USTRINGTRIE_HAS_NEXT(result) ((result)&1)
#endif /* U_HIDE_DRAFT_API */
#endif /* __USTRINGTRIE_H__ */

46
icu4c/source/common/unicode/usystem.h
View File

@ -1,46 +0,0 @@
/*
*******************************************************************************
* Copyright (C) 2004-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
* file name: usystem.h
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* Created by: genheaders.pl, a perl script written by Ram Viswanadha
*
* Contains data for commenting out APIs.
* Gets included by umachine.h
*
* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHAT
* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
*/
#ifndef USYSTEM_H
#define USYSTEM_H
#ifdef U_HIDE_SYSTEM_API
# if U_DISABLE_RENAMING
# define u_cleanup u_cleanup_SYSTEM_API_DO_NOT_USE
# define u_setAtomicIncDecFunctions u_setAtomicIncDecFunctions_SYSTEM_API_DO_NOT_USE
# define u_setMemoryFunctions u_setMemoryFunctions_SYSTEM_API_DO_NOT_USE
# define u_setMutexFunctions u_setMutexFunctions_SYSTEM_API_DO_NOT_USE
# define ucnv_setDefaultName ucnv_setDefaultName_SYSTEM_API_DO_NOT_USE
# define uloc_getDefault uloc_getDefault_SYSTEM_API_DO_NOT_USE
# define uloc_setDefault uloc_setDefault_SYSTEM_API_DO_NOT_USE
# else
# define u_cleanup_48 u_cleanup_SYSTEM_API_DO_NOT_USE
# define u_setAtomicIncDecFunctions_48 u_setAtomicIncDecFunctions_SYSTEM_API_DO_NOT_USE
# define u_setMemoryFunctions_48 u_setMemoryFunctions_SYSTEM_API_DO_NOT_USE
# define u_setMutexFunctions_48 u_setMutexFunctions_SYSTEM_API_DO_NOT_USE
# define ucnv_setDefaultName_48 ucnv_setDefaultName_SYSTEM_API_DO_NOT_USE
# define uloc_getDefault_48 uloc_getDefault_SYSTEM_API_DO_NOT_USE
# define uloc_setDefault_48 uloc_setDefault_SYSTEM_API_DO_NOT_USE
# endif /* U_DISABLE_RENAMING */
#endif /* U_HIDE_SYSTEM_API */
#endif /* USYSTEM_H */

6
icu4c/source/common/unicode/utext.h
View File

@ -675,6 +675,7 @@ utext_extract(UText *ut,
UErrorCode *status);
#ifndef U_HIDE_INTERNAL_API
/**
* Compare two UTexts (binary order). The comparison begins at each source text's
* iteration position. The iteration position of each UText will be left following
@ -815,6 +816,7 @@ U_INTERNAL int32_t U_EXPORT2
utext_caseCompareNativeLimit(UText *s1, int64_t limit1,
UText *s2, int64_t limit2,
uint32_t options, UErrorCode *pErrorCode);
#endif /* U_HIDE_INTERNAL_API */
/************************************************************************************
@ -832,6 +834,7 @@ utext_caseCompareNativeLimit(UText *s1, int64_t limit1,
*
************************************************************************************/
#ifndef U_HIDE_INTERNAL_API
/**
* inline version of utext_current32(), for performance-critical situations.
*
@ -844,6 +847,7 @@ utext_caseCompareNativeLimit(UText *s1, int64_t limit1,
#define UTEXT_CURRENT32(ut) \
((ut)->chunkOffset < (ut)->chunkLength && ((ut)->chunkContents)[(ut)->chunkOffset]<0xd800 ? \
((ut)->chunkContents)[((ut)->chunkOffset)] : utext_current32(ut))
#endif /* U_HIDE_INTERNAL_API */
/**
* inline version of utext_next32(), for performance-critical situations.
@ -1692,6 +1696,7 @@ struct UText {
U_STABLE UText * U_EXPORT2
utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status);
#ifndef U_HIDE_INTERNAL_API
/**
* @internal
* Value used to help identify correctly initialized UText structs.
@ -1700,6 +1705,7 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status);
enum {
UTEXT_MAGIC = 0x345ad82c
};
#endif /* U_HIDE_INTERNAL_API */
/**
* initializer to be used with local (stack) instances of a UText

26
icu4c/source/common/unicode/utypes.h
View File

@ -85,26 +85,6 @@
#define U_HIDE_INTERNAL_API 1
#endif
#ifdef U_HIDE_DRAFT_API
#include "unicode/udraft.h"
#endif
#ifdef U_HIDE_DEPRECATED_API
#include "unicode/udeprctd.h"
#endif
#ifdef U_HIDE_DEPRECATED_API
#include "unicode/uobslete.h"
#endif
#ifdef U_HIDE_INTERNAL_API
#include "unicode/uintrnal.h"
#endif
#ifdef U_HIDE_SYSTEM_API
#include "unicode/usystem.h"
#endif
/** @} */
/*===========================================================================*/
@ -155,8 +135,10 @@
* @stable ICU 2.0
*/
#define U_ICUDATA_NAME "icudt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER /**< @internal */
#ifndef U_HIDE_INTERNAL_API
#define U_USRDATA_NAME "usrdt" U_ICU_VERSION_SHORT U_ICUDATA_TYPE_LETTER /**< @internal */
#define U_USE_USRDATA 1 /**< @internal */
#endif /* U_HIDE_INTERNAL_API */
/**
* U_ICU_ENTRY_POINT is the name of the DLL entry point to the ICU data library.
@ -171,6 +153,7 @@
*/
#define U_ICUDATA_ENTRY_POINT U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM)
#ifndef U_HIDE_INTERNAL_API
/**
* Do not use.
* @internal
@ -184,6 +167,7 @@
/* affected by symbol renaming. See platform.h */
#define U_DEF_ICUDATA_ENTRY_POINT(major) icudt##major##_dat
#endif
#endif /* U_HIDE_INTERNAL_API */
/**
* \def NULL
@ -220,6 +204,7 @@ typedef double UDate;
/** The number of milliseconds per day @stable ICU 2.0 */
#define U_MILLIS_PER_DAY (86400000)
#ifndef U_HIDE_DRAFT_API
/**
* Maximum UDate value
* @draft ICU 4.8
@ -231,6 +216,7 @@ typedef double UDate;
* @draft ICU 4.8
*/
#define U_DATE_MIN -U_DATE_MAX
#endif /* U_HIDE_DRAFT_API */
/*===========================================================================*/
/* Shared library/DLL import-export API control */

2
icu4c/source/common/unicode/uvernum.h
View File

@ -99,10 +99,12 @@
*/
#define U_ICU_VERSION_SHORT "49"
#ifndef U_HIDE_INTERNAL_API
/** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only
**/
#define U_ICU_DATA_VERSION "49.0.1"
#endif /* U_HIDE_INTERNAL_API */
/*===========================================================================
* ICU collation framework version information

66
icu4c/source/i18n/unicode/alphaindex.h
View File

@ -19,6 +19,7 @@
* \brief C++ API: Index Characters
*/
#ifndef U_HIDE_DRAFT_API
U_CDECL_BEGIN
@ -29,37 +30,37 @@ U_CDECL_BEGIN
* @draft ICU 4.8
*/
typedef enum UAlphabeticIndexLabelType {
/**
* Normal Label, typically the starting letter of the names
* in the bucket with this label.
* @draft ICU 4.8
*/
U_ALPHAINDEX_NORMAL = 0,
/**
* Normal Label, typically the starting letter of the names
* in the bucket with this label.
* @draft ICU 4.8
*/
U_ALPHAINDEX_NORMAL = 0,
/**
* Undeflow Label. The bucket with this label contains names
* in scripts that sort before any of the bucket labels in this index.
* @draft ICU 4.8
*/
U_ALPHAINDEX_UNDERFLOW = 1,
/**
* Undeflow Label. The bucket with this label contains names
* in scripts that sort before any of the bucket labels in this index.
* @draft ICU 4.8
*/
U_ALPHAINDEX_UNDERFLOW = 1,
/**
* Inflow Label. The bucket with this label contains names
* in scripts that sort between two of the bucket labels in this index.
* Inflow labels are created when an index contains normal labels for
* multiple scripts, and skips other scripts that sort between some of the
* included scripts.
* @draft ICU 4.8
*/
U_ALPHAINDEX_INFLOW = 2,
/**
* Inflow Label. The bucket with this label contains names
* in scripts that sort between two of the bucket labels in this index.
* Inflow labels are created when an index contains normal labels for
* multiple scripts, and skips other scripts that sort between some of the
* included scripts.
* @draft ICU 4.8
*/
U_ALPHAINDEX_INFLOW = 2,
/**
* Overflow Label. Te bucket with this label contains names in scripts
* that sort after all of the bucket labels in this index.
* @draft ICU 4.8
*/
U_ALPHAINDEX_OVERFLOW = 3
} UAlphabeticIndexLabelType;
/**
* Overflow Label. Te bucket with this label contains names in scripts
* that sort after all of the bucket labels in this index.
* @draft ICU 4.8
*/
U_ALPHAINDEX_OVERFLOW = 3
} UAlphabeticIndexLabelType;
struct UHashtable;
@ -546,12 +547,14 @@ private:
void initPinyinBounds(const Collator *coll, UErrorCode &status);
public:
#ifndef U_HIDE_INTERNAL_API
/**
* Delete all shared (static) data associated with an AlphabeticIndex.
* Internal function, not intended for direct use.
* @internal.
*/
static void staticCleanup();
#endif /* U_HIDE_INTERNAL_API */
private:
// Add index characters from the specified locale to the dest set.
@ -575,6 +578,7 @@ private:
// implementation code written in plain C. They are not intended for
// public use.
#ifndef U_HIDE_INTERNAL_API
/**
* A record, or item, in the index.
* @internal
@ -588,6 +592,7 @@ private:
Record(AlphabeticIndex *alphaIndex, const UnicodeString &name, const void *data);
~Record();
};
#endif /* U_HIDE_INTERNAL_API */
/**
* Holds all user records before they are distributed into buckets.
@ -615,6 +620,7 @@ private:
public:
#ifndef U_HIDE_INTERNAL_API
/**
* Language Types. For internal ICU use only.
* @internal
@ -633,6 +639,7 @@ private:
* @internal
*/
static ELangType langTypeFromLocale(const Locale &loc);
#endif /* U_HIDE_INTERNAL_API */
private:
@ -716,5 +723,6 @@ private:
};
U_NAMESPACE_END
#endif
#endif /* U_HIDE_DRAFT_API */
#endif

8
icu4c/source/i18n/unicode/basictz.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 2007-2008, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 2007-2011, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
#ifndef BASICTZ_H
@ -141,6 +141,7 @@ public:
AnnualTimeZoneRule*& std, AnnualTimeZoneRule*& dst, UErrorCode& status) /*const*/;
#ifndef U_HIDE_INTERNAL_API
/**
* The time type option bit flags used by getOffsetFromLocal
* @internal
@ -151,6 +152,7 @@ public:
kFormer = 0x04,
kLatter = 0x0C
};
#endif /* U_HIDE_INTERNAL_API */
/**
* Get time zone offsets from local wall time.
@ -161,6 +163,7 @@ public:
protected:
#ifndef U_HIDE_INTERNAL_API
/**
* The time type option bit masks used by getOffsetFromLocal
* @internal
@ -169,6 +172,7 @@ protected:
kStdDstMask = kDaylight,
kFormerLatterMask = kLatter
};
#endif /* U_HIDE_INTERNAL_API */
/**
* Default constructor.

8
icu4c/source/i18n/unicode/bms.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1996-2010, International Business Machines Corporation and Others.
* Copyright (C) 1996-2011, International Business Machines Corporation and Others.
* All rights reserved.
*/
@ -18,6 +18,8 @@
#include "unicode/ucol.h"
#ifndef U_HIDE_INTERNAL_API
/**
* A <code>UCD</code> object holds the Collator-specific data needed to
* compute the length of the shortest string that can
@ -31,6 +33,8 @@
* If you do not need to reuse any unreferenced objects in the cache, you can call
* <code>ucd_flushCCache</code>. If you no longer need any <code>UCD</code>
* objects, you can call <code>ucd_freeCache</code>
*
* @internal ICU 4.0.1 technology preview
*/
typedef void UCD;
@ -269,6 +273,8 @@ bms_search(BMS *bms, int32_t offset, int32_t *start, int32_t *end);
U_CAPI void U_EXPORT2
bms_setTargetString(BMS *bms, const UChar *target, int32_t targetLength, UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
#endif
#endif /* _BMS_H */

4
icu4c/source/i18n/unicode/bmsearch.h
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1996-2010, International Business Machines *
* Copyright (C) 1996-2011, International Business Machines *
* Corporation and others. All Rights Reserved. *
******************************************************************************
*/
@ -29,6 +29,7 @@ class BadCharacterTable;
class GoodSuffixTable;
class Target;
#ifndef U_HIDE_INTERNAL_API
/**
* BoyerMooreSearch
*
@ -219,6 +220,7 @@ private:
UnicodeString pattern;
Target *target;
};
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_END

47
icu4c/source/i18n/unicode/calendar.h
View File

@ -208,6 +208,7 @@ public:
#endif /* U_HIDE_DEPRECATED_API */
};
#ifndef U_HIDE_DEPRECATED_API
/**
* Useful constant for days of week. Note: Calendar day-of-week is 1-based. Clients
* who create locale resources for the field of first-day-of-week should be aware of
@ -215,7 +216,6 @@ public:
* @deprecated ICU 2.6. Use C enum UCalendarDaysOfWeek defined in ucal.h
*/
enum EDaysOfWeek {
#ifndef U_HIDE_DEPRECATED_API
SUNDAY = 1,
MONDAY,
TUESDAY,
@ -223,7 +223,6 @@ public:
THURSDAY,
FRIDAY,
SATURDAY
#endif /* U_HIDE_DEPRECATED_API */
};
/**
@ -231,7 +230,6 @@ public:
* @deprecated ICU 2.6. Use C enum UCalendarMonths defined in ucal.h
*/
enum EMonths {
#ifndef U_HIDE_DEPRECATED_API
JANUARY,
FEBRUARY,
MARCH,
@ -245,7 +243,6 @@ public:
NOVEMBER,
DECEMBER,
UNDECIMBER
#endif /* U_HIDE_DEPRECATED_API */
};
/**
@ -253,11 +250,10 @@ public:
* @deprecated ICU 2.6. Use C enum UCalendarAMPMs defined in ucal.h
*/
enum EAmpm {
#ifndef U_HIDE_DEPRECATED_API
AM,
PM
#endif /* U_HIDE_DEPRECATED_API */
};
#endif /* U_HIDE_DEPRECATED_API */
/**
* destructor
@ -540,6 +536,7 @@ public:
*/
virtual void add(UCalendarDateFields field, int32_t amount, UErrorCode& status);
#ifndef U_HIDE_DEPRECATED_API
/**
* Time Field Rolling function. Rolls (up/down) a single unit of time on the given
* time field. For example, to roll the current date up by one day, call
@ -564,6 +561,7 @@ public:
* @deprecated ICU 2.6. Use roll(UCalendarDateFields field, UBool up, UErrorCode& status) instead.
*/
inline void roll(EDateFields field, UBool up, UErrorCode& status);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Time Field Rolling function. Rolls (up/down) a single unit of time on the given
@ -823,6 +821,7 @@ public:
*/
UBool isLenient(void) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Sets what the first day of the week is; e.g., Sunday in US, Monday in France.
*
@ -830,6 +829,7 @@ public:
* @deprecated ICU 2.6. Use setFirstDayOfWeek(UCalendarDaysOfWeek value) instead.
*/
void setFirstDayOfWeek(EDaysOfWeek value);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Sets what the first day of the week is; e.g., Sunday in US, Monday in France.
@ -839,6 +839,7 @@ public:
*/
void setFirstDayOfWeek(UCalendarDaysOfWeek value);
#ifndef U_HIDE_DEPRECATED_API
/**
* Gets what the first day of the week is; e.g., Sunday in US, Monday in France.
*
@ -846,6 +847,7 @@ public:
* @deprecated ICU 2.6 use the overload with error code
*/
EDaysOfWeek getFirstDayOfWeek(void) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Gets what the first day of the week is; e.g., Sunday in US, Monday in France.
@ -958,6 +960,7 @@ public:
*/
virtual int32_t getLeastMaximum(UCalendarDateFields field) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the minimum value that this field could have, given the current date.
* For the Gregorian calendar, this is the same as getMinimum() and getGreatestMinimum().
@ -973,6 +976,7 @@ public:
* @deprecated ICU 2.6. Use getActualMinimum(UCalendarDateFields field, UErrorCode& status) instead.
*/
int32_t getActualMinimum(EDateFields field, UErrorCode& status) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the minimum value that this field could have, given the current date.
@ -990,6 +994,7 @@ public:
*/
virtual int32_t getActualMinimum(UCalendarDateFields field, UErrorCode& status) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the maximum value that this field could have, given the current date.
* For example, with the date "Feb 3, 1997" and the DAY_OF_MONTH field, the actual
@ -1007,6 +1012,7 @@ public:
* @deprecated ICU 2.6. Use getActualMaximum(UCalendarDateFields field, UErrorCode& status) instead.
*/
int32_t getActualMaximum(EDateFields field, UErrorCode& status) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the maximum value that this field could have, given the current date.
@ -1026,6 +1032,7 @@ public:
*/
virtual int32_t getActualMaximum(UCalendarDateFields field, UErrorCode& status) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Gets the value for a given time field. Recalculate the current time field values
* if the time value has been changed by a call to setTime(). Return zero for unset
@ -1040,6 +1047,7 @@ public:
* @deprecated ICU 2.6. Use get(UCalendarDateFields field, UErrorCode& status) instead.
*/
int32_t get(EDateFields field, UErrorCode& status) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Gets the value for a given time field. Recalculate the current time field values
@ -1056,6 +1064,7 @@ public:
*/
int32_t get(UCalendarDateFields field, UErrorCode& status) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Determines if the given time field has a value set. This can affect in the
* resolving of time in Calendar. Unset fields have a value of zero, by definition.
@ -1065,6 +1074,7 @@ public:
* @deprecated ICU 2.6. Use isSet(UCalendarDateFields field) instead.
*/
UBool isSet(EDateFields field) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Determines if the given time field has a value set. This can affect in the
@ -1076,6 +1086,7 @@ public:
*/
UBool isSet(UCalendarDateFields field) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Sets the given time field with the given value.
*
@ -1084,6 +1095,7 @@ public:
* @deprecated ICU 2.6. Use set(UCalendarDateFields field, int32_t value) instead.
*/
void set(EDateFields field, int32_t value);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Sets the given time field with the given value.
@ -1143,6 +1155,7 @@ public:
*/
void clear(void);
#ifndef U_HIDE_DEPRECATED_API
/**
* Clears the value in the given time field, both making it unset and assigning it a
* value of zero. This field value will be determined during the next resolving of
@ -1152,6 +1165,7 @@ public:
* @deprecated ICU 2.6. Use clear(UCalendarDateFields field) instead.
*/
void clear(EDateFields field);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Clears the value in the given time field, both making it unset and assigning it a
@ -1349,6 +1363,7 @@ protected:
*/
void complete(UErrorCode& status);
#ifndef U_HIDE_DEPRECATED_API
/**
* Gets the value for a given time field. Subclasses can use this function to get
* field values without forcing recomputation of time.
@ -1358,7 +1373,9 @@ protected:
* @deprecated ICU 2.6. Use internalGet(UCalendarDateFields field) instead.
*/
inline int32_t internalGet(EDateFields field) const {return fFields[field];}
#endif /* U_HIDE_DEPRECATED_API */
#ifndef U_HIDE_INTERNAL_API
/**
* Gets the value for a given time field. Subclasses can use this function to get
* field values without forcing recomputation of time. If the field's stamp is UNSET,
@ -1380,7 +1397,9 @@ protected:
* @internal
*/
inline int32_t internalGet(UCalendarDateFields field) const {return fFields[field];}
#endif /* U_HIDE_INTERNAL_API */
#ifndef U_HIDE_DEPRECATED_API
/**
* Sets the value for a given time field. This is a fast internal method for
* subclasses. It does not affect the areFieldsInSync, isTimeSet, or areAllFieldsSet
@ -1391,6 +1410,7 @@ protected:
* @deprecated ICU 2.6. Use internalSet(UCalendarDateFields field, int32_t value) instead.
*/
void internalSet(EDateFields field, int32_t value);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Sets the value for a given time field. This is a fast internal method for
@ -1521,6 +1541,7 @@ protected:
*/
virtual int32_t handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t woy);
#ifndef U_HIDE_INTERNAL_API
/**
* Compute the Julian day from fields. Will determine whether to use
* the JULIAN_DAY field directly, or other fields.
@ -1621,6 +1642,7 @@ protected:
* @internal
*/
UCalendarDateFields resolveFields(const UFieldResolutionTable *precedenceTable);
#endif /* U_HIDE_INTERNAL_API */
/**
@ -1628,12 +1650,14 @@ protected:
*/
virtual const UFieldResolutionTable* getFieldResolutionTable() const;
#ifndef U_HIDE_INTERNAL_API
/**
* Return the field that is newer, either defaultField, or
* alternateField. If neither is newer or neither is set, return defaultField.
* @internal
*/
UCalendarDateFields newerField(UCalendarDateFields defaultField, UCalendarDateFields alternateField) const;
#endif /* U_HIDE_INTERNAL_API */
private:
@ -1755,6 +1779,7 @@ protected:
*/
virtual void handleComputeFields(int32_t julianDay, UErrorCode &status);
#ifndef U_HIDE_INTERNAL_API
/**
* Return the extended year on the Gregorian calendar as computed by
* <code>computeGregorianFields()</code>.
@ -1790,6 +1815,7 @@ protected:
int32_t getGregorianDayOfMonth() const {
return fGregorianDayOfMonth;
}
#endif /* U_HIDE_INTERNAL_API */
/**
* Called by computeJulianDay. Returns the default month (0-based) for the year,
@ -1891,6 +1917,7 @@ protected:
int32_t weekNumber(int32_t desiredDay, int32_t dayOfPeriod, int32_t dayOfWeek);
#ifndef U_HIDE_INTERNAL_API
/**
* Return the week number of a day, within a period. This may be the week number in
* a year, or the week number in a month. Usually this will be a value >= 1, but if
@ -1928,6 +1955,7 @@ protected:
* @internal
*/
int32_t getLocalDOW();
#endif /* U_HIDE_INTERNAL_API */
private:
@ -2101,6 +2129,7 @@ private:
void validateField(UCalendarDateFields field, int32_t min, int32_t max, UErrorCode& status);
protected:
#ifndef U_HIDE_INTERNAL_API
/**
* Convert a quasi Julian date to the day of the week. The Julian date used here is
* not a true Julian date, since it is measured from midnight, not noon. Return
@ -2111,6 +2140,7 @@ private:
* @internal
*/
static uint8_t julianDayToDayOfWeek(double julian);
#endif /* U_HIDE_INTERNAL_API */
private:
char validLocale[ULOC_FULLNAME_CAPACITY];
@ -2122,6 +2152,7 @@ private:
* INTERNAL FOR 2.6 -- Registration.
*/
#ifndef U_HIDE_INTERNAL_API
/**
* Return a StringEnumeration over the locales available at the time of the call,
* including registered locales.
@ -2151,6 +2182,7 @@ private:
* @internal
*/
static UBool unregister(URegistryKey key, UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Multiple Calendar Implementation
@ -2196,6 +2228,7 @@ private:
*/
Locale getLocale(ULocDataLocaleType type, UErrorCode &status) const;
#ifndef U_HIDE_INTERNAL_API
/** Get the locale for this calendar object. You can choose between valid and actual locale.
* @param type type of the locale we're looking for (valid or actual)
* @param status error code for the operation
@ -2203,7 +2236,7 @@ private:
* @internal
*/
const char* getLocaleID(ULocDataLocaleType type, UErrorCode &status) const;
#endif /* U_HIDE_INTERNAL_API */
};
// -------------------------------------

4
icu4c/source/i18n/unicode/coll.h
View File

@ -995,6 +995,7 @@ protected:
*/
Collator();
#ifndef U_HIDE_DEPRECATED_API
/**
* Constructor.
* Empty constructor, does not handle the arguments.
@ -1008,6 +1009,7 @@ protected:
*/
Collator(UCollationStrength collationStrength,
UNormalizationMode decompositionMode);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Copy constructor.
@ -1030,11 +1032,13 @@ protected:
public:
#if !UCONFIG_NO_SERVICE
#ifndef U_HIDE_INTERNAL_API
/**
* used only by ucol_open, not for public use
* @internal
*/
static UCollator* createUCollator(const char* loc, UErrorCode* status);
#endif /* U_HIDE_INTERNAL_API */
#endif
private:
/**

6
icu4c/source/i18n/unicode/colldata.h
View File

@ -1,6 +1,6 @@
/*
******************************************************************************
* Copyright (C) 1996-2010, International Business Machines *
* Copyright (C) 1996-2011, International Business Machines *
* Corporation and others. All Rights Reserved. *
******************************************************************************
*/
@ -23,6 +23,7 @@
U_NAMESPACE_BEGIN
#ifndef U_HIDE_INTERNAL_API
/**
* The size of the internal buffer for the Collator's short description string.
* @internal ICU 4.0.1 technology preview
@ -250,6 +251,7 @@ private:
static int32_t _histogram[101];
#endif
};
#endif /* U_HIDE_INTERNAL_API */
/*
* Forward references to internal classes.
@ -258,6 +260,7 @@ class StringToCEsMap;
class CEToStringsMap;
class CollDataCache;
#ifndef U_HIDE_INTERNAL_API
/**
* CollData
*
@ -445,6 +448,7 @@ private:
uint32_t jamoLimits[4];
};
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_END

2
icu4c/source/i18n/unicode/datefmt.h
View File

@ -683,6 +683,7 @@ private:
static DateFormat* U_EXPORT2 create(EStyle timeStyle, EStyle dateStyle, const Locale& inLocale);
public:
#ifndef U_HIDE_OBSOLETE_API
/**
* Field selector for FieldPosition for DateFormat fields.
* @obsolete ICU 3.4 use UDateFormatField instead, since this API will be
@ -735,6 +736,7 @@ public:
HOUR0_FIELD = UDAT_HOUR0_FIELD,
TIMEZONE_FIELD = UDAT_TIMEZONE_FIELD
};
#endif /* U_HIDE_OBSOLETE_API */
};
inline UnicodeString&

4
icu4c/source/i18n/unicode/dcfmtsym.h
View File

@ -263,6 +263,7 @@ public:
*/
Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;
#ifndef U_HIDE_DRAFT_API
/**
* Get pattern string for 'CurrencySpacing' that can be applied to
* currency format.
@ -295,6 +296,7 @@ public:
void setPatternForCurrencySpacing(UCurrencySpacing type,
UBool beforeCurrency,
const UnicodeString& pattern);
#endif /* U_HIDE_DRAFT_API */
/**
* ICU "poor man's RTTI", returns a UClassID for the actual class.
@ -333,6 +335,7 @@ private:
void setCurrencyForSymbols();
public:
#ifndef U_HIDE_INTERNAL_API
/**
* _Internal_ function - more efficient version of getSymbol,
* returning a const reference to one of the symbol strings.
@ -351,6 +354,7 @@ public:
* @internal
*/
inline const UChar* getCurrencyPattern(void) const;
#endif /* U_HIDE_INTERNAL_API */
private:
/**

6
icu4c/source/i18n/unicode/decimfmt.h
View File

@ -657,11 +657,13 @@ public:
towards zero if equidistant */
kRoundHalfUp, /**< Round towards the nearest integer, or
away from zero if equidistant */
#ifndef U_HIDE_DRAFT_API
/**
* Return U_FORMAT_INEXACT_ERROR if number does not format exactly.
* @draft ICU 4.8
*/
kRoundUnnecessary
kRoundUnnecessary
#endif /* U_HIDE_DRAFT_API */
};
/**
@ -729,6 +731,7 @@ public:
DecimalFormatSymbols* symbolsToAdopt,
UErrorCode& status);
#ifndef U_HIDE_INTERNAL_API
/**
* This API is for ICU use only.
* Create a DecimalFormat from the given pattern, symbols, and style.
@ -745,6 +748,7 @@ public:
DecimalFormatSymbols* symbolsToAdopt,
UNumberFormatStyle style,
UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Create a DecimalFormat from the given pattern and symbols.

4
icu4c/source/i18n/unicode/dtfmtsym.h
View File

@ -105,6 +105,7 @@ public:
DateFormatSymbols(const Locale& locale,
UErrorCode& status);
#ifndef U_HIDE_INTERNAL_API
/**
* Construct a DateFormatSymbols object by loading format data from
* resources for the default locale, in the default calendar (Gregorian).
@ -139,6 +140,7 @@ public:
DateFormatSymbols(const Locale& locale,
const char *type,
UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Copy constructor.
@ -396,6 +398,7 @@ public:
*/
void setAmPmStrings(const UnicodeString* ampms, int32_t count);
#ifndef U_HIDE_DEPRECATED_API
/**
* Gets timezone strings. These strings are stored in a 2-dimensional array.
* @param rowCount Output param to receive number of rows.
@ -404,6 +407,7 @@ public:
* @deprecated ICU 3.6
*/
const UnicodeString** getZoneStrings(int32_t& rowCount, int32_t& columnCount) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Sets timezone strings. These strings are stored in a 2-dimensional array.

6
icu4c/source/i18n/unicode/dtitvinf.h
View File

@ -150,6 +150,7 @@ U_NAMESPACE_BEGIN
class U_I18N_API DateIntervalInfo : public UObject {
public:
#ifndef U_HIDE_INTERNAL_API
/**
* Default constructor.
* It does not initialize any interval patterns except
@ -164,6 +165,7 @@ public:
* @internal ICU 4.0
*/
DateIntervalInfo(UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
@ -354,13 +356,15 @@ private:
kIPI_MAX_INDEX
};
public:
#ifndef U_HIDE_INTERNAL_API
/**
* Max index for stored interval patterns
* @internal ICU 4.4
*/
enum {
kMaxIntervalPatternIndex = kIPI_MAX_INDEX
kMaxIntervalPatternIndex = kIPI_MAX_INDEX
};
#endif /* U_HIDE_INTERNAL_API */
private:

8
icu4c/source/i18n/unicode/dtptngen.h
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2007-2010, International Business Machines Corporation and
* Copyright (C) 2007-2011, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -355,7 +355,8 @@ public:
* @stable ICU 3.8
*/
StringEnumeration* getBaseSkeletons(UErrorCode& status) const;
#ifndef U_HIDE_INTERNAL_API
/**
* Return a list of redundant patterns are those which if removed, make no
* difference in the resulting getBestPattern values. This method returns a
@ -369,7 +370,8 @@ public:
* @internal ICU 3.8
*/
StringEnumeration* getRedundants(UErrorCode& status);
#endif /* U_HIDE_INTERNAL_API */
/**
* The decimal value is used in formatting fractions of seconds. If the
* skeleton contains fractional seconds, then this is used with the

4
icu4c/source/i18n/unicode/fmtable.h
View File

@ -584,6 +584,7 @@ public:
*/
static UClassID U_EXPORT2 getStaticClassID();
#ifndef U_HIDE_DEPRECATED_API
/**
* Deprecated variant of getLong(UErrorCode&).
* @param status the error code
@ -591,7 +592,9 @@ public:
* @deprecated ICU 3.0 use getLong(UErrorCode&) instead
*/
inline int32_t getLong(UErrorCode* status) const;
#endif /* U_HIDE_DEPRECATED_API */
#ifndef U_HIDE_INTERNAL_API
/**
* Internal function, do not use.
* TODO: figure out how to make this be non-public.
@ -609,6 +612,7 @@ public:
* @internal
*/
void adoptDigitList(DigitList *dl);
#endif /* U_HIDE_INTERNAL_API */
private:
/**

4
icu4c/source/i18n/unicode/format.h
View File

@ -1,6 +1,6 @@
/*
********************************************************************************
* Copyright (C) 1997-2010, International Business Machines Corporation and others.
* Copyright (C) 1997-2011, International Business Machines Corporation and others.
* All Rights Reserved.
********************************************************************************
*
@ -248,6 +248,7 @@ public:
*/
Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;
#ifndef U_HIDE_INTERNAL_API
/** Get the locale for this format object. You can choose between valid and actual locale.
* @param type type of the locale we're looking for (valid or actual)
* @param status error code for the operation
@ -255,6 +256,7 @@ public:
* @internal
*/
const char* getLocaleID(ULocDataLocaleType type, UErrorCode &status) const;
#endif /* U_HIDE_INTERNAL_API */
protected:
/** @stable ICU 2.8 */

8
icu4c/source/i18n/unicode/gregocal.h
View File

@ -374,6 +374,7 @@ public:
*/
virtual void roll(UCalendarDateFields field, int32_t amount, UErrorCode& status);
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the minimum value that this field could have, given the current date.
* For the Gregorian calendar, this is the same as getMinimum() and getGreatestMinimum().
@ -392,6 +393,7 @@ public:
* @deprecated ICU 2.6. Use getActualMinimum(UCalendarDateFields field) instead. (Added to ICU 3.0 for signature consistency)
*/
int32_t getActualMinimum(EDateFields field, UErrorCode& status) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the minimum value that this field could have, given the current date.
@ -403,6 +405,7 @@ public:
*/
int32_t getActualMinimum(UCalendarDateFields field, UErrorCode &status) const;
#ifndef U_HIDE_DEPRECATED_API
/**
* Return the maximum value that this field could have, given the current date.
* For example, with the date "Feb 3, 1997" and the DAY_OF_MONTH field, the actual
@ -413,6 +416,7 @@ public:
* @deprecated ICU 2.6. Use getActualMaximum(UCalendarDateFields field) instead.
*/
int32_t getActualMaximum(EDateFields field) const;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Return the maximum value that this field could have, given the current date.
@ -544,7 +548,8 @@ public:
* @internal
*/
virtual int32_t monthLength(int32_t month, int32_t year) const;
#ifndef U_HIDE_INTERNAL_API
/**
* return the length of the given year.
* @param year the given year.
@ -568,6 +573,7 @@ public:
* @internal
*/
void pinDayOfMonth(void);
#endif /* U_HIDE_INTERNAL_API */
/**
* Return the day number with respect to the epoch. January 1, 1970 (Gregorian)

8
icu4c/source/i18n/unicode/msgfmt.h
View File

@ -317,6 +317,7 @@ class NumberFormat;
*/
class U_I18N_API MessageFormat : public Format {
public:
#ifndef U_HIDE_OBSOLETE_API
/**
* Enum type for kMaxFormat.
* @obsolete ICU 3.0. The 10-argument limit was removed as of ICU 2.6,
@ -330,6 +331,7 @@ public:
*/
kMaxFormat = 10
};
#endif /* U_HIDE_OBSOLETE_API */
/**
* Constructs a new MessageFormat using the given pattern and the
@ -464,6 +466,7 @@ public:
UParseError* parseError,
UErrorCode& status);
#ifndef U_HIDE_DRAFT_API
/**
* @return this instance's UMessagePatternApostropheMode.
* @draft ICU 4.8
@ -471,6 +474,7 @@ public:
UMessagePatternApostropheMode getApostropheMode() const {
return msgPattern.getApostropheMode();
}
#endif /* U_HIDE_DRAFT_API */
/**
* Returns a pattern that can be used to recreate this object.
@ -815,6 +819,7 @@ public:
UBool usesNamedArguments() const;
#ifndef U_HIDE_INTERNAL_API
/**
* This API is for ICU internal use only.
* Please do not use it.
@ -826,6 +831,7 @@ public:
* @internal
*/
int32_t getArgTypeCount() const;
#endif /* U_HIDE_INTERNAL_API */
/**
* Returns a unique class ID POLYMORPHICALLY. Pure virtual override.
@ -853,6 +859,7 @@ public:
*/
static UClassID U_EXPORT2 getStaticClassID(void);
#ifndef U_HIDE_INTERNAL_API
/**
* Compares two Format objects. This is used for constructing the hash
* tables.
@ -864,6 +871,7 @@ public:
* @internal
*/
static UBool equalFormats(const void* left, const void* right);
#endif /* U_HIDE_INTERNAL_API */
private:

3
icu4c/source/i18n/unicode/numfmt.h
View File

@ -639,6 +639,7 @@ public:
static NumberFormat* U_EXPORT2 createInstance(const Locale& inLocale,
UErrorCode&);
#ifndef U_HIDE_DRAFT_API
/**
* Creates the specified decimal format style of the desired locale.
* @param desiredLocale the given locale.
@ -650,7 +651,7 @@ public:
static NumberFormat* U_EXPORT2 createInstance(const Locale& desiredLocale,
UNumberFormatStyle style,
UErrorCode& errorCode);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns a currency format for the current default locale.

4
icu4c/source/i18n/unicode/numsys.h
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2010, International Business Machines Corporation and
* Copyright (C) 2010-2011, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*
@ -122,12 +122,14 @@ public:
*/
int32_t getRadix();
#ifndef U_HIDE_DRAFT_API
/**
* Returns the name of this numbering system if it was created using one of the predefined names
* known to ICU. Otherwise, returns NULL.
* @draft ICU 4.6
*/
const char * getName();
#endif /* U_HIDE_DRAFT_API */
/**
* Returns the description string of this numbering system, which is either

4
icu4c/source/i18n/unicode/plurrule.h
View File

@ -27,12 +27,14 @@
#include "unicode/format.h"
#ifndef U_HIDE_DRAFT_API
/**
* Value returned by PluralRules::getUniqueKeywordValue() when there is no
* unique value to return.
* @draft ICU 4.8
*/
#define UPLRULES_NO_UNIQUE_VALUE ((double)-0.00123456777)
#endif /* U_HIDE_DRAFT_API */
U_NAMESPACE_BEGIN
@ -233,6 +235,7 @@ public:
*/
StringEnumeration* getKeywords(UErrorCode& status) const;
#ifndef U_HIDE_DRAFT_API
/**
* Returns a unique value for this keyword if it exists, else the constant
* UPLRULES_NO_UNIQUE_VALUE.
@ -288,6 +291,7 @@ public:
int32_t getSamples(const UnicodeString &keyword,
double *dest, int32_t destCapacity,
UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns TRUE if the given keyword is defined in this

29
icu4c/source/i18n/unicode/regex.h
View File

@ -189,7 +189,7 @@ public:
UParseError &pe,
UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Compiles the regular expression in string form into a RegexPattern
* object. These compile methods, rather than the constructors, are the usual
@ -219,6 +219,7 @@ public:
static RegexPattern * U_EXPORT2 compile( UText *regex,
UParseError &pe,
UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* Compiles the regular expression in string form into a RegexPattern
@ -248,8 +249,8 @@ public:
uint32_t flags,
UParseError &pe,
UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Compiles the regular expression in string form into a RegexPattern
* object using the specified match mode flags. These compile methods,
@ -280,7 +281,7 @@ public:
uint32_t flags,
UParseError &pe,
UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* Compiles the regular expression in string form into a RegexPattern
@ -308,7 +309,7 @@ public:
uint32_t flags,
UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Compiles the regular expression in string form into a RegexPattern
* object using the specified match mode flags. These compile methods,
@ -336,7 +337,7 @@ public:
static RegexPattern * U_EXPORT2 compile( UText *regex,
uint32_t flags,
UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* Get the match mode flags that were used when compiling this pattern.
@ -417,7 +418,7 @@ public:
UParseError &pe,
UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Test whether a string matches a regular expression. This convenience function
* both compiles the regular expression and applies it in a single operation.
@ -436,7 +437,7 @@ public:
UText *input,
UParseError &pe,
UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns the regular expression from which this pattern was compiled. This method will work
@ -660,6 +661,7 @@ public:
*/
RegexMatcher(const UnicodeString &regexp, uint32_t flags, UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Construct a RegexMatcher for a regular expression.
* This is a convenience method that avoids the need to explicitly create
@ -676,7 +678,8 @@ public:
* @draft ICU 4.6
*/
RegexMatcher(UText *regexp, uint32_t flags, UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* Construct a RegexMatcher for a regular expression.
* This is a convenience method that avoids the need to explicitly create
@ -701,6 +704,7 @@ public:
RegexMatcher(const UnicodeString &regexp, const UnicodeString &input,
uint32_t flags, UErrorCode &status);
#ifndef U_HIDE_DRAFT_API
/**
* Construct a RegexMatcher for a regular expression.
* This is a convenience method that avoids the need to explicitly create
@ -724,6 +728,7 @@ public:
*/
RegexMatcher(UText *regexp, UText *input,
uint32_t flags, UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
private:
/**
@ -1712,14 +1717,14 @@ public:
const void *&context,
UErrorCode &status);
#ifndef U_HIDE_INTERNAL_API
/**
* setTrace Debug function, enable/disable tracing of the matching engine.
* For internal ICU development use only. DO NO USE!!!!
* @internal
*/
void setTrace(UBool state);
#endif /* U_HIDE_INTERNAL_API */
/**
* ICU "poor man's RTTI", returns a UClassID for this class.
@ -1748,8 +1753,10 @@ private:
friend class RegexPattern;
friend class RegexCImpl;
public:
#ifndef U_HIDE_INTERNAL_API
/** @internal */
void resetPreserveRegion(); // Reset matcher state, but preserve any region.
#endif /* U_HIDE_INTERNAL_API */
private:
//

5
icu4c/source/i18n/unicode/smpdtfmt.h
View File

@ -728,6 +728,7 @@ public:
*/
virtual void adoptCalendar(Calendar* calendarToAdopt);
#ifndef U_HIDE_INTERNAL_API
/**
* This is for ICU internal use only. Please do not use.
* Check whether the 'field' is smaller than all the fields covered in
@ -755,8 +756,6 @@ public:
static UBool isFieldUnitIgnored(const UnicodeString& pattern,
UCalendarDateFields field);
/**
* This is for ICU internal use only. Please do not use.
* Get the locale of this simple date formatter.
@ -766,7 +765,7 @@ public:
* @internal ICU 4.0
*/
const Locale& getSmpFmtLocale(void) const;
#endif /* U_HIDE_INTERNAL_API */
private:
friend class DateFormat;

2
icu4c/source/i18n/unicode/sortkey.h
View File

@ -29,6 +29,7 @@
*/
#if !UCONFIG_NO_COLLATION
#ifndef U_HIDE_DEPRECATED_API
#include "unicode/uobject.h"
#include "unicode/unistr.h"
@ -324,6 +325,7 @@ CollationKey::getByteArray(int32_t &count) const
U_NAMESPACE_END
#endif /* U_HIDE_DEPRECATED_API */
#endif /* #if !UCONFIG_NO_COLLATION */
#endif

5
icu4c/source/i18n/unicode/tblcoll.h
View File

@ -697,6 +697,7 @@ public:
int32_t reorderCodesLength,
UErrorCode& status) ;
#ifndef U_HIDE_DRAFT_API
/**
* Retrieves the reorder codes that are grouped with the given reorder code. Some reorder
* codes will be grouped and must reorder together.
@ -717,7 +718,7 @@ public:
int32_t* dest,
int32_t destCapacity,
UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
private:
@ -859,12 +860,14 @@ private:
void setUCollator(UCollator *collator);
public:
#ifndef U_HIDE_INTERNAL_API
/**
* Get UCollator data struct. Used only by StringSearch & intltest.
* @return UCollator data struct
* @internal
*/
const UCollator * getUCollator();
#endif /* U_HIDE_INTERNAL_API */
protected:
/**

12
icu4c/source/i18n/unicode/timezone.h
View File

@ -147,7 +147,7 @@ public:
*/
static TimeZone* U_EXPORT2 createTimeZone(const UnicodeString& ID);
#ifndef U_HIDE_DRAFT_API
/**
* Returns an enumeration over system time zone IDs with the given
* filter conditions.
@ -168,6 +168,7 @@ public:
const char* region,
const int32_t* rawOffset,
UErrorCode& ec);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns an enumeration over all recognized time zone IDs. (i.e.,
@ -272,6 +273,7 @@ public:
*/
static void U_EXPORT2 adoptDefault(TimeZone* zone);
#ifndef U_HIDE_SYSTEM_API
/**
* Same as adoptDefault(), except that the TimeZone object passed in is NOT adopted;
* the caller remains responsible for deleting it.
@ -280,6 +282,7 @@ public:
* @system
*/
static void U_EXPORT2 setDefault(const TimeZone& zone);
#endif /* U_HIDE_SYSTEM_API */
/**
* Returns the timezone data version currently used by ICU.
@ -663,7 +666,8 @@ public:
*/
virtual int32_t getDSTSavings() const;
/**
#ifndef U_HIDE_DRAFT_API
/**
* Gets the region code associated with the given
* system time zone ID. The region code is either ISO 3166
* 2-letter country code or UN M.49 3-digit area code.
@ -682,6 +686,7 @@ public:
*/
static int32_t U_EXPORT2 getRegion(const UnicodeString& id,
char *region, int32_t capacity, UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
protected:
@ -712,6 +717,7 @@ protected:
*/
TimeZone& operator=(const TimeZone& right);
#ifndef U_HIDE_INTERNAL_API
/**
* Utility function. For internally loading rule data.
* @param top Top resource bundle for tz data
@ -722,7 +728,7 @@ protected:
* @internal
*/
static UResourceBundle* loadRule(const UResourceBundle* top, const UnicodeString& ruleid, UResourceBundle* oldbundle, UErrorCode&status);
#endif /* U_HIDE_INTERNAL_API */
private:
friend class ZoneMeta;

4
icu4c/source/i18n/unicode/tmutfmt.h
View File

@ -75,7 +75,7 @@ class Hashtable;
* <P>
* @see TimeUnitAmount
* @see TimeUnitFormat
* @draft ICU 4.2
* @stable ICU 4.2
*/
class U_I18N_API TimeUnitFormat: public MeasureFormat {
public:
@ -93,11 +93,13 @@ public:
*/
TimeUnitFormat(const Locale& locale, UErrorCode& status);
#ifndef U_HIDE_DRAFT_API
/**
* Create TimeUnitFormat given locale and style.
* @draft ICU 4.8
*/
TimeUnitFormat(const Locale& locale, UTimeUnitFormatStyle style, UErrorCode& status);
#endif /* U_HIDE_DRAFT_API */
/**
* Copy constructor.

8
icu4c/source/i18n/unicode/translit.h
View File

@ -277,6 +277,7 @@ private:
void* pointer;
};
#ifndef U_HIDE_INTERNAL_API
/**
* Return a token containing an integer.
* @return a token containing an integer.
@ -290,6 +291,7 @@ private:
* @internal
*/
inline static Token pointerToken(void*);
#endif /* U_HIDE_INTERNAL_API */
/**
* A function that creates and returns a Transliterator. When
@ -1014,6 +1016,7 @@ public:
protected:
#ifndef U_HIDE_INTERNAL_API
/**
* @internal
* @param id the ID being registered
@ -1073,6 +1076,7 @@ protected:
static void _registerSpecialInverse(const UnicodeString& target,
const UnicodeString& inverseTarget,
UBool bidirectional);
#endif /* U_HIDE_INTERNAL_API */
public:
@ -1178,6 +1182,7 @@ public:
protected:
#ifndef U_HIDE_INTERNAL_API
/**
* Non-mutexed internal method
* @internal
@ -1220,6 +1225,7 @@ protected:
const UnicodeString& source,
const UnicodeString& target,
UnicodeString& result);
#endif /* U_HIDE_INTERNAL_API */
protected:
@ -1266,6 +1272,7 @@ private:
static UBool initializeRegistry(UErrorCode &status);
public:
#ifndef U_HIDE_OBSOLETE_API
/**
* Return the number of IDs currently registered with the system.
* To retrieve the actual IDs, call getAvailableID(i) with
@ -1288,6 +1295,7 @@ public:
* may become invalid if another thread calls unregister
*/
static const UnicodeString& U_EXPORT2 getAvailableID(int32_t index);
#endif /* U_HIDE_OBSOLETE_API */
};
inline int32_t Transliterator::getMaximumContextLength(void) const {

7
icu4c/source/i18n/unicode/ucal.h
View File

@ -140,11 +140,13 @@
* @stable ICU 2.0
*/
#ifndef U_HIDE_DRAFT_API
/**
* The time zone ID reserved for unknown time zone.
* @draft ICU 4.8
*/
#define UCAL_UNKNOWN_ZONE_ID "Etc/Unknown"
#endif /* U_HIDE_DRAFT_API */
/** A calendar.
* For usage in C programs.
@ -521,6 +523,7 @@ enum UCalendarAMPMs {
/** @stable ICU 2.0 */
typedef enum UCalendarAMPMs UCalendarAMPMs;
#ifndef U_HIDE_DRAFT_API
/**
* System time zone type constants used by filtering zones
* in ucal_openTimeZoneIDEnumeration.
@ -567,6 +570,7 @@ typedef enum USystemTimeZoneType USystemTimeZoneType;
U_DRAFT UEnumeration* U_EXPORT2
ucal_openTimeZoneIDEnumeration(USystemTimeZoneType zoneType, const char* region,
const int32_t* rawOffset, UErrorCode* ec);
#endif /* U_HIDE_DRAFT_API */
/**
* Create an enumeration over all time zones.
@ -1332,6 +1336,7 @@ ucal_getWeekendTransition(const UCalendar *cal, UCalendarDaysOfWeek dayOfWeek, U
U_STABLE UBool U_EXPORT2
ucal_isWeekend(const UCalendar *cal, UDate date, UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Return the difference between the target time and the time this calendar object is currently set to.
* If the target time is after the current calendar setting, the the returned value will be positive.
@ -1361,7 +1366,7 @@ ucal_getFieldDifference(UCalendar* cal,
UDate target,
UCalendarDateFields field,
UErrorCode* status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */

13
icu4c/source/i18n/unicode/ucol.h
View File

@ -133,7 +133,8 @@ typedef enum {
} UColAttributeValue;
/**
#ifndef U_HIDE_DRAFT_API
/**
* Enum containing the codes for reordering segments of the collation table that are not script
* codes. These reordering codes are to be used in conjunction with the script codes.
* @see ucol_getReorderCodes
@ -196,6 +197,7 @@ typedef enum {
*/
UCOL_REORDER_CODE_LIMIT = 0x1005
} UColReorderCode;
#endif /* U_HIDE_DRAFT_API */
/**
* Base letter represents a primary difference. Set comparison
@ -398,6 +400,7 @@ ucol_openFromShortString( const char *definition,
UParseError *parseError,
UErrorCode *status);
#ifndef U_HIDE_DEPRECATED_API
/**
* Get a set containing the contractions defined by the collator. The set includes
* both the UCA contractions and the contractions defined by the collator. This set
@ -415,6 +418,7 @@ U_DEPRECATED int32_t U_EXPORT2
ucol_getContractions( const UCollator *coll,
USet *conts,
UErrorCode *status);
#endif /* U_HIDE_DEPRECATED_API */
/**
* Get a set containing the expansions defined by the collator. The set includes
@ -586,6 +590,7 @@ U_STABLE void U_EXPORT2
ucol_setStrength(UCollator *coll,
UCollationStrength strength);
#ifndef U_HIDE_DRAFT_API
/**
* Retrieves the reordering codes for this collator.
* These reordering codes are a combination of UScript codes and UColReorderCode entries.
@ -663,6 +668,7 @@ ucol_getEquivalentReorderCodes(int32_t reorderCode,
int32_t* dest,
int32_t destCapacity,
UErrorCode *pErrorCode);
#endif /* U_HIDE_DRAFT_API */
/**
* Get the display name for a UCollator.
@ -1160,6 +1166,7 @@ ucol_safeClone(const UCollator *coll,
U_STABLE int32_t U_EXPORT2
ucol_getRulesEx(const UCollator *coll, UColRuleOption delta, UChar *buffer, int32_t bufferLen);
#ifndef U_HIDE_DEPRECATED_API
/**
* gets the locale name of the collator. If the collator
* is instantiated from the rules, then this function returns
@ -1176,7 +1183,7 @@ ucol_getRulesEx(const UCollator *coll, UColRuleOption delta, UChar *buffer, int3
*/
U_DEPRECATED const char * U_EXPORT2
ucol_getLocale(const UCollator *coll, ULocDataLocaleType type, UErrorCode *status);
#endif /* U_HIDE_DEPRECATED_API */
/**
* gets the locale name of the collator. If the collator
@ -1208,6 +1215,7 @@ ucol_getLocaleByType(const UCollator *coll, ULocDataLocaleType type, UErrorCode
U_STABLE USet * U_EXPORT2
ucol_getTailoredSet(const UCollator *coll, UErrorCode *status);
#ifndef U_HIDE_INTERNAL_API
/**
* Universal attribute getter that returns UCOL_DEFAULT if the value is default
* @param coll collator which attributes are to be changed
@ -1280,6 +1288,7 @@ ucol_prepareShortStringOpen( const char *definition,
UBool forceDefaults,
UParseError *parseError,
UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
/** Creates a binary image of a collator. This binary image can be stored and
* later used to instantiate a collator using ucol_openBinary.

10
icu4c/source/i18n/unicode/ucoleitr.h
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 2001-2009, International Business Machines
* Copyright (C) 2001-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
@ -27,13 +27,15 @@
*/
#define UCOL_NULLORDER ((int32_t)0xFFFFFFFF)
/**
#ifndef U_HIDE_INTERNAL_API
/**
* This indicates an error has occured during processing or there are no more CEs
* to be returned.
*
* @internal
*/
#define UCOL_PROCESSED_NULLORDER ((int64_t)U_INT64_MAX)
#endif /* U_HIDE_INTERNAL_API */
#include "unicode/ucol.h"
@ -153,6 +155,7 @@ ucol_closeElements(UCollationElements *elems);
U_STABLE void U_EXPORT2
ucol_reset(UCollationElements *elems);
#ifndef U_HIDE_INTERNAL_API
/**
* Set the collation elements to use implicit ordering for Han
* even if they've been tailored. This will also force Hangul
@ -166,6 +169,7 @@ ucol_reset(UCollationElements *elems);
*/
U_INTERNAL void U_EXPORT2
ucol_forceHanImplicit(UCollationElements *elems, UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Get the ordering priority of the next collation element in the text.
@ -198,6 +202,7 @@ ucol_next(UCollationElements *elems, UErrorCode *status);
U_STABLE int32_t U_EXPORT2
ucol_previous(UCollationElements *elems, UErrorCode *status);
#ifndef U_HIDE_INTERNAL_API
/**
* Get the processed ordering priority of the next collation element in the text.
* A single character may contain more than one collation element.
@ -236,6 +241,7 @@ ucol_nextProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, U
*/
U_INTERNAL int64_t U_EXPORT2
ucol_previousProcessed(UCollationElements *elems, int32_t *ixLow, int32_t *ixHigh, UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Get the maximum length of any expansion sequences that end with the

5
icu4c/source/i18n/unicode/ucurr.h
View File

@ -243,7 +243,8 @@ typedef enum UCurrCurrencyType {
U_STABLE UEnumeration * U_EXPORT2
ucurr_openISOCurrencies(uint32_t currType, UErrorCode *pErrorCode);
/**
#ifndef U_HIDE_DRAFT_API
/**
* Queries if the given ISO 4217 3-letter code is available on the specified date range.
*
* Note: For checking availability of a currency on a specific date, specify the date on both 'from' and 'to'
@ -274,7 +275,7 @@ ucurr_isAvailable(const UChar* isoCode,
UDate from,
UDate to,
UErrorCode* errorCode);
#endif /* U_HIDE_DRAFT_API */
/**
* Finds the number of valid currency codes for the

5
icu4c/source/i18n/unicode/udat.h
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1996-2010, International Business Machines
* Copyright (C) 1996-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@ -937,6 +937,7 @@ udat_getLocaleByType(const UDateFormat *fmt,
ULocDataLocaleType type,
UErrorCode* status);
#ifndef U_HIDE_INTERNAL_API
/**
* Extract the date pattern from a UDateFormat set for relative date formatting.
* The pattern will follow the pattern syntax rules.
@ -990,7 +991,7 @@ udat_applyPatternRelative(UDateFormat *format,
const UChar *timePattern,
int32_t timePatternLength,
UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
#endif /* #if !UCONFIG_NO_FORMATTING */

5
icu4c/source/i18n/unicode/udateintervalformat.h
View File

@ -11,11 +11,15 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/umisc.h"
#include "unicode/localpointer.h"
/**
* \file
* \brief C API: Format a date interval.
*
* A UDateIntervalFormat is used to format the range between two UDate values
* in a locale-sensitive way, using a skeleton that specifies the precision and
* completeness of the information to show. If the range smaller than the resolution
@ -173,6 +177,7 @@ udtitvfmt_format(const UDateIntervalFormat* formatter,
UFieldPosition* position,
UErrorCode* status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif

4
icu4c/source/i18n/unicode/udatpg.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2007-2010, International Business Machines
* Copyright (C) 2007-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -99,10 +99,12 @@ typedef enum UDateTimePatternMatchOptions {
UDATPG_MATCH_NO_OPTIONS = 0,
/** @stable ICU 4.4 */
UDATPG_MATCH_HOUR_FIELD_LENGTH = 1 << UDATPG_HOUR_FIELD,
#ifndef U_HIDE_INTERNAL_API
/** @internal ICU 4.4 */
UDATPG_MATCH_MINUTE_FIELD_LENGTH = 1 << UDATPG_MINUTE_FIELD,
/** @internal ICU 4.4 */
UDATPG_MATCH_SECOND_FIELD_LENGTH = 1 << UDATPG_SECOND_FIELD,
#endif /* U_HIDE_INTERNAL_API */
/** @stable ICU 4.4 */
UDATPG_MATCH_ALL_FIELDS_LENGTH = (1 << UDATPG_FIELD_COUNT) - 1
} UDateTimePatternMatchOptions;

2
icu4c/source/i18n/unicode/ulocdata.h
View File

@ -43,8 +43,10 @@ typedef enum ULocaleDataExemplarSetType {
ULOCDATA_ES_STANDARD=0,
/** Auxiliary set @stable ICU 3.4 */
ULOCDATA_ES_AUXILIARY=1,
#ifndef U_HIDE_DRAFT_API
/** Index Character set @draft ICU 4.8 */
ULOCDATA_ES_INDEX=2,
#endif /* U_HIDE_DRAFT_API */
/** One higher than the last valid type @stable ICU 3.4 */
ULOCDATA_ES_COUNT=3
} ULocaleDataExemplarSetType;

26
icu4c/source/i18n/unicode/unum.h
View File

@ -183,6 +183,7 @@ typedef enum UNumberFormatStyle {
* @stable ICU 3.0
*/
UNUM_PATTERN_RULEBASED,
#ifndef U_HIDE_DRAFT_API
/**
* Currency format with an ISO currency code, e.g., "USD1.00".
* @draft ICU 4.8
@ -199,6 +200,7 @@ typedef enum UNumberFormatStyle {
* @draft ICU 4.8
*/
UNUM_FORMAT_STYLE_COUNT,
#endif /* U_HIDE_DRAFT_API */
/**
* Default format
* @stable ICU 2.0
@ -219,23 +221,27 @@ typedef enum UNumberFormatRoundingMode {
UNUM_ROUND_FLOOR,
UNUM_ROUND_DOWN,
UNUM_ROUND_UP,
/**
* Half-even rounding
* @stable, ICU 3.8
*/
UNUM_ROUND_HALFEVEN,
#ifndef U_HIDE_DEPRECATED_API
/**
* Half-even rounding, misspelled name
* @deprecated, ICU 3.8
*/
UNUM_FOUND_HALFEVEN,
UNUM_FOUND_HALFEVEN = UNUM_ROUND_HALFEVEN,
#endif /* U_HIDE_DEPRECATED_API */
UNUM_ROUND_HALFDOWN,
UNUM_ROUND_HALFUP,
#ifndef U_HIDE_DRAFT_API
/**
* ROUND_UNNECESSARY reports an error if formatted result is not exact.
* @draft ICU 4.8
*/
UNUM_ROUND_UNNECESSARY,
/**
* Half-even rounding
* @stable, ICU 3.8
*/
UNUM_ROUND_HALFEVEN = UNUM_FOUND_HALFEVEN
UNUM_ROUND_UNNECESSARY
#endif /* U_HIDE_DRAFT_API */
} UNumberFormatRoundingMode;
/** The possible number format pad positions.
@ -248,6 +254,7 @@ typedef enum UNumberFormatPadPosition {
UNUM_PAD_AFTER_SUFFIX
} UNumberFormatPadPosition;
#ifndef U_HIDE_DRAFT_API
/**
* Constants for specifying currency spacing
* @draft ICU 4.8
@ -259,6 +266,7 @@ enum UCurrencySpacing {
UNUM_CURRENCY_SPACING_COUNT
};
typedef enum UCurrencySpacing UCurrencySpacing; /**< @draft ICU 4.8 */
#endif /* U_HIDE_DRAFT_API */
/**
* Create and return a new UNumberFormat for formatting and parsing
@ -949,7 +957,8 @@ typedef enum UNumberFormatSymbol {
/** The monetary grouping separator
* @stable ICU 3.6
*/
UNUM_MONETARY_GROUPING_SEPARATOR_SYMBOL = 17,
UNUM_MONETARY_GROUPING_SEPARATOR_SYMBOL = 17,
#ifndef U_HIDE_DRAFT_API
/** One
* @draft ICU 4.6
*/
@ -986,6 +995,7 @@ typedef enum UNumberFormatSymbol {
* @draft ICU 4.6
*/
UNUM_NINE_DIGIT_SYMBOL = 26,
#endif /* U_HIDE_DRAFT_API */
/** count symbol constants */
UNUM_FORMAT_SYMBOL_COUNT = 27
} UNumberFormatSymbol;

5
icu4c/source/i18n/unicode/upluralrules.h
View File

@ -11,10 +11,14 @@
#include "unicode/utypes.h"
#if !UCONFIG_NO_FORMATTING
#ifndef U_HIDE_DRAFT_API
#include "unicode/localpointer.h"
/**
* \file
* \brief C API: Plural rules, select plural keywords for numeric values.
*
* A UPluralRules object defines rules for mapping non-negative numeric
* values onto a small set of keywords. Rules are constructed from a text
* description, consisting of a series of keywords and conditions.
@ -99,6 +103,7 @@ uplrules_select(const UPluralRules *uplrules,
UChar *keyword, int32_t capacity,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif /* #if !UCONFIG_NO_FORMATTING */
#endif

66
icu4c/source/i18n/unicode/uregex.h
View File

@ -136,7 +136,8 @@ uregex_open( const UChar *pattern,
uint32_t flags,
UParseError *pe,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Open (compile) an ICU regular expression. Compiles the regular expression in
* string form into an internal representation using the specified match mode flags.
@ -165,7 +166,8 @@ uregex_openUText(UText *pattern,
uint32_t flags,
UParseError *pe,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Open (compile) an ICU regular expression. The resulting regular expression
* handle can then be used to perform various matching operations.
@ -271,6 +273,7 @@ uregex_pattern(const URegularExpression *regexp,
int32_t *patLength,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Returns the source text of the pattern for this regular expression.
* This function will work even if the pattern was originally specified as a UChar string.
@ -285,7 +288,7 @@ uregex_pattern(const URegularExpression *regexp,
U_DRAFT UText * U_EXPORT2
uregex_patternUText(const URegularExpression *regexp,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Get the match mode flags that were specified when compiling this regular expression.
@ -327,6 +330,7 @@ uregex_setText(URegularExpression *regexp,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Set the subject text string upon which the regular expression will look for matches.
* This function may be called any number of times, allowing the regular
@ -347,6 +351,7 @@ U_DRAFT void U_EXPORT2
uregex_setUText(URegularExpression *regexp,
UText *text,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Get the subject text that is currently associated with this
@ -372,8 +377,8 @@ U_STABLE const UChar * U_EXPORT2
uregex_getText(URegularExpression *regexp,
int32_t *textLength,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Get the subject text that is currently associated with this
* regular expression object.
@ -424,6 +429,7 @@ U_DRAFT void U_EXPORT2
uregex_refreshUText(URegularExpression *regexp,
UText *text,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Attempts to match the input string against the pattern.
@ -450,6 +456,7 @@ uregex_matches(URegularExpression *regexp,
int32_t startIndex,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_matches.
* Attempts to match the input string against the pattern.
@ -475,6 +482,7 @@ U_DRAFT UBool U_EXPORT2
uregex_matches64(URegularExpression *regexp,
int64_t startIndex,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Attempts to match the input string, starting from the specified index, against the pattern.
@ -504,6 +512,7 @@ uregex_lookingAt(URegularExpression *regexp,
int32_t startIndex,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_lookingAt.
* Attempts to match the input string, starting from the specified index, against the pattern.
@ -532,6 +541,7 @@ U_DRAFT UBool U_EXPORT2
uregex_lookingAt64(URegularExpression *regexp,
int64_t startIndex,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Find the first matching substring of the input string that matches the pattern.
@ -557,6 +567,7 @@ uregex_find(URegularExpression *regexp,
int32_t startIndex,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_find.
* Find the first matching substring of the input string that matches the pattern.
@ -581,6 +592,7 @@ U_DRAFT UBool U_EXPORT2
uregex_find64(URegularExpression *regexp,
int64_t startIndex,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Find the next pattern match in the input string. Begin searching
@ -633,7 +645,7 @@ uregex_group(URegularExpression *regexp,
int32_t destCapacity,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/** Returns a shallow immutable clone of the entire input string. The returned UText current native index
* is set to the beginning of the requested capture group. The capture group length is also
* returned via groupLength.
@ -662,8 +674,9 @@ uregex_groupUText(URegularExpression *regexp,
UText *dest,
int64_t *groupLength,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#ifndef U_HIDE_INTERNAL_API
/** Extract the string for the specified matching expression or subexpression.
* Group #0 is the complete string of matched text.
* Group #1 is the text matched by the first set of capturing parentheses.
@ -686,6 +699,7 @@ uregex_groupUTextDeep(URegularExpression *regexp,
int32_t groupNum,
UText *dest,
UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
/**
* Returns the index in the input string of the start of the text matched by the
@ -706,6 +720,7 @@ uregex_start(URegularExpression *regexp,
int32_t groupNum,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_start.
* Returns the index in the input string of the start of the text matched by the
@ -725,6 +740,7 @@ U_DRAFT int64_t U_EXPORT2
uregex_start64(URegularExpression *regexp,
int32_t groupNum,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Returns the index in the input string of the position following the end
@ -744,6 +760,7 @@ uregex_end(URegularExpression *regexp,
int32_t groupNum,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_end.
* Returns the index in the input string of the position following the end
@ -762,6 +779,7 @@ U_DRAFT int64_t U_EXPORT2
uregex_end64(URegularExpression *regexp,
int32_t groupNum,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Reset any saved state from the previous match. Has the effect of
@ -780,7 +798,8 @@ U_STABLE void U_EXPORT2
uregex_reset(URegularExpression *regexp,
int32_t index,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_reset.
* Reset any saved state from the previous match. Has the effect of
@ -799,6 +818,7 @@ U_DRAFT void U_EXPORT2
uregex_reset64(URegularExpression *regexp,
int64_t index,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Sets the limits of the matching region for this URegularExpression.
@ -826,6 +846,7 @@ uregex_setRegion(URegularExpression *regexp,
int32_t regionLimit,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_setRegion.
* Sets the limits of the matching region for this URegularExpression.
@ -873,6 +894,7 @@ uregex_setRegionAndStart(URegularExpression *regexp,
int64_t regionLimit,
int64_t startIndex,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Reports the start index of the matching region. Any matches found are limited to
@ -887,6 +909,7 @@ U_STABLE int32_t U_EXPORT2
uregex_regionStart(const URegularExpression *regexp,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_regionStart.
* Reports the start index of the matching region. Any matches found are limited to
@ -900,6 +923,7 @@ uregex_regionStart(const URegularExpression *regexp,
U_DRAFT int64_t U_EXPORT2
uregex_regionStart64(const URegularExpression *regexp,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Reports the end index (exclusive) of the matching region for this URegularExpression.
@ -915,6 +939,7 @@ U_STABLE int32_t U_EXPORT2
uregex_regionEnd(const URegularExpression *regexp,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* 64bit version of uregex_regionEnd.
* Reports the end index (exclusive) of the matching region for this URegularExpression.
@ -929,6 +954,7 @@ uregex_regionEnd(const URegularExpression *regexp,
U_DRAFT int64_t U_EXPORT2
uregex_regionEnd64(const URegularExpression *regexp,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Queries the transparency of region bounds for this URegularExpression.
@ -1067,6 +1093,7 @@ uregex_replaceAll(URegularExpression *regexp,
int32_t destCapacity,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Replaces every substring of the input that matches the pattern
* with the given replacement string. This is a convenience function that
@ -1093,6 +1120,7 @@ uregex_replaceAllUText(URegularExpression *regexp,
UText *replacement,
UText *dest,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Replaces the first substring of the input that matches the pattern
@ -1126,6 +1154,7 @@ uregex_replaceFirst(URegularExpression *regexp,
int32_t destCapacity,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Replaces the first substring of the input that matches the pattern
* with the given replacement string. This is a convenience function that
@ -1152,7 +1181,7 @@ uregex_replaceFirstUText(URegularExpression *regexp,
UText *replacement,
UText *dest,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Implements a replace operation intended to be used as part of an
@ -1208,7 +1237,7 @@ uregex_appendReplacement(URegularExpression *regexp,
int32_t *destCapacity,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Implements a replace operation intended to be used as part of an
* incremental find-and-replace.
@ -1236,7 +1265,7 @@ uregex_appendReplacementUText(URegularExpression *regexp,
UText *replacementText,
UText *dest,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* As the final step in a find-and-replace operation, append the remainder
@ -1267,8 +1296,8 @@ uregex_appendTail(URegularExpression *regexp,
UChar **destBuf,
int32_t *destCapacity,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* As the final step in a find-and-replace operation, append the remainder
* of the input string, starting at the position following the last match,
@ -1291,8 +1320,7 @@ U_DRAFT UText * U_EXPORT2
uregex_appendTailUText(URegularExpression *regexp,
UText *dest,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Split a string into fields. Somewhat like split() from Perl.
@ -1354,7 +1382,7 @@ uregex_split( URegularExpression *regexp,
int32_t destFieldsCapacity,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Split a string into fields. Somewhat like split() from Perl.
* The pattern matches identify delimiters that separate the input
@ -1386,9 +1414,7 @@ uregex_splitUText(URegularExpression *regexp,
UText *destFields[],
int32_t destFieldsCapacity,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
/**
* Set a processing time limit for match operations with this URegularExpression.
@ -1529,7 +1555,7 @@ uregex_getMatchCallback(const URegularExpression *regexp,
const void **context,
UErrorCode *status);
#ifndef U_HIDE_DRAFT_API
/**
* Function pointer for a regular expression find callback function.
*
@ -1583,7 +1609,6 @@ uregex_setFindProgressCallback(URegularExpression *regexp,
const void *context,
UErrorCode *status);
/**
* Get the find progress callback function for this URegularExpression.
*
@ -1600,6 +1625,7 @@ uregex_getFindProgressCallback(const URegularExpression *regexp,
URegexFindProgressCallback **callback,
const void **context,
UErrorCode *status);
#endif /* U_HIDE_DRAFT_API */
#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
#endif /* UREGEX_H */

2
icu4c/source/i18n/unicode/usearch.h
View File

@ -709,6 +709,7 @@ U_STABLE int32_t U_EXPORT2 usearch_previous(UStringSearch *strsrch,
*/
U_STABLE void U_EXPORT2 usearch_reset(UStringSearch *strsrch);
#ifndef U_HIDE_INTERNAL_API
/**
* Simple forward search for the pattern, starting at a specified index,
* and using using a default set search options.
@ -828,6 +829,7 @@ U_INTERNAL UBool U_EXPORT2 usearch_searchBackwards(UStringSearch *strsrch,
int32_t *matchStart,
int32_t *matchLimit,
UErrorCode *status);
#endif /* U_HIDE_INTERNAL_API */
#endif /* #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION */

6
icu4c/source/i18n/unicode/utrans.h
View File

@ -1,6 +1,6 @@
/*
*******************************************************************************
* Copyright (C) 1997-2010, International Business Machines
* Copyright (C) 1997-2011, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
* Date Name Description
@ -510,6 +510,8 @@ utrans_transIncrementalUChars(const UTransliterator* trans,
/* deprecated API ----------------------------------------------------------- */
#ifndef U_HIDE_DEPRECATED_API
/* see utrans.h documentation for why these functions are deprecated */
/**
@ -598,6 +600,8 @@ utrans_getAvailableID(int32_t index,
char* buf,
int32_t bufCapacity);
#endif /* U_HIDE_DEPRECATED_API */
#endif /* #if !UCONFIG_NO_TRANSLITERATION */
#endif

6
icu4c/source/i18n/unicode/vtzone.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
* Copyright (C) 2007-2010, International Business Machines Corporation and *
* others. All Rights Reserved. *
* Copyright (C) 2007-2011, International Business Machines Corporation and
* others. All Rights Reserved.
*******************************************************************************
*/
#ifndef VTZONE_H
@ -89,6 +89,7 @@ public:
*/
static VTimeZone* createVTimeZoneByID(const UnicodeString& ID);
#ifndef U_HIDE_DRAFT_API
/**
* Create a <code>VTimeZone</code> instance using a basic time zone.
* @param basicTZ The basic time zone instance
@ -98,6 +99,7 @@ public:
*/
static VTimeZone* createVTimeZoneFromBasicTimeZone(const BasicTimeZone& basicTZ,
UErrorCode &status);
#endif /* U_HIDE_DRAFT_API */
/**
* Create a <code>VTimeZone</code> instance by RFC2445 VTIMEZONE data

4
icu4c/source/layout/LEGlyphFilter.h
View File

@ -1,6 +1,6 @@
/*
*
* (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
* (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
*
*/
@ -11,6 +11,7 @@
U_NAMESPACE_BEGIN
#ifndef U_HIDE_INTERNAL_API
/**
* This is a helper class that is used to
* recognize a set of glyph indices.
@ -38,6 +39,7 @@ public:
*/
virtual le_bool accept(LEGlyphID glyph) const = 0;
};
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_END
#endif

4
icu4c/source/layout/LEInsertionList.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 1998-2008, International Business Machines
* Copyright (C) 1998-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -14,6 +14,7 @@ U_NAMESPACE_BEGIN
struct InsertionRecord;
#ifndef U_HIDE_INTERNAL_API
/**
* This class encapsulates the callback used by <code>LEInsertionList</code>
* to apply an insertion from the insertion list.
@ -169,6 +170,7 @@ private:
*/
le_bool append;
};
#endif /* U_HIDE_INTERNAL_API */
U_NAMESPACE_END
#endif

4
icu4c/source/layout/LETypes.h
View File

@ -229,12 +229,14 @@ typedef UChar LEUnicode16;
*/
typedef UChar32 LEUnicode32;
#ifndef U_HIDE_DEPRECATED_API
/**
* Used to represent 16-bit Unicode code points.
*
* @deprecated since ICU 2.4. Use LEUnicode16 instead
*/
typedef UChar LEUnicode;
#endif /* U_HIDE_DEPRECATED_API */
/**
* Used to hold a pair of (x, y) values which represent a point.
@ -268,6 +270,7 @@ typedef struct LEPoint LEPoint;
#endif
#ifndef U_HIDE_INTERNAL_API
/**
* A convenience macro to get the length of an array.
*
@ -307,6 +310,7 @@ typedef struct LEPoint LEPoint;
*/
#define LE_DELETE_ARRAY(array) uprv_free((void *) (array))
#endif
#endif /* U_HIDE_INTERNAL_API */
/**
* A macro to construct the four-letter tags used to

9
icu4c/source/layout/LayoutEngine.h
View File

@ -63,10 +63,12 @@ class LEGlyphStorage;
*/
class U_LAYOUT_API LayoutEngine : public UObject {
public:
#ifndef U_HIDE_INTERNAL_API
/** @internal Flag to request kerning. */
static const le_int32 kTypoFlagKern;
/** @internal Flag to request ligatures. */
static const le_int32 kTypoFlagLiga;
#endif /* U_HIDE_INTERNAL_API */
protected:
/**
@ -118,6 +120,7 @@ protected:
*/
le_bool fFilterZeroWidth;
#ifndef U_HIDE_INTERNAL_API
/**
* This constructs an instance for a given font, script and language. Subclass constructors
* must call this constructor.
@ -139,7 +142,10 @@ protected:
le_int32 languageCode,
le_int32 typoFlags,
LEErrorCode &success);
#endif /* U_HIDE_INTERNAL_API */
// Do not enclose the protected default constructor with #ifndef U_HIDE_INTERNAL_API
// or else the compiler will create a public default constructor.
/**
* This overrides the default no argument constructor to make it
* difficult for clients to call it. Clients are expected to call
@ -280,6 +286,7 @@ protected:
*/
virtual void mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, le_bool mirror, LEGlyphStorage &glyphStorage, LEErrorCode &success);
#ifndef U_HIDE_INTERNAL_API
/**
* This is a convenience method that forces the advance width of mark
* glyphs to be zero, which is required for proper selection and highlighting.
@ -314,7 +321,7 @@ protected:
* @internal
*/
static void adjustMarkGlyphs(const LEUnicode chars[], le_int32 charCount, le_bool reverse, LEGlyphStorage &glyphStorage, LEGlyphFilter *markFilter, LEErrorCode &success);
#endif /* U_HIDE_INTERNAL_API */
public:
/**

4
icu4c/source/layout/loengine.h
View File

@ -1,6 +1,6 @@
/*
*
* (C) Copyright IBM Corp. 1998-2007 - All Rights Reserved
* (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
*
*/
@ -9,6 +9,7 @@
#include "LETypes.h"
#ifndef U_HIDE_INTERNAL_API
/**
* \file
* \brief C API for complex text layout.
@ -219,5 +220,6 @@ le_getGlyphPosition(le_engine *engine,
U_INTERNAL void U_EXPORT2
le_reset(le_engine *engine,
LEErrorCode *success);
#endif /* U_HIDE_INTERNAL_API */
#endif

5
icu4c/source/layoutex/layout/ParagraphLayout.h
View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (C) 2002-2010, International Business Machines
* Copyright (C) 2002-2011, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -498,6 +498,8 @@ public:
* @stable ICU 3.2
*/
inline void reflow();
#ifndef U_HIDE_INTERNAL_API
/**
*
* Convenience method for determining if paragraph layout processing is complete ( i.e. there
@ -508,6 +510,7 @@ public:
* @internal
*/
inline le_bool isDone() const;
#endif /* U_HIDE_INTERNAL_API */
/**
* Return a <code>ParagraphLayout::Line</code> object which represents next line

4
icu4c/source/layoutex/layout/playout.h
View File

@ -1,6 +1,6 @@
/*
*
* (C) Copyright IBM Corp. 1998-2007 - All Rights Reserved
* (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
*
*/
@ -13,6 +13,7 @@
*/
#include "unicode/ubidi.h"
#if ! UCONFIG_NO_BREAK_ITERATION
#ifndef U_HIDE_INTERNAL_API
#include "layout/LETypes.h"
#include "plruns.h"
@ -460,5 +461,6 @@ pl_getVisualRunDescent(const pl_visualRun *run);
U_INTERNAL le_int32 U_EXPORT2
pl_getVisualRunLeading(const pl_visualRun *run);
#endif /* U_HIDE_INTERNAL_API */
#endif
#endif

6
icu4c/source/layoutex/layout/plruns.h
View File

@ -1,6 +1,6 @@
/*
*
* (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved
* (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved
*
*/
@ -8,6 +8,9 @@
#define __PLRUNS_H
#include "unicode/utypes.h"
#ifndef U_HIDE_INTERNAL_API
#include "unicode/ubidi.h"
#include "layout/LETypes.h"
@ -434,4 +437,5 @@ pl_addLocaleRun(pl_localeRuns *localeRuns,
const char *locale,
le_int32 limit);
#endif /* U_HIDE_INTERNAL_API */
#endif

40
icu4c/source/tools/gendraft/Makefile
View File

@ -1,40 +0,0 @@
#*******************************************************************************
#* Copyright (C) 2008-2011, International Business Machines
#* Corporation and others. All Rights Reserved.
#*******************************************************************************
#sorry, this won't be friendly to out of source builds
srcdir=.
top_srcdir=../..
top_builddir=../..
include $(top_builddir)/icudefs.mk
LOCALHEADERS= udeprctd.h udraft.h uintrnal.h usystem.h
COMMONHDR= $(top_srcdir)/common/unicode
DOCDIR= $(top_builddir)/doc/html
EXCLUDE=$(srcdir)/exclude.txt
-include Makefile.local
all:
@echo Usage: 'make install-headers' to update headers.
@echo 'be sure to verify the headers (in soure/common/unicode) before checkin!'
@exit 1
clean:
-$(RMV) $(LOCALHEADERS)
$(DOCDIR):
( cd $(top_builddir) ; $(MAKE) doc )
local-headers: $(LOCALHEADERS)
install-headers: $(DOCDIR)
perl ./genheaders.pl --srcdir=$(DOCDIR) --destdir=$(COMMONHDR) --version=$(VERSION) --exclusion-list=$(EXCLUDE) $(GENHEADERS_OPTS)
( cd $(COMMONHDR) ; ls -l $(LOCALHEADERS) )
%.h: $(COMMONHDR)/%.h
cp $< $@

7
icu4c/source/tools/gendraft/exclude.txt
View File

@ -1,7 +0,0 @@
#*
#*******************************************************************************
#* Copyright (C) 2006, International Business Machines
#* Corporation and others. All Rights Reserved.
#*******************************************************************************
#*
# file that contains function names that need to be excluded from generation

264
icu4c/source/tools/gendraft/genheaders.pl
View File

@ -1,264 +0,0 @@
#!/usr/bin/perl
#*
#*******************************************************************************
#* Copyright (C) 2006-2011, International Business Machines
#* Corporation and others. All Rights Reserved.
#*******************************************************************************
#*
#* file name: genheaders.pl
#* encoding: US-ASCII
#* tab size: 8 (not used)
#* indentation:4
#*
#* Created by: Ram Viswanadha
#*
#* This tool filters the deprecated.html and friends file generated by Doxygen and generates udarft.h
#* udeprctd.h and uobslete.h
#*
use File::Find;
use File::Basename;
use IO::File;
use Cwd;
use File::Copy;
use Getopt::Long;
use File::Path;
use File::Copy;
$draftHeaderName = "udraft.h";
$draftAppend = "DRAFT_API_DO_NOT_USE";
$draftDefine = "U_HIDE_DRAFT_API";
$deprecatedHeaderName = "udeprctd.h";
$deprecatedAppend = "DEPRECATED_API_DO_NOT_USE";
$deprecatedDefine = "U_HIDE_DEPRECATED_API";
$obsoleteHeaderName = "uobslete.h";
$obsoleteAppend = "OBSOLETE_API_DO_NOT_USE";
$obsoleteDefine = "U_HIDE_OBSOLETE_API";
$systemHeaderName = "usystem.h";
$systemAppend = "SYSTEM_API_DO_NOT_USE";
$systemDefine = "U_HIDE_SYSTEM_API";
$internalHeaderName = "uintrnal.h";
$internalAppend = "INTERNAL_API_DO_NOT_USE";
$internalDefine = "U_HIDE_INTERNAL_API";
$versionAppend="";
#run the program
main();
#---------------------------------------------------------------------
# The main program
sub main(){
GetOptions(
"--srcdir=s" => \$srcDir,
"--destdir=s" => \$destDir,
"--version=s" => \$version,
"--exclusion-list=s" => \$exclude,
"--include-types" => \$includeTypes,
"--verbose" => \$verbose
);
usage() unless defined $srcDir;
usage() unless defined $destDir;
usage() unless defined $version;
usage() unless defined $exclude;
$draftFile = "$srcDir/draft.html";
$deprecatedFile = "$srcDir/deprecated.html";
$obsoleteFile = "$srcDir/obsolete.html";
$systemFile = "$srcDir/system.html";
$internalFile = "$srcDir/internal.html";
$versionAppend = $version;
$versionAppend=~ s/^([0-9]+)\.([0-9]+).*/\1\2/; # _48
$excludeFH = IO::File->new($exclude,"r")
or die "could not open the file $exclude for reading: $! \n";
my %exclude;
while (defined ($line = <$excludeFH>)){
next if( $line =~ /^#/);
$line =~ s/^\s+//;
$line =~ s/\s+\n$//;
$exclude{$line}="EXCLUDE";
}
writeFile($draftFile, $draftHeaderName, $destDir, $draftAppend, $draftDefine, \%exclude);
writeFile($deprecatedFile, $deprecatedHeaderName, $destDir, $deprecatedAppend, $deprecatedDefine, \%exclude);
writeFile($obsoleteFile, $obsoleteHeaderName, $destDir, $obsoleteAppend, $obsoleteDefine, \%exclude);
writeFile($systemFile, $systemHeaderName, $destDir, $systemAppend, $systemDefine, \%exclude);
writeFile($internalFile, $internalHeaderName, $destDir, $internalAppend, $internalDefine, \%exclude);
}
#-----------------------------------------------------------------------
sub getHeaderDef{
($headerName) = @_;
$headerDef = uc($headerName); # this is building the constant for #define
$headerDef =~ s/\./_/;
return $headerDef;
}
#-----------------------------------------------------------------------
sub writeFile{
($infile,$outfile,$destDir, $symbolAppend, $symbolDef, $exclude) = @_;
my $outFileName = $outfile;
$headerDef = getHeaderDef($outfile);
$outfile = $destDir."/".$outfile;
$inFH = IO::File->new($infile,"r")
or die "could not open the file $infile for reading: $! \n";
$outFH = IO::File->new($outfile,"w")
or die "could not open the file $outfile for writing: $! \n";
#print "$headerDef>>> $outfile\n";
printHeader($outFH, $outFileName, $headerDef, $symbolDef);
parseWriteFile($inFH, $outFH, $symbolAppend, $exclude);
printFooter($outFH, $headerDef, $symbolDef);
close($inFH);
close($outFH);
}
#-----------------------------------------------------------------------
sub printHeader{
($outFH, $headername, $HEADERDEF, $symbolDef) = @_;
($DAY, $MONTH, $YEAR) = (localtime)[3,4,5];
$YEAR += 1900;
#We will print our copyright here + warnings
print $outFH <<END_HEADER_COMMENT;
/*
*******************************************************************************
* Copyright (C) 2004-$YEAR, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*
* file name: $headername
* encoding: US-ASCII
* tab size: 8 (not used)
* indentation:4
*
* Created by: genheaders.pl, a perl script written by Ram Viswanadha
*
* Contains data for commenting out APIs.
* Gets included by umachine.h
*
* THIS FILE IS MACHINE-GENERATED, DON'T PLAY WITH IT IF YOU DON'T KNOW WHAT
* YOU ARE DOING, OTHERWISE VERY BAD THINGS WILL HAPPEN!
*/
#ifndef $HEADERDEF
#define $HEADERDEF
#ifdef $symbolDef
END_HEADER_COMMENT
}
#-----------------------------------------------------------------------
sub parseWriteFile{
($inFH, $outFH, $symbolAppend, $exclude) = @_;
%disableRenaming;
%enableRenaning;
while (defined ($line = <$inFH>)){
#just process C APIs for now
if($line =~ /\<dt\>/ ){
#special cases
if( ($line =~ /LEUnicode/)|| ($line =~ /LanguageCodes/) ||
($line =~ /ScriptCodes/) || ($line =~ /\:+/) ||
($line =~ /Class/) ){
next;
}
if( $line =~ /^\<dt\>File [^\>]*\>([^\<]*)/ ) {
print "Skipping file-scope $symbolAppend $1\n";
next;
}
#<dt>Global <a class="el" href="utrans_8h.html#a21">utrans_unregister</a> </dt>
#<dt>Global <a class="el" href="classUnicodeString.html#w1w0">UnicodeString::kInvariant</a> </dt>
# the below regular expression works for both the above formats.
$line=~ m/\<dt\>.*\<a class=\".*\" href=\".*\">(.*)\<\/a\>.*\<\/dt\>/;
my $value = $1;
$value =~ s/\<\/a\>\s*//g;
$value =~ s/^\s+//;
$value =~ s/\s+$//;
#print "$exclude->{$value}\n";
if($exclude->{$value} eq "EXCLUDE"){
#print "$value $exclude->{$value}\n";
next;
}
print "$value $realSymbol $nonExSymbol :: $line\n" if defined $verbose;
next if(isStringAcceptable($value)==1);
if($value =~ /^operator[^a-zA-Z]/) {
print "Skipping operator $symbolAppend $value from $line\n";
next;
}
$realSymbol = $value."_".$versionAppend;
$nonExSymbol = $value."_".$symbolAppend;
$disableRenaming{$value} = $nonExSymbol;
$enableRenaming{$realSymbol} = $nonExSymbol;
print "$value $realSymbol $nonExSymbol\n" if defined $verbose;
}
}
print "size of disableRenaming: " . keys( %disableRenaming) . ".\n";
print "size of enableRenaming: " . keys( %enableRenaming) . ".\n";
print $outFH "# if U_DISABLE_RENAMING\n";
foreach $key (sort (keys(%disableRenaming))) {
print $outFH "# define $key $disableRenaming{$key}\n";
delete($disableRenaming{$key});
}
print $outFH "# else\n";
foreach $key (sort (keys(%enableRenaming))) {
print $outFH "# define $key $enableRenaming{$key}\n";
delete($enableRenaming{$key});
}
print $outFH "# endif /* U_DISABLE_RENAMING */\n";
}
#-----------------------------------------------------------------------
sub isStringAcceptable{
($string) = @_;
@str = split(//, $string);
$ret = 1;
foreach $val (@str){
if(($val ne "_") && !($val =~ /[0-9A-Z]/)){
#print "$val\n";
$ret = 0;
}
}
#print "$string : $ret\n";
if(!(defined $includeTypes)){
if($ret==0 && $str[0] eq 'U'){
$ret=1;
}
}
return $ret;
}
#-----------------------------------------------------------------------
sub printFooter{
($outFH, $headerDef, $symbolDef ) = @_;
#print the footer
print $outFH <<END_FOOTER;
#endif /* $symbolDef */
#endif /* $headerDef */
END_FOOTER
}
#-----------------------------------------------------------------------
sub usage {
print << "END";
Usage:
gendraft.pl
Options:
--srcdir=<directory>
--destdir=<directory>
--version=<current version of ICU>
--exclusion-list=<file name>
--include-types
e.g.: genheaders.pl --srcdir=<icu>/source/common/docs/html --destdir=<icu>/source/common/unicode --version=2.8 --exclusion-list=exclude.txt
END
exit(0);
}