diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in
index c969a35a1b1..f8528bebdc8 100644
--- a/icu4c/source/Makefile.in
+++ b/icu4c/source/Makefile.in
@@ -99,7 +99,7 @@ install-local:
## Generate HTML documentation
doc:
- @uniq=`date '+%y%m%d8/13/99M%S'`; \
+ @uniq=`date '+%y%m%d8/20/99M%S'`; \
tmpdir="/tmp/icu-$$uniq"; \
list='$(DOCDIRS)'; for subdir in $$list; do \
echo "Making install-headers in $$subdir"; \
diff --git a/icu4c/source/common/compdata.cpp b/icu4c/source/common/compdata.cpp
index e9a8b21d255..00904081b59 100644
--- a/icu4c/source/common/compdata.cpp
+++ b/icu4c/source/common/compdata.cpp
@@ -1,5 +1,5 @@
/*
- * @(#)$RCSFile$ $Revision: 1.1 $ $Date: 1999/08/16 21:51:05 $
+ * @(#)$RCSFile$ $Revision: 1.2 $ $Date: 1999/09/03 22:08:46 $
*
* (C) Copyright IBM Corp. 1997-1998 - All Rights Reserved
*
diff --git a/icu4c/source/common/compdata.h b/icu4c/source/common/compdata.h
index 88d3d78f1ad..27b1eda1fe8 100644
--- a/icu4c/source/common/compdata.h
+++ b/icu4c/source/common/compdata.h
@@ -1,5 +1,5 @@
/*
- * @(#)$RCSFile$ $Revision: 1.1 $ $Date: 1999/08/16 21:51:05 $
+ * @(#)$RCSFile$ $Revision: 1.2 $ $Date: 1999/09/03 22:08:46 $
*
* (C) Copyright IBM Corp. 1997-1998 - All Rights Reserved
*
diff --git a/icu4c/source/common/dcmpdata.cpp b/icu4c/source/common/dcmpdata.cpp
index 38bbc118ff6..c6f3a5ef183 100644
--- a/icu4c/source/common/dcmpdata.cpp
+++ b/icu4c/source/common/dcmpdata.cpp
@@ -1,5 +1,5 @@
/*
- * @(#)$RCSFile$ $Revision: 1.1 $ $Date: 1999/08/16 21:51:06 $
+ * @(#)$RCSFile$ $Revision: 1.2 $ $Date: 1999/09/03 22:08:46 $
*
* (C) Copyright IBM Corp. 1997-1998 - All Rights Reserved
*
diff --git a/icu4c/source/common/dcmpdata.h b/icu4c/source/common/dcmpdata.h
index 5cd4e0ad308..31d4f815917 100644
--- a/icu4c/source/common/dcmpdata.h
+++ b/icu4c/source/common/dcmpdata.h
@@ -1,5 +1,5 @@
/*
- * @(#)$RCSFile$ $Revision: 1.1 $ $Date: 1999/08/16 21:51:06 $
+ * @(#)$RCSFile$ $Revision: 1.2 $ $Date: 1999/09/03 22:08:46 $
*
* (C) Copyright IBM Corp. 1997-1998 - All Rights Reserved
*
diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
index f70785637d8..0bd2ac1fd13 100644
--- a/icu4c/source/common/locmap.cpp
+++ b/icu4c/source/common/locmap.cpp
@@ -11,7 +11,7 @@
* *
*******************************************************************************
*/
-// $Revision: 1.1 $
+// $Revision: 1.2 $
//
// Provides functionality for mapping between
// LCID and Posix IDs.
diff --git a/icu4c/source/common/locmap.h b/icu4c/source/common/locmap.h
index 2e32a1c9c1d..eaa86eee049 100644
--- a/icu4c/source/common/locmap.h
+++ b/icu4c/source/common/locmap.h
@@ -10,7 +10,7 @@
* *
*****************************************************************************************
*/
-// $Revision: 1.1 $
+// $Revision: 1.2 $
//===============================================================================
//
// File locmap.hpp : Locale Mapping Classes
diff --git a/icu4c/source/common/putil.c b/icu4c/source/common/putil.c
index e409b31692d..63815da2643 100644
--- a/icu4c/source/common/putil.c
+++ b/icu4c/source/common/putil.c
@@ -975,7 +975,7 @@ const char* icu_getDefaultCodepage()
/* Currently TBD
in the future should use thread specific CP
*/
-#elif defined(OS390OE)
+#elif defined(OS390)
icu_strcpy(DEFAULT_CONVERTER_NAME, "ibm-1047");
#elif defined(XP_MAC)
/* TBD */
diff --git a/icu4c/source/common/resbund.cpp b/icu4c/source/common/resbund.cpp
index 013d100a4a1..cc2ab2710c2 100644
--- a/icu4c/source/common/resbund.cpp
+++ b/icu4c/source/common/resbund.cpp
@@ -303,6 +303,7 @@ ResourceBundle::ResourceBundle( const UnicodeString& path,
for(i = 0; i < kDataCount; ++i) {
fData[i] = 0;
fLoaded[i] = FALSE;
+ fDataStatus[i] = INTERNAL_PROGRAM_ERROR;
}
fLocaleIterator = 0;
@@ -332,6 +333,7 @@ ResourceBundle::saveCollationHashtable(const UnicodeString& localeName,
if( ! bundle->fLoaded[i]) {
bundle->fData[i] = hashtable;
bundle->fLoaded[i] = TRUE;
+ bundle->fDataStatus[i] = ZERO_ERROR; /* ??? */
return;
}
}
@@ -390,6 +392,7 @@ ResourceBundle::constructForLocale(const PathInfo& path,
for(i = 1; i < kDataCount; ++i) {
fData[i] = 0;
+ fDataStatus[i] = INTERNAL_PROGRAM_ERROR;
fLoaded[i] = FALSE;
}
@@ -397,6 +400,7 @@ ResourceBundle::constructForLocale(const PathInfo& path,
error = ZERO_ERROR;
fData[0] = getHashtableForLocale(fRealLocaleID, returnedLocale, error);
fLoaded[0] = TRUE;
+ fDataStatus[0] = ZERO_ERROR;
if(SUCCESS(error))
fRealLocaleID = returnedLocale;
@@ -581,25 +585,31 @@ const ResourceBundleData*
ResourceBundle::getDataForTag(const UnicodeString& tag,
UErrorCode& err) const
{
+ err = ZERO_ERROR; /* just to make sure there's no fallback/etc left over */
// Iterate over the kDataCount hashtables which may be associated with this
// bundle. At most we have kDataCount, but we may have as few as one.
for(int32_t i = 0; i < kDataCount; ++i) {
- // First try to load up this hashtable, if it hasn't been loaded yet.
+
+ // First try to load up this hashtable, if it hasn't been loaded yet.
if(!fLoaded[i] && fData[i] == 0) {
ResourceBundle* nonconst = (ResourceBundle*)this;
nonconst->fLoaded[i] = TRUE;
if(fLocaleIterator->nextLocale(err)) {
+ UErrorCode getHashtableStatus = ZERO_ERROR;
+
+ nonconst->fDataStatus[i] = err;
nonconst->fData[i] =
- nonconst->getHashtableForLocale(fLocaleIterator->getLocale(), err);
+ nonconst->getHashtableForLocale(fLocaleIterator->getLocale(), getHashtableStatus);
}
}
+
if(fData[i] != 0) {
const ResourceBundleData* s =
(const ResourceBundleData*)uhash_get(fData[i],
tag.hashCode() & 0x7FFFFFFF);
if(s != 0) {
- err = ZERO_ERROR;
+ err = fDataStatus[i]; /* restore the error from the original lookup. */
return s;
}
}
diff --git a/icu4c/source/common/uchar.c b/icu4c/source/common/uchar.c
index eb0aaa8afb6..67a203ae31a 100644
--- a/icu4c/source/common/uchar.c
+++ b/icu4c/source/common/uchar.c
@@ -19,6 +19,7 @@
*
* 4/15/99 Madhu Updated all the function definitions for C Implementation
* 5/20/99 Madhu Added the function u_getVersion()
+* 8/19/1999 srl Upgraded scripts to Unicode3.0
********************************************************************************************
*/
#include "utypes.h"
@@ -4706,75 +4707,96 @@ static const int8_t isLetterMask = (1 << UPPERCASE_LETTER) | (1 << LOWERCASE_LE
static const BlockScriptMap fScriptIndex[] = {
- { 0x0000, 0x007F },
- { 0x0080, 0x00FF },
- { 0x0100, 0x017F },
- { 0x0180, 0x024F },
- { 0x0250, 0x02AF },
- { 0x02B0, 0x02FF },
- { 0x0300, 0x036F },
- { 0x0370, 0x03FF },
- { 0x0400, 0x04FF },
- { 0x0530, 0x058F },
- { 0x0590, 0x05FF },
- { 0x0600, 0x06FF },
- { 0x0900, 0x097F },
- { 0x0980, 0x09FF },
- { 0x0A00, 0x0A7F },
- { 0x0A80, 0x0AFF },
- { 0x0B00, 0x0B7F },
- { 0x0B80, 0x0BFF },
- { 0x0C00, 0x0C7F },
- { 0x0C80, 0x0CFF },
- { 0x0D00, 0x0D7F },
- { 0x0E00, 0x0E7F },
- { 0x0E80, 0x0EFF },
- { 0x0F00, 0x0FBF },
- { 0x10A0, 0x10FF },
- { 0x1100, 0x11FF },
- { 0x1E00, 0x1EFF },
- { 0x1F00, 0x1FFF },
- { 0x2000, 0x206F },
- { 0x2070, 0x209F },
- { 0x20A0, 0x20CF },
- { 0x20D0, 0x20FF },
- { 0x2100, 0x214F },
- { 0x2150, 0x218F },
- { 0x2190, 0x21FF },
- { 0x2200, 0x22FF },
- { 0x2300, 0x23FF },
- { 0x2400, 0x243F },
- { 0x2440, 0x245F },
- { 0x2460, 0x24FF },
- { 0x2500, 0x257F },
- { 0x2580, 0x259F },
- { 0x25A0, 0x25FF },
- { 0x2600, 0x26FF },
- { 0x2700, 0x27BF },
- { 0x3000, 0x303F },
- { 0x3040, 0x309F },
- { 0x30A0, 0x30FF },
- { 0x3100, 0x312F },
- { 0x3130, 0x318F },
- { 0x3190, 0x319F },
- { 0x3200, 0x32FF },
- { 0x3300, 0x33FF },
- { 0x4E00, 0x9FFF },
- { 0xAC00, 0xD7A3 },
- { 0xD800, 0xDB7F },
- { 0xDB80, 0xDBFF },
- { 0xDC00, 0xDFFF },
- { 0xE000, 0xF8FF },
- { 0xF900, 0xFAFF },
- { 0xFB00, 0xFB4F },
- { 0xFB50, 0xFDFF },
- { 0xFE20, 0xFE2F },
- { 0xFE30, 0xFE4F },
- { 0xFE50, 0xFE6F },
- { 0xFE70, 0xFEFE },
- { 0xFEFF, 0xFEFF },
- { 0xFF00, 0xFFEF },
- { 0xFFF0, 0xFFFF }
+/* Generated from the Unicode-3.0-beta blocks.txt file */
+ { 0x0000, 0x007F }, /*BASIC_LATIN */
+ { 0x0080, 0x00FF }, /*LATIN_1_SUPPLEMENT */
+ { 0x0100, 0x017F }, /*LATIN_EXTENDED_A */
+ { 0x0180, 0x024F }, /*LATIN_EXTENDED_B */
+ { 0x0250, 0x02AF }, /*IPA_EXTENSIONS */
+ { 0x02B0, 0x02FF }, /*SPACING_MODIFIER_LETTERS */
+ { 0x0300, 0x036F }, /*COMBINING_DIACRITICAL_MARKS */
+ { 0x0370, 0x03FF }, /*GREEK */
+ { 0x0400, 0x04FF }, /*CYRILLIC */
+ { 0x0530, 0x058F }, /*ARMENIAN */
+ { 0x0590, 0x05FF }, /*HEBREW */
+ { 0x0600, 0x06FF }, /*ARABIC */
+ { 0x0700, 0x074F }, /*SYRIAC */
+ { 0x0780, 0x07BF }, /*THAANA */
+ { 0x0900, 0x097F }, /*DEVANAGARI */
+ { 0x0980, 0x09FF }, /*BENGALI */
+ { 0x0A00, 0x0A7F }, /*GURMUKHI */
+ { 0x0A80, 0x0AFF }, /*GUJARATI */
+ { 0x0B00, 0x0B7F }, /*ORIYA */
+ { 0x0B80, 0x0BFF }, /*TAMIL */
+ { 0x0C00, 0x0C7F }, /*TELUGU */
+ { 0x0C80, 0x0CFF }, /*KANNADA */
+ { 0x0D00, 0x0D7F }, /*MALAYALAM */
+ { 0x0D80, 0x0DFF }, /*SINHALA */
+ { 0x0E00, 0x0E7F }, /*THAI */
+ { 0x0E80, 0x0EFF }, /*LAO */
+ { 0x0F00, 0x0FFF }, /*TIBETAN */
+ { 0x1000, 0x109F }, /*MYANMAR */
+ { 0x10A0, 0x10FF }, /*GEORGIAN */
+ { 0x1100, 0x11FF }, /*HANGUL_JAMO */
+ { 0x1200, 0x137F }, /*ETHIOPIC */
+ { 0x13A0, 0x13FF }, /*CHEROKEE */
+ { 0x1400, 0x167F }, /*UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS */
+ { 0x1680, 0x169F }, /*OGHAM */
+ { 0x16A0, 0x16FF }, /*RUNIC */
+ { 0x1780, 0x17FF }, /*KHMER */
+ { 0x1800, 0x18AF }, /*MONGOLIAN */
+ { 0x1E00, 0x1EFF }, /*LATIN_EXTENDED_ADDITIONAL */
+ { 0x1F00, 0x1FFF }, /*GREEK_EXTENDED */
+ { 0x2000, 0x206F }, /*GENERAL_PUNCTUATION */
+ { 0x2070, 0x209F }, /*SUPERSCRIPTS_AND_SUBSCRIPTS */
+ { 0x20A0, 0x20CF }, /*CURRENCY_SYMBOLS */
+ { 0x20D0, 0x20FF }, /*COMBINING_MARKS_FOR_SYMBOLS */
+ { 0x2100, 0x214F }, /*LETTERLIKE_SYMBOLS */
+ { 0x2150, 0x218F }, /*NUMBER_FORMS */
+ { 0x2190, 0x21FF }, /*ARROWS */
+ { 0x2200, 0x22FF }, /*MATHEMATICAL_OPERATORS */
+ { 0x2300, 0x23FF }, /*MISCELLANEOUS_TECHNICAL */
+ { 0x2400, 0x243F }, /*CONTROL_PICTURES */
+ { 0x2440, 0x245F }, /*OPTICAL_CHARACTER_RECOGNITION */
+ { 0x2460, 0x24FF }, /*ENCLOSED_ALPHANUMERICS */
+ { 0x2500, 0x257F }, /*BOX_DRAWING */
+ { 0x2580, 0x259F }, /*BLOCK_ELEMENTS */
+ { 0x25A0, 0x25FF }, /*GEOMETRIC_SHAPES */
+ { 0x2600, 0x26FF }, /*MISCELLANEOUS_SYMBOLS */
+ { 0x2700, 0x27BF }, /*DINGBATS */
+ { 0x2800, 0x28FF }, /*BRAILLE_PATTERNS */
+ { 0x2E80, 0x2EFF }, /*CJK_RADICALS_SUPPLEMENT */
+ { 0x2F00, 0x2FDF }, /*KANGXI_RADICALS */
+ { 0x2FF0, 0x2FFF }, /*IDEOGRAPHIC_DESCRIPTION_CHARACTERS */
+ { 0x3000, 0x303F }, /*CJK_SYMBOLS_AND_PUNCTUATION */
+ { 0x3040, 0x309F }, /*HIRAGANA */
+ { 0x30A0, 0x30FF }, /*KATAKANA */
+ { 0x3100, 0x312F }, /*BOPOMOFO */
+ { 0x3130, 0x318F }, /*HANGUL_COMPATIBILITY_JAMO */
+ { 0x3190, 0x319F }, /*KANBUN */
+ { 0x31A0, 0x31BF }, /*BOPOMOFO_EXTENDED */
+ { 0x3200, 0x32FF }, /*ENCLOSED_CJK_LETTERS_AND_MONTHS */
+ { 0x3300, 0x33FF }, /*CJK_COMPATIBILITY */
+ { 0x3400, 0x4DB5 }, /*CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A */
+ { 0x4E00, 0x9FFF }, /*CJK_UNIFIED_IDEOGRAPHS */
+ { 0xA000, 0xA48F }, /*YI_SYLLABLES */
+ { 0xA490, 0xA4CF }, /*YI_RADICALS */
+ { 0xAC00, 0xD7A3 }, /*HANGUL_SYLLABLES */
+ { 0xD800, 0xDB7F }, /*HIGH_SURROGATES */
+ { 0xDB80, 0xDBFF }, /*HIGH_PRIVATE_USE_SURROGATES */
+ { 0xDC00, 0xDFFF }, /*LOW_SURROGATES */
+ { 0xE000, 0xF8FF }, /*PRIVATE_USE */
+ { 0xF900, 0xFAFF }, /*CJK_COMPATIBILITY_IDEOGRAPHS */
+ { 0xFB00, 0xFB4F }, /*ALPHABETIC_PRESENTATION_FORMS */
+ { 0xFB50, 0xFDFF }, /*ARABIC_PRESENTATION_FORMS_A */
+ { 0xFE20, 0xFE2F }, /*COMBINING_HALF_MARKS */
+ { 0xFE30, 0xFE4F }, /*CJK_COMPATIBILITY_FORMS */
+ { 0xFE50, 0xFE6F }, /*SMALL_FORM_VARIANTS */
+ { 0xFE70, 0xFEFE }, /*ARABIC_PRESENTATION_FORMS_B */
+ { 0xFEFF, 0xFEFF }, /*SPECIALS */
+ { 0xFF00, 0xFFEF }, /*HALFWIDTH_AND_FULLWIDTH_FORMS */
+ { 0xFFF0, 0xFFFD }, /*SPECIALS_2 = "SCRIPT_COUNT" (really specials) */
+ { 0xFFFF, 0xFFFF } /* END */
};
const UChar cellWidthRanges[] =
{
@@ -4898,6 +4920,8 @@ u_charScript(UChar ch)
for( j = 0; index == -1 && fScriptIndex[j].fFirstCode != 0xFFFF; ++j )
if( fScriptIndex[j].fFirstCode <= ch && ch <= fScriptIndex[j].fLastCode ) {
index = j;
+ if(j == SCRIPT_COUNT) /* "SPECIALS 2" */
+ index = SPECIALS;
}
if(index >= SCRIPT_COUNT) {
returnValue = NO_SCRIPT;
diff --git a/icu4c/source/common/uchar.h b/icu4c/source/common/uchar.h
index 34b2936da42..a38690a147e 100644
--- a/icu4c/source/common/uchar.h
+++ b/icu4c/source/common/uchar.h
@@ -19,6 +19,7 @@
* 03/29/99 helena Updated for C APIs.
* 4/15/99 Madhu Updated for C Implementation and Javadoc
* 5/20/99 Madhu Added the function u_getVersion()
+* 8/19/1999 srl Upgraded scripts to Unicode 3.0
********************************************************************************
*/
@@ -115,7 +116,7 @@ enum UCharCategory
PARAGRAPH_SEPARATOR = 14,
CONTROL = 15,
FORMAT = 16,
- PRIVATE_USE = 17,
+ PRIVATE_USE = 17,
SURROGATE = 18,
DASH_PUNCTUATION = 19,
START_PUNCTUATION = 20,
@@ -128,7 +129,7 @@ enum UCharCategory
OTHER_SYMBOL = 27,
INITIAL_PUNCTUATION = 28,
FINAL_PUNCTUATION = 29,
- GENRERAL_OTHER_TYPES = 30
+ GENERAL_OTHER_TYPES = 30
};
@@ -166,76 +167,137 @@ typedef enum UCharDirection UCharDirection;
* Script range as defined in the Unicode standard.
*/
+/* Generated from Unicode Data files */
enum UCharScript {
- BASIC_LATIN,
- LATIN1_SUPPLEMENT,
- LATIN_EXTENDED_A,
- LATIN_EXTENDED_B,
- IPA_EXTENSION,
- SPACING_MODIFIER,
- COMBINING_DIACRITICAL,
- GREEK,
- CYRILLIC,
- ARMENIAN,
- HEBREW,
- ARABIC,
- DEVANAGARI,
- BENGALI,
- GURMUKHI,
- GUJARATI,
- ORIYA,
- TAMIL,
- TELUGU,
- KANNADA,
- MALAYALAM,
- THAI,
- LAO,
- TIBETAN,
- GEORGIAN,
- HANGUL_JAMO,
- LATIN_EXTENDED_ADDITIONAL,
- GREEK_EXTENDED,
- GENERAL_PUNCTUATION,
- SUPER_SUBSCRIPT,
- CURRENCY_SYMBOL_SCRIPT,
- SYMBOL_COMBINING_MARK,
- LETTERLIKE_SYMBOL,
- NUMBER_FORM,
- ARROW,
- MATH_OPERATOR,
- MISC_TECHNICAL,
- CONTROL_PICTURE,
- OPTICAL_CHARACTER,
- ENCLOSED_ALPHANUMERIC,
- BOXDRAWING,
- BLOCK_ELEMENT,
- GEOMETRIC_SHAPE,
- MISC_SYMBOL,
- DINGBAT,
- CJK_SYMBOL_PUNCTUATION,
- HIRAGANA,
- KATAKANA,
- BOPOMOFO,
- HANGUL_COMPATIBILITY_JAMO,
- KANBUN,
- ENCLOSED_CJK_LETTER_MONTH,
- CJK_COMPATIBILITY,
- CJK_UNIFIED_IDEOGRAPH,
- HANGUL_SYLLABLE,
- HIGH_SURROGATE,
- HIGH_PRIVATE_USE_SURROGATE,
- LOW_SURROGATE,
- PRIVATE_USE_CHARACTERS,
- CJK_COMPATIBILITY_IDEOGRAPH,
- ALPHABETIC_PRESENTATION,
- ARABICP_RESENTATION_A,
- COMBINING_HALFMARK,
- CJK_COMPATIBILITY_FORM,
- SMALL_FORM_VARIANT,
- ARABIC_PRESENTATION_B,
- NO_SCRIPT,
- HALFWIDTH_FULLWIDTH_FORM,
- SCRIPT_COUNT
+/* Script names */
+ BASIC_LATIN,
+ LATIN_1_SUPPLEMENT,
+ LATIN_EXTENDED_A,
+ LATIN_EXTENDED_B,
+ IPA_EXTENSIONS,
+ SPACING_MODIFIER_LETTERS,
+ COMBINING_DIACRITICAL_MARKS,
+ GREEK,
+ CYRILLIC,
+ ARMENIAN,
+ HEBREW,
+ ARABIC,
+ SYRIAC,
+ THAANA,
+ DEVANAGARI,
+ BENGALI,
+ GURMUKHI,
+ GUJARATI,
+ ORIYA,
+ TAMIL,
+ TELUGU,
+ KANNADA,
+ MALAYALAM,
+ SINHALA,
+ THAI,
+ LAO,
+ TIBETAN,
+ MYANMAR,
+ GEORGIAN,
+ HANGUL_JAMO,
+ ETHIOPIC,
+ CHEROKEE,
+ UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS,
+ OGHAM,
+ RUNIC,
+ KHMER,
+ MONGOLIAN,
+ LATIN_EXTENDED_ADDITIONAL,
+ GREEK_EXTENDED,
+ GENERAL_PUNCTUATION,
+ SUPERSCRIPTS_AND_SUBSCRIPTS,
+ CURRENCY_SYMBOLS,
+ COMBINING_MARKS_FOR_SYMBOLS,
+ LETTERLIKE_SYMBOLS,
+ NUMBER_FORMS,
+ ARROWS,
+ MATHEMATICAL_OPERATORS,
+ MISCELLANEOUS_TECHNICAL,
+ CONTROL_PICTURES,
+ OPTICAL_CHARACTER_RECOGNITION,
+ ENCLOSED_ALPHANUMERICS,
+ BOX_DRAWING,
+ BLOCK_ELEMENTS,
+ GEOMETRIC_SHAPES,
+ MISCELLANEOUS_SYMBOLS,
+ DINGBATS,
+ BRAILLE_PATTERNS,
+ CJK_RADICALS_SUPPLEMENT,
+ KANGXI_RADICALS,
+ IDEOGRAPHIC_DESCRIPTION_CHARACTERS,
+ CJK_SYMBOLS_AND_PUNCTUATION,
+ HIRAGANA,
+ KATAKANA,
+ BOPOMOFO,
+ HANGUL_COMPATIBILITY_JAMO,
+ KANBUN,
+ BOPOMOFO_EXTENDED,
+ ENCLOSED_CJK_LETTERS_AND_MONTHS,
+ CJK_COMPATIBILITY,
+ CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A,
+ CJK_UNIFIED_IDEOGRAPHS,
+ YI_SYLLABLES,
+ YI_RADICALS,
+ HANGUL_SYLLABLES,
+ HIGH_SURROGATES,
+ HIGH_PRIVATE_USE_SURROGATES,
+ LOW_SURROGATES,
+ PRIVATE_USE_AREA, /* PRIVATE_USE */
+ CJK_COMPATIBILITY_IDEOGRAPHS,
+ ALPHABETIC_PRESENTATION_FORMS,
+ ARABIC_PRESENTATION_FORMS_A,
+ COMBINING_HALF_MARKS,
+ CJK_COMPATIBILITY_FORMS,
+ SMALL_FORM_VARIANTS,
+ ARABIC_PRESENTATION_FORMS_B,
+ SPECIALS,
+ HALFWIDTH_AND_FULLWIDTH_FORMS,
+ SCRIPT_COUNT,
+ NO_SCRIPT,
+
+
+/* Enums for compatibility with ICU 1.2.4 and previous */
+ LATIN1_SUPPLEMENT=LATIN_1_SUPPLEMENT,
+ IPA_EXTENSION=IPA_EXTENSIONS,
+ SPACING_MODIFIER=SPACING_MODIFIER_LETTERS,
+ COMBINING_DIACRITICAL=COMBINING_DIACRITICAL_MARKS,
+ SUPER_SUBSCRIPT=SUPERSCRIPTS_AND_SUBSCRIPTS,
+ CURRENCY_SYMBOL_SCRIPT=CURRENCY_SYMBOLS,
+ SYMBOL_COMBINING_MARK=COMBINING_MARKS_FOR_SYMBOLS,
+ LETTERLIKE_SYMBOL=LETTERLIKE_SYMBOLS,
+ NUMBER_FORM=NUMBER_FORMS,
+ ARROW=ARROWS,
+ MATH_OPERATOR=MATHEMATICAL_OPERATORS,
+ MISC_TECHNICAL=MISCELLANEOUS_TECHNICAL,
+ CONTROL_PICTURE=CONTROL_PICTURES,
+ OPTICAL_CHARACTER=OPTICAL_CHARACTER_RECOGNITION,
+ ENCLOSED_ALPHANUMERIC=ENCLOSED_ALPHANUMERICS,
+ BOXDRAWING=BOX_DRAWING,
+ BLOCK_ELEMENT=BLOCK_ELEMENTS,
+ GEOMETRIC_SHAPE=GEOMETRIC_SHAPES,
+ MISC_SYMBOL=MISCELLANEOUS_SYMBOLS,
+ DINGBAT=DINGBATS,
+ CJK_SYMBOL_PUNCTUATION=CJK_SYMBOLS_AND_PUNCTUATION,
+ ENCLOSED_CJK_LETTER_MONTH=ENCLOSED_CJK_LETTERS_AND_MONTHS,
+ CJK_UNIFIED_IDEOGRAPH=CJK_UNIFIED_IDEOGRAPHS,
+ HANGUL_SYLLABLE=HANGUL_SYLLABLES,
+ HIGH_SURROGATE=HIGH_SURROGATES,
+ HIGH_PRIVATE_USE_SURROGATE=HIGH_PRIVATE_USE_SURROGATES,
+ LOW_SURROGATE=LOW_SURROGATES,
+ PRIVATE_USE_CHARACTERS=PRIVATE_USE_AREA,
+ CJK_COMPATIBILITY_IDEOGRAPH=CJK_COMPATIBILITY_IDEOGRAPHS,
+ ALPHABETIC_PRESENTATION=ALPHABETIC_PRESENTATION_FORMS,
+ ARABIC_PRESENTATION_A=ARABIC_PRESENTATION_FORMS_A,
+ COMBINING_HALFMARK=COMBINING_HALF_MARKS,
+ CJK_COMPATIBILITY_FORM=CJK_COMPATIBILITY_FORMS,
+ SMALL_FORM_VARIANT=SMALL_FORM_VARIANTS,
+ ARABIC_PRESENTATION_B=ARABIC_PRESENTATION_FORMS_B,
+ HALFWIDTH_FULLWIDTH_FORM=HALFWIDTH_AND_FULLWIDTH_FORMS
};
typedef enum UCharScript UCharScript;
diff --git a/icu4c/source/common/ucmp16.h b/icu4c/source/common/ucmp16.h
index 006adc7f85d..fac61f06c0d 100644
--- a/icu4c/source/common/ucmp16.h
+++ b/icu4c/source/common/ucmp16.h
@@ -76,7 +76,7 @@
* @see CompactIntArray
* @see CompactCharArray
* @see CompactStringArray
- * @version $Revision: 1.1 $ 8/25/98
+ * @version $Revision: 1.2 $ 8/25/98
* @author Helena Shih
*/
diff --git a/icu4c/source/common/ucmp32.h b/icu4c/source/common/ucmp32.h
index 59b90bb31a2..3f63be064d2 100644
--- a/icu4c/source/common/ucmp32.h
+++ b/icu4c/source/common/ucmp32.h
@@ -75,7 +75,7 @@
* @see CompactIntArray
* @see CompactCharArray
* @see CompactStringArray
- * @version $Revision: 1.1 $ 8/25/98
+ * @version $Revision: 1.2 $ 8/25/98
* @author Helena Shih
*/
/*====================================*/
diff --git a/icu4c/source/common/ucnv_cnv.c b/icu4c/source/common/ucnv_cnv.c
index e2775d19a05..67c395db6ff 100644
--- a/icu4c/source/common/ucnv_cnv.c
+++ b/icu4c/source/common/ucnv_cnv.c
@@ -495,7 +495,7 @@ void T_UConverter_fromUnicode_LATIN_1 (UConverter * _this,
else
{
*err = INVALID_CHAR_FOUND;
- _this->invalidUCharBuffer[0] = (char) mySource[mySourceIndex++];
+ _this->invalidUCharBuffer[0] = (UChar) mySource[mySourceIndex++];
_this->invalidUCharLength = 1;
/* Needed explicit cast for myTarget on MVS to make compiler happy - JJD */
@@ -565,7 +565,7 @@ void T_UConverter_fromUnicode_SBCS (UConverter * _this,
{
*err = INVALID_CHAR_FOUND;
- _this->invalidUCharBuffer[0] = mySource[mySourceIndex - 1];
+ _this->invalidUCharBuffer[0] = (UChar)mySource[mySourceIndex - 1];
_this->invalidUCharLength = 1;
/* Needed explicit cast for myTarget on MVS to make compiler happy - JJD */
@@ -2058,7 +2058,7 @@ void T_UConverter_fromUnicode_DBCS (UConverter * _this,
else
{
*err = INVALID_CHAR_FOUND;
- _this->invalidUCharBuffer[0] = (char) mySourceChar;
+ _this->invalidUCharBuffer[0] = (UChar) mySourceChar;
_this->invalidUCharLength = 1;
@@ -2654,7 +2654,7 @@ void T_UConverter_toUnicode_UTF8 (UConverter * _this,
}
else
{
- _this->invalidUCharBuffer[0] = (char) ch;
+ _this->invalidUCharBuffer[0] = (UChar) ch;
_this->invalidUCharLength = 1;
*err = INDEX_OUTOFBOUNDS_ERROR;
}
@@ -2795,7 +2795,7 @@ void T_UConverter_toUnicode_UTF8_OFFSETS_LOGIC (UConverter * _this,
}
else
{
- _this->invalidUCharBuffer[0] = (char) ch;
+ _this->invalidUCharBuffer[0] = (UChar) ch;
_this->invalidUCharLength = 1;
*err = INDEX_OUTOFBOUNDS_ERROR;
}
diff --git a/icu4c/source/common/utypes.h b/icu4c/source/common/utypes.h
index f6e3ecdbdf1..f4eef1954e7 100644
--- a/icu4c/source/common/utypes.h
+++ b/icu4c/source/common/utypes.h
@@ -85,7 +85,7 @@
#ifdef XP_CPLUSPLUS
# define C_FUNC extern "C"
-# ifdef OS390OE
+# ifdef OS390
# define CAPI C_FUNC
# define U_EXPORT2 U_EXPORT
# else
@@ -94,7 +94,7 @@
# endif
#else
#define C_FUNC
-#if defined(OS390OE)
+#if defined(OS390)
# define CAPI
# define U_EXPORT2 U_EXPORT
#else
diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix
index a4722edbed7..9f23c8252d4 100644
--- a/icu4c/source/config/mh-aix
+++ b/icu4c/source/config/mh-aix
@@ -1,3 +1,4 @@
+## -*-makefile-*-
## Aix-specific setup (for xlC)
## Commands to generate dependency files
@@ -26,6 +27,11 @@ LD_RPATH_PRE=
## Shared object suffix
SO= a
+## Link commands to link to ICU libs
+LIBICU-UC= -L$(top_builddir)/common -licu-uc
+LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n
+LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
+
## Special AIX rules
## Build archive from shared object
diff --git a/icu4c/source/config/mh-hpux-acc b/icu4c/source/config/mh-hpux-acc
index f836695adb3..c6287b339dc 100644
--- a/icu4c/source/config/mh-hpux-acc
+++ b/icu4c/source/config/mh-hpux-acc
@@ -1,3 +1,4 @@
+## -*-makefile-*-
## HP/UX-specific setup using aCC
## Commands to generate dependency files
@@ -26,6 +27,11 @@ LD_RPATH_PRE=
## Shared object suffix
SO= sl
+## Link commands to link to ICU libs
+LIBICU-UC= -L$(top_builddir)/common -licu-uc
+LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n
+LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
+
## Compilation rules
%.o : $(srcdir)/%.c
$(COMPILE.c) -o $@ $<
diff --git a/icu4c/source/config/mh-hpux-cc b/icu4c/source/config/mh-hpux-cc
index 0a59724feeb..3a54efc5b61 100644
--- a/icu4c/source/config/mh-hpux-cc
+++ b/icu4c/source/config/mh-hpux-cc
@@ -1,3 +1,4 @@
+## -*-makefile-*-
## HP/UX-specific setup using CC
## Commands to generate dependency files
@@ -27,6 +28,11 @@ LD_RPATH_PRE=
## Shared object suffix
SO= sl
+## Link commands to link to ICU libs
+LIBICU-UC= -L$(top_builddir)/common -licu-uc
+LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n
+LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
+
## Compilation rules
%.o : $(srcdir)/%.c
$(COMPILE.c) -o $@ $<
diff --git a/icu4c/source/config/mh-linux b/icu4c/source/config/mh-linux
index 359959055f0..892a67090ce 100644
--- a/icu4c/source/config/mh-linux
+++ b/icu4c/source/config/mh-linux
@@ -1,3 +1,4 @@
+## -*-makefile-*-
## Linux-specific setup
## Commands to generate dependency files
@@ -23,6 +24,11 @@ LD_RPATH_PRE= -Wl,-rpath,
## Shared object suffix
SO= so
+## Link commands to link to ICU libs
+LIBICU-UC= -L$(top_builddir)/common -licu-uc
+LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n
+LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
+
## Compilation rules
%.o : $(srcdir)/%.c
$(COMPILE.c) -o $@ $<
diff --git a/icu4c/source/config/mh-os390 b/icu4c/source/config/mh-os390
index e4293e87d4e..9ed6d27f438 100644
--- a/icu4c/source/config/mh-os390
+++ b/icu4c/source/config/mh-os390
@@ -1,7 +1,8 @@
+## -*-makefile-*-
## 390-specific setup
CFLAGS390= -W0,"langlvl(extended)" -g -Wc,dll,expo
-DEFS390= -DIBM_OS390 -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
+DEFS390= -D_OPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
ARFLAGS= -cr
@@ -17,7 +18,7 @@ COMPILE.cc= _CXX_CXXSUFFIX="cpp" _CXX_STEPS="-1" $(CXX) $(DEFS) $(CPPFLAGS) $(CP
LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)
-## Commands for shared library (dll)
+## Commands for shared library (dll)
SHLIB.c= $(LINK.c) -Wl,dll
SHLIB.cc= $(LINK.cc) -Wl,dll
@@ -27,6 +28,11 @@ LD_RPATH= -I
## Shared object suffix (switch to dll for shared library build)
SO= dll
+## Link commands to link to ICU libs
+LIBICU-UC= $(top_builddir)/common/libicu-uc.x
+LIBICU-I18N= $(top_builddir)/i18n/libicu-i18n.x
+LIBCTESTFW= $(top_builddir)/tools/ctestfw/libctestfw.x
+
## Special 390 rules
## Build archive from object
diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris
index 13a9da9c9ff..3a72a5ae75b 100644
--- a/icu4c/source/config/mh-solaris
+++ b/icu4c/source/config/mh-solaris
@@ -1,3 +1,4 @@
+## -*-makefile-*-
## Solaris-specific setup using Sun's workshop compilers
## Commands to generate dependency files
@@ -25,6 +26,11 @@ LD_RPATH_PRE=
## Shared object suffix
SO= so
+## Link commands to link to ICU libs
+LIBICU-UC= -L$(top_builddir)/common -licu-uc
+LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n
+LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
+
## Compilation rules
%.o : $(srcdir)/%.c
$(COMPILE.c) -o $@ $<
diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc
index 549226b5b10..4328904e711 100644
--- a/icu4c/source/config/mh-solaris-gcc
+++ b/icu4c/source/config/mh-solaris-gcc
@@ -1,3 +1,4 @@
+## -*-makefile-*-
## Solaris-specific setup using gcc
## Commands to generate dependency files
@@ -23,6 +24,11 @@ LD_RPATH_PRE=
## Shared object suffix
SO= so
+## Link commands to link to ICU libs
+LIBICU-UC= -L$(top_builddir)/common -licu-uc
+LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n
+LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
+
## Compilation rules
%.o : $(srcdir)/%.c
$(COMPILE.c) -o $@ $<
diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in
index e6758ec23bc..62946c460d2 100644
--- a/icu4c/source/configure.in
+++ b/icu4c/source/configure.in
@@ -1,3 +1,4 @@
+dnl -*-m4-*-
dnl configure.in for ICU
dnl Stephen F. Booth
@@ -6,7 +7,7 @@ AC_INIT(common/utypes.h)
AC_CONFIG_HEADER(common/icucfg.h)
PACKAGE="icu"
AC_SUBST(PACKAGE)
-VERSION="1.2.2"
+VERSION="1.2.5"
AC_SUBST(VERSION)
dnl Checks for programs
@@ -145,6 +146,7 @@ case "${host}" in
*-*-linux*) platform=LINUX ;;
*-*-aix*) platform=AIX ;;
*-*-hpux*) platform=HPUX ;;
+ *-*-os390*) platform=OS390 ;;
*) platform=UNKNOWN ;;
esac
AC_SUBST(platform)
@@ -157,6 +159,7 @@ case "${host}" in
*-*-linux*) ld_rpath_suf=" " ;;
*-*-aix*) ld_rpath_suf="" ;;
*-*-hpux*) ld_rpath_suf=":" ;;
+ *-*-os390*) ld_rpath_suf=" " ;;
*) ld_rpath_suf="" ;;
esac
AC_SUBST(ld_rpath_suf)
diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/extra/ustdio/Makefile.in
index d29d457da0b..cf9f78fb167 100644
--- a/icu4c/source/extra/ustdio/Makefile.in
+++ b/icu4c/source/extra/ustdio/Makefile.in
@@ -52,8 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n
-LIBS = @LIBS@ -L$(libdir) -L$(top_builddir)/common -licu-uc \
- -L$(top_builddir)/i18n -licu-i18n
+LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@
OBJECTS = locbund.o loccache.o ufile.o ufmt_cmn.o uprintf.o uprntf_p.o \
uscanf.o uscanf_p.o uscanset.o ustdio.o
diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in
index 1990b90f5be..406deb4639f 100644
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@ -51,7 +51,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/common
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ $(LD_RPATH)$(LD_RPATH_PRE)$(libdir)
-LIBS = @LIBS@ -L$(top_builddir)/common -licu-uc
+LIBS = $(LIBICU-UC) @LIBS@
OBJECTS = brkiter.o calendar.o chbkdat.o choicfmt.o colcache.o \
coleitr.o coll.o colrules.o datefmt.o dcfmtsym.o decimfmt.o dtfmtsym.o \
diff --git a/icu4c/source/mkinstalldirs b/icu4c/source/mkinstalldirs
index ef5383b2cdb..0311a5dcaaf 100644
--- a/icu4c/source/mkinstalldirs
+++ b/icu4c/source/mkinstalldirs
@@ -4,7 +4,7 @@
# Created: 1993-05-16
# Public domain
-# $Id: mkinstalldirs,v 1.1 1999/08/16 21:50:52 cvs Exp $
+# $Id: mkinstalldirs,v 1.2 1999/09/03 22:08:46 sbooth Exp $
errstatus=0
diff --git a/icu4c/source/samples/XMLConverter/Makefile.in b/icu4c/source/samples/XMLConverter/Makefile.in
index fccd0dc4bd8..f6f69464c21 100644
--- a/icu4c/source/samples/XMLConverter/Makefile.in
+++ b/icu4c/source/samples/XMLConverter/Makefile.in
@@ -51,7 +51,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common
-LIBS = -L$(top_builddir)/common -licu-uc @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@
OBJECTS = XMLConverter.o
diff --git a/icu4c/source/samples/XMLConverter/samples/created/test b/icu4c/source/samples/XMLConverter/samples/created/test
new file mode 100644
index 00000000000..deff14d68b6
--- /dev/null
+++ b/icu4c/source/samples/XMLConverter/samples/created/test
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+]>
+
+
+ This is a white tiger in Mirage!!
+
+
+
+
+
+
+
diff --git a/icu4c/source/samples/cal/Makefile.in b/icu4c/source/samples/cal/Makefile.in
index 2b9d027c8c9..7c3b10ec594 100644
--- a/icu4c/source/samples/cal/Makefile.in
+++ b/icu4c/source/samples/cal/Makefile.in
@@ -52,8 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n
-LIBS = -L$(top_builddir)/common -licu-uc \
- -L$(top_builddir)/i18n -licu-i18n @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@ @LIB_M@
OBJECTS = uprint.o cal.o
diff --git a/icu4c/source/samples/date/Makefile.in b/icu4c/source/samples/date/Makefile.in
index 5478e91f6df..3f74e7540d3 100644
--- a/icu4c/source/samples/date/Makefile.in
+++ b/icu4c/source/samples/date/Makefile.in
@@ -52,8 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n
-LIBS = -L$(top_builddir)/common -licu-uc \
- -L$(top_builddir)/i18n -licu-i18n @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@ @LIB_M@
OBJECTS = uprint.o date.o
diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in
index 3aefe2dc37e..904f8614f5f 100644
--- a/icu4c/source/test/cintltst/Makefile.in
+++ b/icu4c/source/test/cintltst/Makefile.in
@@ -52,7 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/tools/ctestfw
-LIBS =-L$(top_builddir)/common -licu-uc -L$(top_builddir)/i18n -licu-i18n -L$(top_builddir)/tools/ctestfw -lctestfw @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) $(LIBICU-I18N) $(LIBCTESTFW) @LIBS@ @LIB_M@
OBJECTS = callcoll.o calltest.o capitst.o cbiapts.o cbkittst.o \
ccaltst.o ccapitst.o ccolltst.o cconvtst.o ccurrtst.o cdantst.o \
@@ -92,7 +92,7 @@ distclean-local: clean-local
rm -f Makefile $(DEPS)
check-local: $(TARGET)
- ICU_DATA=$(top_builddir)/../data/ TZ=PST8PDT ./$(TARGET)
+ HOME=$(top_builddir)/../.. ICU_DATA=$(top_builddir)/../data/ TZ=PST8PDT ./$(TARGET)
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
diff --git a/icu4c/source/test/cintltst/crestst.c b/icu4c/source/test/cintltst/crestst.c
index 009740cd744..a2a63135a2c 100644
--- a/icu4c/source/test/cintltst/crestst.c
+++ b/icu4c/source/test/cintltst/crestst.c
@@ -35,6 +35,8 @@
#include "crestst.h"
#include "ctest.h"
+void TestFallback();
+
/*****************************************************************************/
/**
@@ -86,12 +88,8 @@ typedef enum E_Where E_Where;
/*****************************************************************************/
#define CONFIRM_EQ(actual,expected) if (u_strcmp(expected,actual)==0){ record_pass(); } else { record_fail(); log_err("%s returned %s instead of %s\n", action, austrdup(actual), austrdup(expected)); pass=FALSE; }
-#ifdef _DEBUG
-#define CONFIRM_ErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); log_err("%s returned %s instead of %s\n", action, myErrorName(actual), myErrorName(expected)); pass=FALSE; }
-#else
-#define CONFIRM_ErrorCode(actual,expected)
-#endif
+#define CONFIRM_ErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); log_err("%s returned %s instead of %s\n", action, myErrorName(actual), myErrorName(expected)); pass=FALSE; }
/* Array of our test objects */
@@ -120,6 +118,8 @@ param[] =
static int32_t bundles_count = sizeof(param) / sizeof(param[0]);
+
+
/***************************************************************************************/
/* Array of our test objects */
@@ -131,6 +131,7 @@ void addResourceBundleTest(TestNode** root)
addTest(root, &TestConstruction1, "tsutil/crestst/TestConstruction1");
addTest(root, &TestConstruction2, "tsutil/crestst/TestConstruction2");
addTest(root, &TestResourceBundles, "tsutil/crestst/TestResourceBundle");
+ addTest(root, &TestFallback, "tsutil/crestst/TestFallback");
}
@@ -148,6 +149,7 @@ void TestResourceBundles()
testTag("only_in_te_IN", FALSE, FALSE, TRUE);
testTag("in_te_te_IN", FALSE, TRUE, TRUE);
testTag("nonexistent", FALSE, FALSE, FALSE);
+
log_verbose("Passed:= %d Failed= %d \n", pass, fail);
}
@@ -279,6 +281,7 @@ bool_t testTag(const char* frag,
char buf[5];
char item_tag[10];
int32_t i,j,k,row,col;
+ int32_t actual_bundle;
int32_t count = 0;
int32_t row_count=0;
int32_t column_count=0;
@@ -304,13 +307,39 @@ bool_t testTag(const char* frag,
CONFIRM_ErrorCode(status,param[i].expected_constructor_status);
+ if(i == 5)
+ actual_bundle = 0; /* ne -> default */
+ else if(i == 3)
+ actual_bundle = 1; /* te_NE -> te */
+ else if(i == 4)
+ actual_bundle = 2; /* te_IN_NE -> te_IN */
+ else
+ actual_bundle = i;
+
expected_resource_status = MISSING_RESOURCE_ERROR;
for (j=e_te_IN; j>=e_Default; --j)
{
- if (is_in[j] && param[i].inherits[j])
+ if (is_in[j] && param[i].inherits[j])
{
- expected_resource_status = ZERO_ERROR;
- break;
+
+ if(j == actual_bundle) /* it's in the same bundle OR it's a nonexistent=default bundle (5) */
+ expected_resource_status = ZERO_ERROR;
+ else if(j == 0)
+ expected_resource_status = USING_DEFAULT_ERROR;
+ else
+ expected_resource_status = USING_FALLBACK_ERROR;
+
+ log_verbose("%s[%d]::%s: in<%d:%s> inherits<%d:%s>. actual_bundle=%s\n",
+ param[i].name,
+ i,
+ frag,
+ j,
+ is_in[j]?"Yes":"No",
+ j,
+ param[i].inherits[j]?"Yes":"No",
+ param[actual_bundle].name);
+
+ break;
}
}
@@ -346,18 +375,21 @@ bool_t testTag(const char* frag,
ures_get(theBundle, tag, &status);
if(SUCCESS(status))
- string=ures_get(theBundle, tag, &status);
-
+ {
+ status = ZERO_ERROR;
+ string=ures_get(theBundle, tag, &status);
+ }
+ log_verbose("%s got %d, expected %d\n", action, status, expected_resource_status);
CONFIRM_ErrorCode(status, expected_resource_status);
if(SUCCESS(status)){
- expected_string=(UChar*)malloc(sizeof(UChar)*(u_strlen(base) + 3));
- u_strcpy(expected_string,base);
-
-
+ expected_string=(UChar*)malloc(sizeof(UChar)*(u_strlen(base) + 3));
+ u_strcpy(expected_string,base);
+
+
}
else
{
@@ -398,7 +430,10 @@ bool_t testTag(const char* frag,
string=ures_getArrayItem(theBundle, tag, index, &status);
- expected_status = (index >= 0 && index < count) ? ZERO_ERROR : MISSING_RESOURCE_ERROR;
+ /* how could 'index==j' ever be >= count ? */
+ expected_status = (index >= 0 && index < count) ? expected_resource_status : MISSING_RESOURCE_ERROR;
+
+ log_verbose("Status for %s was %d, expected %d\n", action, status, expected_status);
CONFIRM_ErrorCode(status,expected_status);
@@ -447,25 +482,25 @@ bool_t testTag(const char* frag,
expected_status = (row >= 0 && row < row_count && col >= 0 && col < column_count) ?
- ZERO_ERROR : MISSING_RESOURCE_ERROR;
+ expected_resource_status : MISSING_RESOURCE_ERROR;
CONFIRM_ErrorCode(status,expected_status);
if (SUCCESS(status))
- {
+ {
UChar element[3];
u_strcpy(expected_string,base);
u_uastrcpy(element,itoa1(row,buf));
u_strcat(expected_string, element);
u_uastrcpy(element,itoa1(col,buf));
u_strcat(expected_string, element);
-
- }
+
+ }
else
- {
-
+ {
+
u_strcpy(expected_string,kERROR);
- }
+ }
CONFIRM_EQ(string,expected_string);
}
}
@@ -500,24 +535,24 @@ bool_t testTag(const char* frag,
if (index < 0)
{
- CONFIRM_ErrorCode(status,MISSING_RESOURCE_ERROR);
+ CONFIRM_ErrorCode(status,MISSING_RESOURCE_ERROR);
}
else
- {
+ {
UChar* element;
if (strcmp(myErrorName(status),"MISSING_RESOURCE_ERROR")!=0) {
- count++;
- u_strcpy(expected_string,base);
- element=(UChar*)malloc(sizeof(UChar) * (strlen(buf)+1));
- u_uastrcpy(element,buf);
- u_strcat(expected_string,element);
- free(element);
- CONFIRM_EQ(string,expected_string);
+ count++;
+ u_strcpy(expected_string,base);
+ element=(UChar*)malloc(sizeof(UChar) * (strlen(buf)+1));
+ u_uastrcpy(element,buf);
+ u_strcat(expected_string,element);
+ free(element);
+ CONFIRM_EQ(string,expected_string);
}
- }
-
+ }
+
}
-
+
free(expected_string);
free(base);
ures_close(theBundle);
@@ -535,4 +570,55 @@ void record_fail()
++fail;
}
+/**
+ * Test to make sure that the USING_FALLBACK_ERROR and USING_DEFAULT_ERROR
+ * are set correctly
+ */
+void TestFallback()
+{
+ UErrorCode status = ZERO_ERROR;
+ UResourceBundle *fr_FR = NULL;
+ const UChar *junk; /* ignored */
+
+ log_verbose("Opening fr_FR..");
+ fr_FR = ures_open(NULL, "fr_FR", &status);
+ if(FAILURE(status))
+ {
+ log_err("Couldn't open fr_FR - %d\n", status);
+ return;
+ }
+
+ status = ZERO_ERROR;
+
+
+ /* clear it out.. just do some calls to get the gears turning */
+ junk = ures_get(fr_FR, "LocaleID", &status);
+ status = ZERO_ERROR;
+ junk = ures_get(fr_FR, "LocaleString", &status);
+ status = ZERO_ERROR;
+ junk = ures_get(fr_FR, "LocaleID", &status);
+ status = ZERO_ERROR;
+
+ /* OK first one. This should be a Default value. */
+ junk = ures_get(fr_FR, "Version", &status);
+ if(status != USING_DEFAULT_ERROR)
+ {
+ log_err("Expected USING_DEFAULT_ERROR when trying to get Version from fr_FR, got %d\n",
+ status);
+ }
+
+ status = ZERO_ERROR;
+
+ /* and this is a Fallback, to fr */
+ junk = ures_get(fr_FR, "ShortLanguage", &status);
+ if(status != USING_FALLBACK_ERROR)
+ {
+ log_err("Expected USING_FALLBACK_ERROR when trying to get ShortLanguage from fr_FR, got %d\n",
+ status);
+ }
+
+ status = ZERO_ERROR;
+
+ ures_close(fr_FR);
+}
diff --git a/icu4c/source/test/cintltst/nccbtst.c b/icu4c/source/test/cintltst/nccbtst.c
index 27eb3ea91bd..508d28cd7aa 100644
--- a/icu4c/source/test/cintltst/nccbtst.c
+++ b/icu4c/source/test/cintltst/nccbtst.c
@@ -614,8 +614,8 @@ bool_t testConvertToUnicode( const char *source, int sourcelen, const UChar *exp
if(status == INVALID_CHAR_FOUND || status == ILLEGAL_CHAR_FOUND )
{
for(p = junkout;p=(expected)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x >= " << (expected) << endl; pass=FALSE; }
#define CONFIRM_NE(actual,expected) if ((expected)!=(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << (actual) << " instead of x != " << (expected) << endl; pass=FALSE; }
+
#ifdef _DEBUG
#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << errorName(actual) << " instead of " << errorName(expected) << endl; pass=FALSE; }
#else
-#define CONFIRM_UErrorCode(actual,expected)
+#define CONFIRM_UErrorCode(actual,expected) if ((expected)==(actual)) { record_pass(); } else { record_fail(); OUT << action << " returned " << actual << " instead of " << expected << endl; pass=FALSE; }
#endif
-
//***************************************************************************************
/**
@@ -344,7 +344,7 @@ ResourceBundleTest::testTag(const char* frag,
UnicodeString tag;
UnicodeString action;
- int32_t i,j,row,col;
+ int32_t i,j,row,col, actual_bundle;
int32_t index;
const char *directory;
@@ -359,12 +359,28 @@ ResourceBundleTest::testTag(const char* frag,
ResourceBundle theBundle( directory, *param[i].locale, status);
CONFIRM_UErrorCode(status,param[i].expected_constructor_status);
+ if(i == 5)
+ actual_bundle = 0; /* ne -> default */
+ else if(i == 3)
+ actual_bundle = 1; /* te_NE -> te */
+ else if(i == 4)
+ actual_bundle = 2; /* te_IN_NE -> te_IN */
+ else
+ actual_bundle = i;
+
+
UErrorCode expected_resource_status = MISSING_RESOURCE_ERROR;
for (j=e_te_IN; j>=e_Default; --j)
{
if (is_in[j] && param[i].inherits[j])
- {
- expected_resource_status = ZERO_ERROR;
+ {
+ if(j == actual_bundle) /* it's in the same bundle OR it's a nonexistent=default bundle (5) */
+ expected_resource_status = ZERO_ERROR;
+ else if(j == 0)
+ expected_resource_status = USING_DEFAULT_ERROR;
+ else
+ expected_resource_status = USING_FALLBACK_ERROR;
+
break;
}
}
@@ -453,7 +469,7 @@ ResourceBundleTest::testTag(const char* frag,
status = ZERO_ERROR;
string = kERROR;
theBundle.getArrayItem(tag, index, string, status);
- expected_status = (index >= 0 && index < count) ? ZERO_ERROR : MISSING_RESOURCE_ERROR;
+ expected_status = (index >= 0 && index < count) ? expected_resource_status : MISSING_RESOURCE_ERROR;
CONFIRM_UErrorCode(status,expected_status);
if (SUCCESS(status))
@@ -527,7 +543,7 @@ ResourceBundleTest::testTag(const char* frag,
string = kERROR;
theBundle.get2dArrayItem(tag, row, col, string, status);
expected_status = (row >= 0 && row < row_count && col >= 0 && col < column_count) ?
- ZERO_ERROR : MISSING_RESOURCE_ERROR;
+ expected_resource_status: MISSING_RESOURCE_ERROR;
CONFIRM_UErrorCode(status,expected_status);
if (SUCCESS(status))
diff --git a/icu4c/source/tools/gencol/Makefile.in b/icu4c/source/tools/gencol/Makefile.in
index 7d5aac8d83e..ee5683a8e65 100644
--- a/icu4c/source/tools/gencol/Makefile.in
+++ b/icu4c/source/tools/gencol/Makefile.in
@@ -52,8 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/i18n
-LIBS = -L$(libdir) -L$(top_builddir)/common -licu-uc \
- -L$(top_builddir)/i18n -licu-i18n @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) $(LIBICU-I18N) @LIBS@ @LIB_M@
OBJECTS = gencol.o
diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in
index 858c3f799ea..55786bef21f 100644
--- a/icu4c/source/tools/genrb/Makefile.in
+++ b/icu4c/source/tools/genrb/Makefile.in
@@ -52,7 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common
-LIBS = -L$(libdir) -L$(top_builddir)/common -licu-uc @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@
OBJECTS = error.o genrb.o ustr.o parse.o read.o write.o list.o \
rblist.o ufile.o ustdio.o util.o
diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in
index 63987fa5cc8..fed3c0161f7 100644
--- a/icu4c/source/tools/makeconv/Makefile.in
+++ b/icu4c/source/tools/makeconv/Makefile.in
@@ -52,7 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common
-LIBS = -L$(libdir) -L$(top_builddir)/common -licu-uc @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@
OBJECTS = makeconv.o
@@ -107,7 +107,7 @@ install-local: target-clean-local all-local
$(mkinstalldirs) $(sbindir)
$(INSTALL) $(TARGET) $(sbindir)/$(TARGET)
$(mkinstalldirs) $(pkgdatadir)/$(VERSION)
- @list='$(notdir $(CNV_FILES))'; for file in $$list; do \
+ @list='$(notdir $(CNV_FILES)) convrtrs.txt'; for file in $$list; do \
echo $(INSTALL_DATA) $(top_srcdir)/../data/$$file $(pkgdatadir)/$(VERSION)/$$file; \
$(INSTALL_DATA) $(top_srcdir)/../data/$$file $(pkgdatadir)/$(VERSION)/$$file; \
done
diff --git a/icu4c/source/tools/rbdump/Makefile.in b/icu4c/source/tools/rbdump/Makefile.in
index 0903c49c329..f359de4140c 100644
--- a/icu4c/source/tools/rbdump/Makefile.in
+++ b/icu4c/source/tools/rbdump/Makefile.in
@@ -52,7 +52,7 @@ CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
LDFLAGS = @LDFLAGS@ \
$(LD_RPATH)$(LD_RPATH_PRE)$(libdir)@ld_rpath_suf@$(LD_RPATH_PRE)$(top_builddir)/common
-LIBS = -L$(libdir) -L$(top_builddir)/common -licu-uc @LIBS@ @LIB_M@
+LIBS = $(LIBICU-UC) @LIBS@ @LIB_M@
OBJECTS = read.o parse.o uprint.o
diff --git a/icu4c/source/tools/ulxfrm/ucmp16.h b/icu4c/source/tools/ulxfrm/ucmp16.h
index 696fd317347..598c1b36222 100644
--- a/icu4c/source/tools/ulxfrm/ucmp16.h
+++ b/icu4c/source/tools/ulxfrm/ucmp16.h
@@ -76,7 +76,7 @@
* @see CompactIntArray
* @see CompactCharArray
* @see CompactStringArray
- * @version $Revision: 1.1 $ 8/25/98
+ * @version $Revision: 1.2 $ 8/25/98
* @author Helena Shih
*/