firefox: updated to 51.0

[ports/opt-arm.git] / icu / icu-58.1-iterator.patch

source: http://bugs.icu-project.org/trac/changeset/39484/\r
\r
\r
Index: icu/common/ulist.c\r
===================================================================\r
--- icu/common/ulist.c	(revision 39483)\r
+++ icu/common/ulist.c	(revision 39484)\r
@@ -30,5 +30,4 @@\r
     \r
     int32_t size;\r
-    int32_t currentIndex;\r
 };\r
 \r
@@ -52,5 +51,4 @@\r
     newList->tail = NULL;\r
     newList->size = 0;\r
-    newList->currentIndex = -1;\r
     \r
     return newList;\r
@@ -81,6 +79,7 @@\r
         p->next->previous = p->previous;\r
     }\r
-    list->curr = NULL;\r
-    list->currentIndex = 0;\r
+    if (p == list->curr) {\r
+        list->curr = p->next;\r
+    }\r
     --list->size;\r
     if (p->forceDelete) {\r
@@ -151,5 +150,4 @@\r
         list->head->previous = newItem;\r
         list->head = newItem;\r
-        list->currentIndex++;\r
     }\r
     \r
@@ -194,5 +192,4 @@\r
     curr = list->curr;\r
     list->curr = curr->next;\r
-    list->currentIndex++;\r
     \r
     return curr->data;\r
@@ -210,5 +207,4 @@\r
     if (list != NULL) {\r
         list->curr = list->head;\r
-        list->currentIndex = 0;\r
     }\r
 }\r
@@ -273,3 +269,2 @@\r
     return (UList *)(en->context);\r
 }\r
-\r
Index: icu/i18n/ucol_res.cpp\r
===================================================================\r
--- icu/i18n/ucol_res.cpp	(revision 39483)\r
+++ icu/i18n/ucol_res.cpp	(revision 39484)\r
@@ -681,4 +681,5 @@\r
     }\r
     memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));\r
+    ulist_resetList(sink.values);  // Initialize the iterator.\r
     en->context = sink.values;\r
     sink.values = NULL;  // Avoid deletion in the sink destructor.\r
Index: icu/test/intltest/apicoll.cpp\r
===================================================================\r
--- icu/test/intltest/apicoll.cpp	(revision 39483)\r
+++ icu/test/intltest/apicoll.cpp	(revision 39484)\r
@@ -82,14 +82,7 @@\r
     col = Collator::createInstance(Locale::getEnglish(), success);\r
     if (U_FAILURE(success)){\r
-        errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success));\r
-        return;\r
-    }\r
-\r
-    StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success);\r
-    if (U_FAILURE(success)){\r
-        errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success));\r
-        return;\r
-    }\r
-    delete kwEnum;\r
+        errcheckln(success, "English Collator creation failed. - %s", u_errorName(success));\r
+        return;\r
+    }\r
 \r
     col->getVersion(versionArray);\r
@@ -230,4 +223,27 @@\r
     delete aFrCol;\r
     delete junk;\r
+}\r
+\r
+void CollationAPITest::TestKeywordValues() {\r
+    IcuTestErrorCode errorCode(*this, "TestKeywordValues");\r
+    LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(), errorCode));\r
+    if (errorCode.logIfFailureAndReset("English Collator creation failed")) {\r
+        return;\r
+    }\r
+\r
+    LocalPointer<StringEnumeration> kwEnum(\r
+        col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode));\r
+    if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) {\r
+        return;\r
+    }\r
+    assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0);\r
+    const char *kw;\r
+    UBool hasStandard = FALSE;\r
+    while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {\r
+        if (strcmp(kw, "standard") == 0) {\r
+            hasStandard = TRUE;\r
+        }\r
+    }\r
+    assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard);\r
 }\r
 \r
@@ -2467,4 +2483,5 @@\r
     TESTCASE_AUTO_BEGIN;\r
     TESTCASE_AUTO(TestProperty);\r
+    TESTCASE_AUTO(TestKeywordValues);\r
     TESTCASE_AUTO(TestOperators);\r
     TESTCASE_AUTO(TestDuplicate);\r
Index: icu/test/intltest/apicoll.h\r
===================================================================\r
--- icu/test/intltest/apicoll.h	(revision 39483)\r
+++ icu/test/intltest/apicoll.h	(revision 39484)\r
@@ -36,4 +36,5 @@\r
      */\r
     void TestProperty(/* char* par */);\r
+    void TestKeywordValues();\r
 \r
     /**\r