icu4r 0.1.3.2006.01.26 → 0.1.4.2006.05.29

data/ustring.c

@@ -26,6 +26,8 @@ extern VALUE icu_from_rstr(int argc, VALUE * argv, VALUE str);
  VALUE rb_cUResourceBundle;
  VALUE rb_cULocale;
  VALUE rb_cUCalendar;
+ VALUE rb_cUConverter;
+ VALUE rb_cUCollator;
  
 #include "uregex.h"
 
@@ -42,10 +44,10 @@ free_ustr(str)
     str->ptr = 0;
     free(str);
 }
-inline void icu_check_frozen(VALUE str)
+inline void icu_check_frozen(int check_busy, VALUE str)
 {
 	rb_check_frozen(str);
-	if(USTRING(str)->busy) rb_raise(rb_eRuntimeError, "String is busy. Can't modify");
+	if(check_busy && USTRING(str)->busy > 0 ) rb_raise(rb_eRuntimeError, "String is busy. Can't modify");
 }
 #define START_BUF_LEN  16
 /**
@@ -85,7 +87,6 @@ icu_ustr_alloc(klass)
 {
 	return icu_ustr_alloc_and_wrap(NULL, 0, 0, ICU_COPY);
 }
-
 void ustr_capa_resize(ICUString * str, long new_capa)
 {
     if (new_capa != str->capa) {
@@ -263,7 +264,7 @@ icu_ustr_replace(str, str2)
 {
     if (str == str2)
 	return str;
-    icu_check_frozen(str);	
+    icu_check_frozen(1, str);	
     Check_Class(str2, rb_cUString);
     ustr_splice_units(USTRING(str), 0, ICU_LEN(str), ICU_PTR(str2), ICU_LEN(str2));
     OBJ_INFECT(str, str2);
@@ -284,7 +285,7 @@ VALUE
 icu_ustr_clear(str)
      VALUE           str;
 {
-    icu_check_frozen(str);
+    icu_check_frozen(1, str);
     icu_ustr_resize(str, 0);
     return str;
 }
@@ -475,7 +476,7 @@ icu_ustr_concat(str1, str2)
      VALUE           str1,
                      str2;
 {
-    icu_check_frozen(str1);
+    icu_check_frozen(1, str1);
     Check_Class(str2, rb_cUString);
     if (ICU_LEN(str2) > 0) {
 	ustr_splice_units(USTRING(str1), ICU_LEN(str1), 0, ICU_PTR(str2), ICU_LEN(str2));
@@ -546,7 +547,7 @@ icu_ustr_upcase_bang(argc, argv, str)
     long            len ;
     VALUE           loc;
     char *	    locale = NULL;
-    icu_check_frozen(str);
+    icu_check_frozen(1, str);
     buf = ALLOC_N(UChar, ICU_LEN(str) + 1);
     if (rb_scan_args(argc, argv, "01", &loc) == 1) {
        if( loc != Qnil) {
@@ -614,7 +615,7 @@ icu_ustr_downcase_bang(argc, argv, str)
     VALUE           loc;
     char *	    locale = NULL;
     buf = ALLOC_N(UChar, ICU_LEN(str) + 1);
-    icu_check_frozen(str);
+    icu_check_frozen(1, str);
     if (rb_scan_args(argc, argv, "01", &loc) == 1) {
        if( loc != Qnil) {
          Check_Type(loc, T_STRING);
@@ -874,7 +875,7 @@ icu_ustr_lstrip_bang(str)
     int32_t         i,
                     n,
                     c;
-   icu_check_frozen(str);
+   icu_check_frozen(1, str);
     s = ICU_PTR(str);
     n = ICU_LEN(str);
     if (!s || n == 0)
@@ -941,7 +942,7 @@ icu_ustr_rstrip_bang(str)
                     n,
                     c;
 
-   icu_check_frozen(str);
+   icu_check_frozen(1, str);
     s = ICU_PTR(str);
     n = ICU_LEN(str);
 
@@ -1038,14 +1039,14 @@ icu_ustr_normalize(str, mode)
      int32_t         mode;
 {
     UErrorCode      error = U_ZERO_ERROR;
-    long            capa = ICU_LEN(str);
+    long            capa = ICU_LEN(str)+20;
     UChar          *buf;
     long 	needed;
     VALUE ret;
     if (UNORM_YES == unorm_quickCheck(ICU_PTR(str), ICU_LEN(str), mode, &error))
 	    return icu_ustr_dup(str);
 
-    buf = ALLOC_N(UChar, capa + 20);
+    buf = ALLOC_N(UChar, capa );
     do { 
 	error = 0;
 	 needed =
@@ -1115,6 +1116,13 @@ icu_ustr_normalize_C(str)
 {
     return icu_ustr_normalize(str, UNORM_NFC);
 }
+VALUE my_ubrk_close(UBreakIterator ** boundary, VALUE errorinfo)
+{
+	ubrk_close(*boundary);
+	*boundary = NULL;
+	rb_raise(rb_eRuntimeError, "Unhandled exception: %s", rb_obj_classname(errorinfo));
+	return Qnil;
+}
 
 /* UBRK_CHARACTER, UBRK_WORD, UBRK_LINE, UBRK_SENTENCE */
 VALUE
@@ -1128,6 +1136,7 @@ icu_ustr_each_mode(argc, argv, str, mode)
     UBreakIterator *boundary; 
     int32_t         end, start;
     VALUE           loc ;
+    VALUE           temp;
     char           *locale = "";
     if( rb_scan_args(argc, argv, "01", &loc) == 1) {
         Check_Type(loc, T_STRING);
@@ -1139,12 +1148,12 @@ icu_ustr_each_mode(argc, argv, str, mode)
     if (U_FAILURE(error))
 	rb_raise(rb_eArgError, "Error %s", u_errorName(error));
      start = ubrk_first(boundary);
-    USTRING(str)->busy = 1;
-    for (end = ubrk_next(boundary); end != UBRK_DONE;
-	 start = end, end = ubrk_next(boundary)) {
-	rb_yield(icu_ustr_new(ICU_PTR(str) + start, end - start));
+    ++(USTRING(str)->busy);
+    for (end = ubrk_next(boundary); end != UBRK_DONE; start = end, end = ubrk_next(boundary)) {
+	temp = icu_ustr_new(ICU_PTR(str) + start, end - start);
+	rb_rescue(rb_yield, temp, my_ubrk_close, &boundary);
     }
-    USTRING(str)->busy = 0;
+    --(USTRING(str)->busy);
     ubrk_close(boundary);
     return str;
 }
@@ -1491,11 +1500,11 @@ icu_ustr_scan(str, pat)
 	}
 	return ary;
     }
-    USTRING(str)->busy = 1;
+    ++(USTRING(str)->busy);
     while (!NIL_P(result = ustr_scan_once(str, pat, &start))) {
 	rb_yield(result);
     }
-    USTRING(str)->busy = 0;
+    --(USTRING(str)->busy);
     return str;
 }
 /**
@@ -1621,7 +1630,15 @@ icu_ustr_chars_m(argc, argv, str)
  *  string is returned as the only entry in an array). If negative, there is no
  *  limit to the number of fields returned, and trailing null fields are not
  *  suppressed.
- *     
+ *
+ *  NOTE: there's a difference in ICU regexp split and Ruby Regexp actions:
+ *     "a,b,c,,".split(/,/, -1)  # => ["a", "b", "c", "", ""]
+ *     "a,b,c,,".u.split(ure(","), -1)  # => ["a", "b", "c", ""]
+ *  it seems to be by design, in icu/source/i18n/uregex.cpp uregex_split():
+ *          if (nextOutputStringStart == inputLen) {
+ *              // The delimiter was at the end of the string.  We're done.
+ *              break;
+ *          }
  */
 
 VALUE
@@ -1631,7 +1648,7 @@ icu_ustr_split_m(argc, argv, str)
      VALUE           str;
 {
     VALUE           spat;
-    VALUE           limit;
+    VALUE           limit = Qnil;
     int             lim = 0;
     VALUE           result;
 
@@ -2021,7 +2038,7 @@ icu_ustr_insert(str, idx, str2)
                      str2;
 {
     long            pos = NUM2LONG(idx);
-    icu_check_frozen(str);
+    icu_check_frozen(1, str);
 
     if (pos == -1) {
 	pos = NUM2LONG(icu_ustr_length(str));
@@ -2169,7 +2186,7 @@ icu_ustr_aset_m(argc, argv, str)
      VALUE          *argv;
      VALUE           str;
 {
-    icu_check_frozen(str);
+    icu_check_frozen(1, str);
     if (argc == 3) {
 	if (CLASS_OF(argv[0]) == rb_cURegexp) {
 	    icu_ustr_subpat_set(str, argv[0], NUM2INT(argv[1]), argv[2]);
@@ -2217,7 +2234,7 @@ icu_ustr_slice_bang(argc, argv, str)
     VALUE           result;
     VALUE           buf[3];
     int             i;
-    icu_check_frozen(str);
+    icu_check_frozen(1, str);
     if (argc < 1 || 2 < argc) {
 	rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)",
 		 argc);
@@ -2271,8 +2288,8 @@ ustr_gsub(argc, argv, str, bang, once)
 	return icu_ustr_dup(str);
     }
     end = 0;
-    icu_check_frozen(str);
-    USTRING(str)->busy = 1;
+//    icu_check_frozen(1, str);
+    ++(USTRING(str)->busy);
     buf = icu_ustr_new(0, 0);
     pat = icu_reg_clone(pat);
     if(rb_block_given_p()) iter = 1;
@@ -2301,7 +2318,7 @@ ustr_gsub(argc, argv, str, bang, once)
     }
     while (icu_reg_find_next(pat) && !once);
     icu_ustr_concat(buf, icu_reg_get_tail(pat, end));
-    USTRING(str)->busy = 0;
+    --(USTRING(str)->busy);
     if (bang) {
 	icu_ustr_replace(str, buf);
 	return str;
@@ -2325,7 +2342,7 @@ icu_ustr_gsub_bang(argc, argv, str)
      VALUE          *argv;
      VALUE           str;
 {
-    icu_check_frozen(str);
+    icu_check_frozen(1, str);
     return ustr_gsub(argc, argv, str, 1, 0);
 }
 
@@ -2363,27 +2380,7 @@ icu_ustr_gsub(argc, argv, str)
 
 
 /*-------------*/
-/* parsing     */
-extern VALUE icu_date_parse(UChar * str, int32_t str_len, char * locale, UChar * val, int32_t len);
 
-/**
- * call-seq:
- *     str.parse_date( locale, value)
- *  
- * Parses given  value, using +str+ as format pattern with respect to +locale+.
- *
- *     "HH:mm:ss E dd/MM/yyyy".u.parse_date("en", "20:15:01 Fri 13/01/2006".u)) # => Time.local(2006,"jan",13,20,15,1) 
- *
- */	
- 
-VALUE 
-icu_ustr_parse_date( str,  locale, val)
-		VALUE str, locale, val;
-{
-   Check_Type(locale, T_STRING);
-   Check_Class(val, rb_cUString);
-   return icu_date_parse(ICU_PTR(str), ICU_LEN(str), RSTRING(locale)->ptr, ICU_PTR(val), ICU_LEN(val));
-}
 
 /**
  * call-seq:
@@ -2926,6 +2923,7 @@ mirroring ICU class hierarchy.
     /* comparisons */
     rb_define_method(rb_cUString, "<=>", icu_ustr_cmp_m, 1);
     rb_define_method(rb_cUString, "==",  icu_ustr_equal, 1);
+    rb_define_method(rb_cUString, "eql?",  icu_ustr_equal, 1);
     rb_define_method(rb_cUString, "casecmp", icu_ustr_casecmp, 1);
     rb_define_singleton_method(rb_cUString, "strcoll", icu_ustr_coll, -1);
 
@@ -3019,7 +3017,6 @@ mirroring ICU class hierarchy.
     rb_define_alias( rb_cUString, "fmt", "format");
 
     /* parsing */
-    rb_define_method(rb_cUString, "parse_date", icu_ustr_parse_date, 2);
     rb_define_method(rb_cUString, "to_f", icu_ustr_parse_double, -1);
 
     /* transliteration */

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: icu4r
 version: !ruby/object:Gem::Version 
-  version: 0.1.3.2006.01.26
-date: 2006-01-26 00:00:00 +02:00
+  version: 0.1.4.2006.05.29
+date: 2006-05-29 00:00:00 +03:00
 summary: Ruby extension for Unicode support using ICU
 require_paths: 
 - .
@@ -44,6 +44,8 @@ files:
 - tools/doc.sh
 - tools/km.rb
 - test/test_calendar.rb
+- test/test_converter.rb
+- test/test_collator.rb
 - test/test_ustring.rb
 - calendar.c
 - fmt.cpp
@@ -54,6 +56,8 @@ files:
 - uregex.c
 - uregex.h
 - ustring.c
+- collator.c
+- converter.c
 - README
 - MIT-LICENSE
 test_files: []