mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-06 05:55:35 +00:00
ICU-2235 remove C++ style comments in order to allow real including from .c files
X-SVN-Rev: 13841
This commit is contained in:
Vladimir Weinstein
parent
52a52e88f5
commit
276f4c40a0
2 changed files with 106 additions and 106 deletions
|
|
@ -62,7 +62,7 @@ U_NAMESPACE_BEGIN
|
|||
* zero offset indicates an absent entry; this corresponds to aliases
|
||||
* marked "n/a" in the original Unicode data files.
|
||||
*/
|
||||
typedef int16_t Offset; // must be signed
|
||||
typedef int16_t Offset; /* must be signed */
|
||||
|
||||
#define MAX_OFFSET 0x7FFF
|
||||
|
||||
|
|
@ -77,8 +77,8 @@ typedef int16_t Offset; // must be signed
|
|||
*/
|
||||
typedef int32_t EnumValue;
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// ValueMap
|
||||
/* ---------------------------------------------------------------------- */
|
||||
/* ValueMap */
|
||||
|
||||
/**
|
||||
* For any top-level property that has named values (binary and
|
||||
|
|
@ -96,18 +96,18 @@ typedef int32_t EnumValue;
|
|||
*/
|
||||
struct ValueMap {
|
||||
|
||||
// -- begin pnames data --
|
||||
// Enum=>name EnumToOffset / NonContiguousEnumToOffset objects.
|
||||
// Exactly one of these will be nonzero.
|
||||
/* -- begin pnames data -- */
|
||||
/* Enum=>name EnumToOffset / NonContiguousEnumToOffset objects. */
|
||||
/* Exactly one of these will be nonzero. */
|
||||
Offset enumToName_offset;
|
||||
Offset ncEnumToName_offset;
|
||||
|
||||
Offset nameToEnum_offset; // Name=>enum data
|
||||
// -- end pnames data --
|
||||
Offset nameToEnum_offset; /* Name=>enum data */
|
||||
/* -- end pnames data -- */
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// PropertyAliases class
|
||||
/* ---------------------------------------------------------------------- */
|
||||
/* PropertyAliases class */
|
||||
|
||||
/**
|
||||
* A class encapsulating access to the memory-mapped data representing
|
||||
|
|
@ -120,29 +120,29 @@ struct ValueMap {
|
|||
*/
|
||||
class PropertyAliases {
|
||||
|
||||
// -- begin pnames data --
|
||||
// Enum=>name EnumToOffset object for binary and enumerated
|
||||
// properties
|
||||
/* -- begin pnames data -- */
|
||||
/* Enum=>name EnumToOffset object for binary and enumerated */
|
||||
/* properties */
|
||||
Offset enumToName_offset;
|
||||
|
||||
// Name=>enum data for binary & enumerated properties
|
||||
/* Name=>enum data for binary & enumerated properties */
|
||||
Offset nameToEnum_offset;
|
||||
|
||||
// Enum=>offset EnumToOffset object mapping enumerated properties
|
||||
// to ValueMap objects
|
||||
/* Enum=>offset EnumToOffset object mapping enumerated properties */
|
||||
/* to ValueMap objects */
|
||||
Offset enumToValue_offset;
|
||||
|
||||
// The following are needed by external readers of this data.
|
||||
// We don't use them ourselves.
|
||||
int16_t total_size; // size in bytes excluding the udata header
|
||||
Offset valueMap_offset; // offset to start of array
|
||||
int16_t valueMap_count; // number of entries
|
||||
Offset nameGroupPool_offset; // offset to start of array
|
||||
int16_t nameGroupPool_count; // number of entries (not groups)
|
||||
Offset stringPool_offset; // offset to start of pool
|
||||
int16_t stringPool_count; // number of strings (not size in bytes)
|
||||
/* The following are needed by external readers of this data. */
|
||||
/* We don't use them ourselves. */
|
||||
int16_t total_size; /* size in bytes excluding the udata header */
|
||||
Offset valueMap_offset; /* offset to start of array */
|
||||
int16_t valueMap_count; /* number of entries */
|
||||
Offset nameGroupPool_offset; /* offset to start of array */
|
||||
int16_t nameGroupPool_count; /* number of entries (not groups) */
|
||||
Offset stringPool_offset; /* offset to start of pool */
|
||||
int16_t stringPool_count; /* number of strings (not size in bytes) */
|
||||
|
||||
// -- end pnames data --
|
||||
/* -- end pnames data -- */
|
||||
|
||||
friend class ::Builder;
|
||||
|
||||
|
|
@ -178,8 +178,8 @@ class PropertyAliases {
|
|||
UErrorCode *pErrorCode);
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// EnumToOffset
|
||||
/* ---------------------------------------------------------------------- */
|
||||
/* EnumToOffset */
|
||||
|
||||
/**
|
||||
* A generic map from enum values to Offsets. The enum values must be
|
||||
|
|
@ -188,11 +188,11 @@ class PropertyAliases {
|
|||
*/
|
||||
class EnumToOffset {
|
||||
|
||||
// -- begin pnames data --
|
||||
/* -- begin pnames data -- */
|
||||
EnumValue enumStart;
|
||||
EnumValue enumLimit;
|
||||
Offset _offsetArray; // [array of enumLimit-enumStart]
|
||||
// -- end pnames data --
|
||||
Offset _offsetArray; /* [array of enumLimit-enumStart] */
|
||||
/* -- end pnames data -- */
|
||||
|
||||
friend class ::Builder;
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ class EnumToOffset {
|
|||
Offset getOffset(EnumValue enumProbe) const {
|
||||
if (enumProbe < enumStart ||
|
||||
enumProbe >= enumLimit) {
|
||||
return 0; // not found
|
||||
return 0; /* not found */
|
||||
}
|
||||
const Offset* p = getOffsetArray();
|
||||
return p[enumProbe - enumStart];
|
||||
|
|
@ -230,8 +230,8 @@ class EnumToOffset {
|
|||
UErrorCode *pErrorCode);
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// NonContiguousEnumToOffset
|
||||
/* ---------------------------------------------------------------------- */
|
||||
/* NonContiguousEnumToOffset */
|
||||
|
||||
/**
|
||||
* A generic map from enum values to Offsets. The enum values may be
|
||||
|
|
@ -240,11 +240,11 @@ class EnumToOffset {
|
|||
*/
|
||||
class NonContiguousEnumToOffset {
|
||||
|
||||
// -- begin pnames data --
|
||||
/* -- begin pnames data -- */
|
||||
int32_t count;
|
||||
EnumValue _enumArray; // [array of count]
|
||||
// Offset _offsetArray; // [array of count] after enumValue[count-1]
|
||||
// -- end pnames data --
|
||||
EnumValue _enumArray; /* [array of count] */
|
||||
/* Offset _offsetArray; // [array of count] after enumValue[count-1] */
|
||||
/* -- end pnames data -- */
|
||||
|
||||
friend class ::Builder;
|
||||
|
||||
|
|
@ -277,14 +277,14 @@ class NonContiguousEnumToOffset {
|
|||
Offset getOffset(EnumValue enumProbe) const {
|
||||
const EnumValue* e = getEnumArray();
|
||||
const Offset* p = getOffsetArray();
|
||||
// linear search; binary later if warranted
|
||||
// (binary is not faster for short lists)
|
||||
/* linear search; binary later if warranted */
|
||||
/* (binary is not faster for short lists) */
|
||||
for (int32_t i=0; i<count; ++i) {
|
||||
if (e[i] < enumProbe) continue;
|
||||
if (e[i] > enumProbe) break;
|
||||
return p[i];
|
||||
}
|
||||
return 0; // not found
|
||||
return 0; /* not found */
|
||||
}
|
||||
|
||||
static int32_t
|
||||
|
|
@ -294,19 +294,19 @@ class NonContiguousEnumToOffset {
|
|||
UErrorCode *pErrorCode);
|
||||
};
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// NameToEnum
|
||||
/* ---------------------------------------------------------------------- */
|
||||
/* NameToEnum */
|
||||
|
||||
/**
|
||||
* A map from names to enum values.
|
||||
*/
|
||||
class NameToEnum {
|
||||
|
||||
// -- begin pnames data --
|
||||
int32_t count; // number of entries
|
||||
EnumValue _enumArray; // [array of count] EnumValues
|
||||
// Offset _nameArray; // [array of count] offsets to names
|
||||
// -- end pnames data --
|
||||
/* -- begin pnames data -- */
|
||||
int32_t count; /* number of entries */
|
||||
EnumValue _enumArray; /* [array of count] EnumValues */
|
||||
/* Offset _nameArray; // [array of count] offsets to names */
|
||||
/* -- end pnames data -- */
|
||||
|
||||
friend class ::Builder;
|
||||
|
||||
|
|
@ -341,8 +341,8 @@ class NameToEnum {
|
|||
const Offset* n = getNameArray();
|
||||
const EnumValue* e = getEnumArray();
|
||||
|
||||
// linear search; binary later if warranted
|
||||
// (binary is not faster for short lists)
|
||||
/* linear search; binary later if warranted */
|
||||
/* (binary is not faster for short lists) */
|
||||
for (int32_t i=0; i<count; ++i) {
|
||||
const char* name = (const char*) data.getPointer(n[i]);
|
||||
int32_t c = uprv_comparePropertyNames(alias, name);
|
||||
|
|
|
|||
|
|
@ -53,72 +53,72 @@ ubrk_swap(const UDataSwapper *ds,
|
|||
|
||||
U_NAMESPACE_BEGIN
|
||||
|
||||
//
|
||||
// The following structs map exactly onto the raw data from ICU common data file.
|
||||
//
|
||||
/* */
|
||||
/* The following structs map exactly onto the raw data from ICU common data file. */
|
||||
/* */
|
||||
struct RBBIDataHeader {
|
||||
uint32_t fMagic; // == 0xbla0
|
||||
uint32_t fVersion; // == 1
|
||||
uint32_t fLength; // Total length in bytes of this RBBI Data,
|
||||
// including all sections, not just the header.
|
||||
uint32_t fCatCount; // Number of character categories.
|
||||
uint32_t fMagic; /* == 0xbla0 */
|
||||
uint32_t fVersion; /* == 1 */
|
||||
uint32_t fLength; /* Total length in bytes of this RBBI Data, */
|
||||
/* including all sections, not just the header. */
|
||||
uint32_t fCatCount; /* Number of character categories. */
|
||||
|
||||
//
|
||||
// Offsets and sizes of each of the subsections within the RBBI data.
|
||||
// All offsets are bytes from the start of the RBBIDataHeader.
|
||||
// All sizes are in bytes.
|
||||
//
|
||||
uint32_t fFTable; // forward state transition table.
|
||||
/* */
|
||||
/* Offsets and sizes of each of the subsections within the RBBI data. */
|
||||
/* All offsets are bytes from the start of the RBBIDataHeader. */
|
||||
/* All sizes are in bytes. */
|
||||
/* */
|
||||
uint32_t fFTable; /* forward state transition table. */
|
||||
uint32_t fFTableLen;
|
||||
uint32_t fRTable; // Offset to the reverse state transition table.
|
||||
uint32_t fRTable; /* Offset to the reverse state transition table. */
|
||||
uint32_t fRTableLen;
|
||||
uint32_t fSFTable; // safe point forward transition table
|
||||
uint32_t fSFTable; /* safe point forward transition table */
|
||||
uint32_t fSFTableLen;
|
||||
uint32_t fSRTable; // safe point reverse transition table
|
||||
uint32_t fSRTable; /* safe point reverse transition table */
|
||||
uint32_t fSRTableLen;
|
||||
uint32_t fTrie; // Offset to Trie data for character categories
|
||||
uint32_t fTrie; /* Offset to Trie data for character categories */
|
||||
uint32_t fTrieLen;
|
||||
uint32_t fRuleSource; // Offset to the source for for the break
|
||||
uint32_t fRuleSourceLen; // rules. Stored UChar *.
|
||||
uint32_t fRuleSource; /* Offset to the source for for the break */
|
||||
uint32_t fRuleSourceLen; /* rules. Stored UChar *. */
|
||||
|
||||
uint32_t fReserved[8]; // Reserved for expansion
|
||||
uint32_t fReserved[8]; /* Reserved for expansion */
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
struct RBBIStateTableRow {
|
||||
int16_t fAccepting; // Non-zero if this row is for an accepting state.
|
||||
// Value is the {nnn} value to return to calling
|
||||
// application.
|
||||
int16_t fLookAhead; // Non-zero if this row is for a state that
|
||||
// corresponds to a '/' in the rule source.
|
||||
// Value is the same as the fAccepting
|
||||
// value for the rule (which will appear
|
||||
// in a different state.
|
||||
int16_t fTag; // Non-zero if this row covers a {tagged} position
|
||||
// from a rule. value is the tag number.
|
||||
int16_t fAccepting; /* Non-zero if this row is for an accepting state. */
|
||||
/* Value is the {nnn} value to return to calling */
|
||||
/* application. */
|
||||
int16_t fLookAhead; /* Non-zero if this row is for a state that */
|
||||
/* corresponds to a '/' in the rule source. */
|
||||
/* Value is the same as the fAccepting */
|
||||
/* value for the rule (which will appear */
|
||||
/* in a different state. */
|
||||
int16_t fTag; /* Non-zero if this row covers a {tagged} position */
|
||||
/* from a rule. value is the tag number. */
|
||||
int16_t fReserved;
|
||||
uint16_t fNextState[2]; // Next State, indexed by char category.
|
||||
// Array Size is fNumCols from the
|
||||
// state table header.
|
||||
// CAUTION: see RBBITableBuilder::getTableSize()
|
||||
// before changing anything here.
|
||||
uint16_t fNextState[2]; /* Next State, indexed by char category. */
|
||||
/* Array Size is fNumCols from the */
|
||||
/* state table header. */
|
||||
/* CAUTION: see RBBITableBuilder::getTableSize() */
|
||||
/* before changing anything here. */
|
||||
};
|
||||
|
||||
|
||||
struct RBBIStateTable {
|
||||
uint32_t fNumStates; // Number of states.
|
||||
uint32_t fRowLen; // Length of a state table row, in bytes.
|
||||
char fTableData[4]; // First RBBIStateTableRow begins here.
|
||||
// (making it char[] simplifies ugly address
|
||||
// arithmetic for indexing variable length rows.)
|
||||
uint32_t fNumStates; /* Number of states. */
|
||||
uint32_t fRowLen; /* Length of a state table row, in bytes. */
|
||||
char fTableData[4]; /* First RBBIStateTableRow begins here. */
|
||||
/* (making it char[] simplifies ugly address */
|
||||
/* arithmetic for indexing variable length rows.) */
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
// The reference counting wrapper class
|
||||
//
|
||||
/* */
|
||||
/* The reference counting wrapper class */
|
||||
/* */
|
||||
class RBBIDataWrapper : public UMemory {
|
||||
public:
|
||||
RBBIDataWrapper(const RBBIDataHeader *data, UErrorCode &status);
|
||||
|
|
@ -134,9 +134,9 @@ public:
|
|||
void printData();
|
||||
void printTable(const char *heading, const RBBIStateTable *table);
|
||||
|
||||
//
|
||||
// Pointers to items within the data
|
||||
//
|
||||
/* */
|
||||
/* Pointers to items within the data */
|
||||
/* */
|
||||
const RBBIDataHeader *fHeader;
|
||||
const RBBIStateTable *fForwardTable;
|
||||
const RBBIStateTable *fReverseTable;
|
||||
|
|
@ -145,13 +145,13 @@ public:
|
|||
const UChar *fRuleSource;
|
||||
|
||||
UTrie fTrie;
|
||||
// if fLookAheadHardBreak is true, we will break at the first lookahead match
|
||||
// the search does not go on further to look for a longer match
|
||||
// this also allows breaks at both ends of the string
|
||||
// e.g. rule "ABC / D; ABCDE" and
|
||||
// text "ABCD ABCDE ABC" will give breaks at
|
||||
// 01234567890123
|
||||
// {0, 3, 4, 5, 8, 9, 10, 11, 14}
|
||||
/* if fLookAheadHardBreak is true, we will break at the first lookahead match */
|
||||
/* the search does not go on further to look for a longer match */
|
||||
/* this also allows breaks at both ends of the string */
|
||||
/* e.g. rule "ABC / D; ABCDE" and */
|
||||
/* text "ABCD ABCDE ABC" will give breaks at */
|
||||
/* 01234567890123 */
|
||||
/* {0, 3, 4, 5, 8, 9, 10, 11, 14} */
|
||||
UBool fLookAheadHardBreak;
|
||||
|
||||
private:
|
||||
|
|
@ -159,8 +159,8 @@ private:
|
|||
UDataMemory *fUDataMem;
|
||||
UnicodeString fRuleString;
|
||||
|
||||
RBBIDataWrapper(const RBBIDataWrapper &other); // forbid copying of this class
|
||||
RBBIDataWrapper &operator=(const RBBIDataWrapper &other); // forbid copying of this class
|
||||
RBBIDataWrapper(const RBBIDataWrapper &other); /* forbid copying of this class */
|
||||
RBBIDataWrapper &operator=(const RBBIDataWrapper &other); /* forbid copying of this class */
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue