March 2010 - macruby-changes - lists.macosforge.org

[3689] MacRuby/branches/icu
by source_changes＠macosforge.org 04 Mar '10

04 Mar '10

Revision: 3689 http://trac.macosforge.org/projects/ruby/changeset/3689 Author: lsansonetti(a)apple.com Date: 2010-03-03 17:11:53 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added Symbol#casecmp, fixed a bug in String#casecmp Modified Paths: -------------- MacRuby/branches/icu/include/ruby/intern.h MacRuby/branches/icu/string.c MacRuby/branches/icu/symbol.c Modified: MacRuby/branches/icu/include/ruby/intern.h =================================================================== --- MacRuby/branches/icu/include/ruby/intern.h 2010-03-04 00:49:19 UTC (rev 3688) +++ MacRuby/branches/icu/include/ruby/intern.h 2010-03-04 01:11:53 UTC (rev 3689) @@ -592,6 +592,7 @@ int rb_str_hash_cmp(VALUE,VALUE); int rb_str_comparable(VALUE, VALUE); int rb_str_cmp(VALUE, VALUE); +int rb_str_casecmp(VALUE, VALUE); VALUE rb_str_equal(VALUE str1, VALUE str2); void rb_str_update(VALUE, long, long, VALUE); VALUE rb_str_split(VALUE, const char*); Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-04 00:49:19 UTC (rev 3688) +++ MacRuby/branches/icu/string.c 2010-03-04 01:11:53 UTC (rev 3689) @@ -887,6 +887,71 @@ return res > 0 ? 1 : -1; } +static int +str_case_compare(rb_str_t *self, rb_str_t *str) +{ + if (self == str) { + return 0; + } + + if (self->length_in_bytes == 0 && str->length_in_bytes == 0) { + // both strings are empty + return 0; + } + + if (str_compatible_encoding(self, str) == NULL) { + // incompatible encodings + return -1; + } + + if (str_is_stored_in_uchars(self) + != str_is_stored_in_uchars(str)) { + // one is in uchars and the other is in binary + if (!str_try_making_data_uchars(self) + || !str_try_making_data_uchars(str)) { + // one is in uchars but the other one can't be converted in + // uchars + return -1; + } + } + + const long min_length = self->length_in_bytes < str->length_in_bytes + ? self->length_in_bytes : str->length_in_bytes; + + if (str_is_stored_in_uchars(str)) { + for (long i = 0; i < BYTES_TO_UCHARS(min_length); i++) { + UChar c1 = self->data.uchars[i]; + UChar c2 = str->data.uchars[i]; + if (c1 != c2) { + c1 = isascii(c1) ? toupper(c1) : c1; + c2 = isascii(c2) ? toupper(c2) : c2; + if (c1 != c2) { + return c1 < c2 ? -1 : 1; + } + } + } + } + else { + for (long i = 0; i < min_length; i++) { + char c1 = self->data.bytes[i]; + char c2 = str->data.bytes[i]; + if (c1 != c2) { + c1 = isascii(c1) ? toupper(c1) : c1; + c2 = isascii(c2) ? toupper(c2) : c2; + if (c1 != c2) { + return c1 < c2 ? -1 : 1; + } + } + } + } + + if (self->length_in_bytes == str->length_in_bytes) { + return 0; + } + return self->length_in_bytes > str->length_in_bytes ? 1 : -1; +} + + static long str_offset_in_bytes_to_index(rb_str_t *self, long offset_in_bytes, bool ucs2_mode) @@ -2149,60 +2214,7 @@ static VALUE rstr_casecmp(VALUE str, SEL sel, VALUE other) { - StringValue(other); - - rb_str_t *self_str = RSTR(str); - rb_str_t *other_str = str_need_string(other); - if (self_str == other_str - || (self_str->length_in_bytes == 0 - && other_str->length_in_bytes == 0)) { - return INT2FIX(0); - } - - if (str_compatible_encoding(self_str, other_str) == NULL) { - // incompatible encodings - return Qnil; - } - - if (str_is_stored_in_uchars(self_str) - != str_is_stored_in_uchars(other_str)) { - // one is in uchars and the other is in binary - if (!str_try_making_data_uchars(self_str) - || !str_try_making_data_uchars(other_str)) { - // one is in uchars but the other one can't be converted in - // uchars - return Qnil; - } - } - - const long min_length = - self_str->length_in_bytes < other_str->length_in_bytes - ? self_str->length_in_bytes : other_str->length_in_bytes; - - if (str_is_stored_in_uchars(other_str)) { - for (long i = 0; i < BYTES_TO_UCHARS(min_length); i++) { - UChar c1 = toupper(self_str->data.uchars[i]); - UChar c2 = toupper(other_str->data.uchars[i]); - if (c1 != c2) { - return INT2FIX(c1 < c2 ? -1 : 1); - } - } - } - else { - for (long i = 0; i < min_length; i++) { - char c1 = toupper(self_str->data.bytes[i]); - char c2 = toupper(other_str->data.bytes[i]); - if (c1 != c2) { - return INT2FIX(c1 < c2 ? -1 : 1); - } - } - } - - if (self_str->length_in_bytes == other_str->length_in_bytes) { - return INT2FIX(0); - } - return self_str->length_in_bytes > other_str->length_in_bytes - ? INT2FIX(1) : INT2FIX(-1); + return INT2FIX(str_case_compare(RSTR(str), str_need_string(other))); } /* @@ -5156,3 +5168,9 @@ { return str_compare(str_need_string(str1), str_need_string(str2)); } + +int +rb_str_casecmp(VALUE str1, VALUE str2) +{ + return str_case_compare(str_need_string(str1), str_need_string(str2)); +} Modified: MacRuby/branches/icu/symbol.c =================================================================== --- MacRuby/branches/icu/symbol.c 2010-03-04 00:49:19 UTC (rev 3688) +++ MacRuby/branches/icu/symbol.c 2010-03-04 01:11:53 UTC (rev 3689) @@ -251,6 +251,23 @@ } /* + * call-seq: + * + * sym.casecmp(other) => -1, 0, +1 or nil + * + * Case-insensitive version of <code>Symbol#<=></code>. + */ + +static VALUE +rsym_casecmp(VALUE sym, SEL sel, VALUE other) +{ + if (TYPE(other) != T_SYMBOL) { + return Qnil; + } + return INT2FIX(rb_str_casecmp(RSYM(sym)->str, RSYM(other)->str)); +} + +/* * call-seq: * sym == obj => true or false * @@ -401,6 +418,7 @@ rb_objc_define_method(rb_cSymbol, "==", rsym_equal, 1); rb_objc_define_method(rb_cSymbol, "<=>", rsym_cmp, 1); + rb_objc_define_method(rb_cSymbol, "casecmp", rsym_casecmp, 1); rb_objc_define_method(rb_cSymbol, "eql?", rsym_equal, 1); rb_objc_define_method(rb_cSymbol, "inspect", rsym_inspect, 0); rb_objc_define_method(rb_cSymbol, "to_proc", rsym_to_proc, 0);

1 0

[3688] MacRuby/branches/icu/string.c
by source_changes＠macosforge.org 04 Mar '10

04 Mar '10

Revision: 3688 http://trac.macosforge.org/projects/ruby/changeset/3688 Author: lsansonetti(a)apple.com Date: 2010-03-03 16:49:19 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added #casecmp Modified Paths: -------------- MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 22:54:51 UTC (rev 3687) +++ MacRuby/branches/icu/string.c 2010-03-04 00:49:19 UTC (rev 3688) @@ -2135,6 +2135,77 @@ } /* + * call-seq: + * str.casecmp(other_str) => -1, 0, +1 or nil + * + * Case-insensitive version of <code>String#<=></code>. + * + * "abcdef".casecmp("abcde") #=> 1 + * "aBcDeF".casecmp("abcdef") #=> 0 + * "abcdef".casecmp("abcdefg") #=> -1 + * "abcdef".casecmp("ABCDEF") #=> 0 + */ + +static VALUE +rstr_casecmp(VALUE str, SEL sel, VALUE other) +{ + StringValue(other); + + rb_str_t *self_str = RSTR(str); + rb_str_t *other_str = str_need_string(other); + if (self_str == other_str + || (self_str->length_in_bytes == 0 + && other_str->length_in_bytes == 0)) { + return INT2FIX(0); + } + + if (str_compatible_encoding(self_str, other_str) == NULL) { + // incompatible encodings + return Qnil; + } + + if (str_is_stored_in_uchars(self_str) + != str_is_stored_in_uchars(other_str)) { + // one is in uchars and the other is in binary + if (!str_try_making_data_uchars(self_str) + || !str_try_making_data_uchars(other_str)) { + // one is in uchars but the other one can't be converted in + // uchars + return Qnil; + } + } + + const long min_length = + self_str->length_in_bytes < other_str->length_in_bytes + ? self_str->length_in_bytes : other_str->length_in_bytes; + + if (str_is_stored_in_uchars(other_str)) { + for (long i = 0; i < BYTES_TO_UCHARS(min_length); i++) { + UChar c1 = toupper(self_str->data.uchars[i]); + UChar c2 = toupper(other_str->data.uchars[i]); + if (c1 != c2) { + return INT2FIX(c1 < c2 ? -1 : 1); + } + } + } + else { + for (long i = 0; i < min_length; i++) { + char c1 = toupper(self_str->data.bytes[i]); + char c2 = toupper(other_str->data.bytes[i]); + if (c1 != c2) { + return INT2FIX(c1 < c2 ? -1 : 1); + } + } + } + + if (self_str->length_in_bytes == other_str->length_in_bytes) { + return INT2FIX(0); + } + return self_str->length_in_bytes > other_str->length_in_bytes + ? INT2FIX(1) : INT2FIX(-1); +} + +/* * call-seq: * str.eql?(other) => true or false * @@ -4372,6 +4443,7 @@ rb_objc_define_method(rb_cRubyString, "concat", rstr_concat, 1); rb_objc_define_method(rb_cRubyString, "==", rstr_equal, 1); rb_objc_define_method(rb_cRubyString, "<=>", rstr_cmp, 1); + rb_objc_define_method(rb_cRubyString, "casecmp", rstr_casecmp, 1); rb_objc_define_method(rb_cRubyString, "eql?", rstr_eql, 1); rb_objc_define_method(rb_cRubyString, "include?", rstr_includes, 1); rb_objc_define_method(rb_cRubyString, "start_with?", rstr_start_with, -1);

1 0

[3687] MacRuby/trunk
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3687 http://trac.macosforge.org/projects/ruby/changeset/3687 Author: lsansonetti(a)apple.com Date: 2010-03-03 14:54:51 -0800 (Wed, 03 Mar 2010) Log Message: ----------- work with newer LLVM Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/rakelib/builder/options.rb MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-03-03 22:37:48 UTC (rev 3686) +++ MacRuby/trunk/compiler.cpp 2010-03-03 22:54:51 UTC (rev 3687) @@ -188,10 +188,14 @@ level = 0; #endif +#if LLVM_TOT + dbg_mdkind = context.getMDKindID("dbg"); +#else dbg_mdkind = context.getMetadata().getMDKind("dbg"); if (dbg_mdkind == 0) { dbg_mdkind = context.getMetadata().registerMDKind("dbg"); } +#endif assert(dbg_mdkind != 0); } @@ -735,7 +739,11 @@ if (fname != NULL) { DILocation loc = debug_info->CreateLocation(current_line, 0, debug_compile_unit, DILocation(NULL)); +#if LLVM_TOT + insn->setMetadata(dbg_mdkind, loc.getNode()); +#else context.getMetadata().addMD(dbg_mdkind, loc.getNode(), insn); +#endif } } Modified: MacRuby/trunk/rakelib/builder/options.rb =================================================================== --- MacRuby/trunk/rakelib/builder/options.rb 2010-03-03 22:37:48 UTC (rev 3686) +++ MacRuby/trunk/rakelib/builder/options.rb 2010-03-03 22:54:51 UTC (rev 3687) @@ -105,7 +105,7 @@ CFLAGS = "-I. -I./include -I./onig -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions" CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD OBJC_CFLAGS = CFLAGS + " -fobjc-gc-only" -CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').strip +CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').sub(/-fno-exceptions/, '').strip CXXFLAGS << " -I. -I./include -g -Wall #{ARCHFLAGS}" CXXFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD CXXFLAGS << " -DLLVM_TOT" if ENV['LLVM_TOT'] Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-03-03 22:37:48 UTC (rev 3686) +++ MacRuby/trunk/vm.cpp 2010-03-03 22:54:51 UTC (rev 3687) @@ -184,7 +184,6 @@ } #endif - uint8_t *startFunctionBody(const Function *F, uintptr_t &ActualSize) { return mm->startFunctionBody(F, ActualSize); @@ -237,6 +236,16 @@ std::string path; for (std::vector<EmittedFunctionDetails::LineStart>::const_iterator iter = Details.LineStarts.begin(); iter != Details.LineStarts.end(); ++iter) { +#if LLVM_TOT + DILocation dil = Details.MF->getDILocation(iter->Loc); + if (path.size() == 0) { + DIScope scope = dil.getScope(); + path.append(scope.getDirectory()); + path.append("/"); + path.append(scope.getFilename()); + } + RoxorFunction::Line line(iter->Address, dil.getLineNumber()); +#else DebugLocTuple dlt = Details.MF->getDebugLocTuple(iter->Loc); if (path.size() == 0) { DICompileUnit unit(dlt.Scope); @@ -244,8 +253,8 @@ path.append("/"); path.append(unit.getFilename()); } - RoxorFunction::Line line(iter->Address, dlt.Line); +#endif function->lines.push_back(line); }

1 0

[3686] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3686 http://trac.macosforge.org/projects/ruby/changeset/3686 Author: lsansonetti(a)apple.com Date: 2010-03-03 14:37:48 -0800 (Wed, 03 Mar 2010) Log Message: ----------- fixed #to_s and #inspect to now display regexp flags Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-03 22:16:51 UTC (rev 3685) +++ MacRuby/branches/icu/re.cpp 2010-03-03 22:37:48 UTC (rev 3686) @@ -269,8 +269,6 @@ return rb_reg_quote(reg_operand(pat, true)); } - - /* * call-seq: * Regexp.union(pat1, pat2, ...) => new_regexp @@ -808,7 +806,22 @@ VALUE str = rb_str_new2("/"); rb_str_concat(str, regexp_source(rcv, 0)); rb_str_cat2(str, "/"); - // TODO: add options there. + + const uint32_t options = rb_reg_options(rcv); + const bool mode_m = options & REGEXP_OPT_MULTILINE; + const bool mode_i = options & REGEXP_OPT_IGNORECASE; + const bool mode_x = options & REGEXP_OPT_EXTENDED; + + if (mode_m) { + rb_str_cat2(str, "m"); + } + if (mode_i) { + rb_str_cat2(str, "i"); + } + if (mode_x) { + rb_str_cat2(str, "x"); + } + return str; } @@ -835,10 +848,40 @@ static VALUE regexp_to_s(VALUE rcv, SEL sel) { - VALUE str = rb_str_new2("(?:"); - // TODO: add options there. + VALUE str = rb_str_new2("(?"); + + const uint32_t options = rb_reg_options(rcv); + const bool mode_m = options & REGEXP_OPT_MULTILINE; + const bool mode_i = options & REGEXP_OPT_IGNORECASE; + const bool mode_x = options & REGEXP_OPT_EXTENDED; + + if (mode_m) { + rb_str_cat2(str, "m"); + } + if (mode_i) { + rb_str_cat2(str, "i"); + } + if (mode_x) { + rb_str_cat2(str, "x"); + } + + if (!mode_m || !mode_i || !mode_x) { + rb_str_cat2(str, "-"); + if (!mode_m) { + rb_str_cat2(str, "m"); + } + if (!mode_i) { + rb_str_cat2(str, "i"); + } + if (!mode_x) { + rb_str_cat2(str, "x"); + } + } + + rb_str_cat2(str, ":"); rb_str_concat(str, regexp_source(rcv, 0)); rb_str_cat2(str, ")"); + return str; }

1 0

[3685] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3685 http://trac.macosforge.org/projects/ruby/changeset/3685 Author: lsansonetti(a)apple.com Date: 2010-03-03 14:16:51 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added #union Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-03 21:40:18 UTC (rev 3684) +++ MacRuby/branches/icu/re.cpp 2010-03-03 22:16:51 UTC (rev 3685) @@ -243,6 +243,12 @@ } } +static VALUE +rb_check_regexp_type(VALUE re) +{ + return rb_check_convert_type(re, T_REGEXP, "Regexp", "to_regexp"); +} + /* * call-seq: * Regexp.escape(str) => string @@ -263,8 +269,82 @@ return rb_reg_quote(reg_operand(pat, true)); } + + /* * call-seq: + * Regexp.union(pat1, pat2, ...) => new_regexp + * Regexp.union(pats_ary) => new_regexp + * + * Return a <code>Regexp</code> object that is the union of the given + * patterns, i.e., will match any of its parts. The patterns + * can be Regexp objects, in which case their options will be preserved, or + * Strings. If no patterns are given, returns <code>/(?!)/</code>. + * + * Regexp.union #=> /(?!)/ + * Regexp.union("penzance") #=> /penzance/ + * Regexp.union("a+b*c") #=> /a\+b\*c/ + * Regexp.union("skiing", "sledding") #=> /skiing|sledding/ + * Regexp.union(["skiing", "sledding"]) #=> /skiing|sledding/ + * Regexp.union(/dogs/, /cats/i) #=> /(?-mix:dogs)|(?i-mx:cats)/ + */ + +static VALUE regexp_to_s(VALUE rcv, SEL sel); + +static VALUE +regexp_union(VALUE klass, SEL sel, int argc, VALUE *argv) +{ + const VALUE *args; + + if (argc == 0) { + return rb_reg_new_str(rb_str_new2("(?!)"), 0); + } + else if (argc == 1) { + VALUE v = rb_check_regexp_type(argv[0]); + if (!NIL_P(v)) { + return v; + } + v = rb_check_array_type(argv[0]); + if (!NIL_P(v)) { + argc = RARRAY_LEN(argv[0]); + args = RARRAY_PTR(argv[0]); + } + else { + StringValue(argv[0]); + return rb_reg_new_str(rb_reg_quote(argv[0]), 0); + } + } + else { + args = argv; + } + + VALUE source = rb_unicode_str_new(NULL, 0); + + for (int i = 0; i < argc; i++) { + VALUE arg = args[i]; + + if (i > 0) { + rb_str_cat2(source, "|"); + } + + VALUE substr; + VALUE re = rb_check_regexp_type(arg); + if (!NIL_P(re)) { + substr = regexp_to_s(re, 0); + } + else { + StringValue(arg); + substr = rb_reg_quote(arg); + } + + rb_str_append(source, substr); + } + + return rb_reg_new_str(source, 0); +} + +/* + * call-seq: * Regexp.last_match => matchdata * Regexp.last_match(n) => str * @@ -323,12 +403,6 @@ * */ -VALUE -rb_check_regexp_type(VALUE re) -{ - return rb_check_convert_type(re, T_REGEXP, "Regexp", "to_regexp"); -} - static VALUE regexp_try_convert(VALUE klass, SEL sel, VALUE obj) { @@ -932,9 +1006,8 @@ (void *)regexp_quote, 1); rb_objc_define_method(*(VALUE *)rb_cRegexp, "escape", (void *)regexp_quote, 1); -#if 0 - rb_objc_define_method(*(VALUE *)rb_cRegexp, "union", rb_reg_s_union_m, -2); -#endif + rb_objc_define_method(*(VALUE *)rb_cRegexp, "union", + (void *)regexp_union, -1); rb_objc_define_method(*(VALUE *)rb_cRegexp, "last_match", (void *)regexp_last_match, -1); rb_objc_define_method(*(VALUE *)rb_cRegexp, "try_convert",

1 0

[3684] MacRuby/branches/icu
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3684 http://trac.macosforge.org/projects/ruby/changeset/3684 Author: lsansonetti(a)apple.com Date: 2010-03-03 13:40:18 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added regexp quoting Modified Paths: -------------- MacRuby/branches/icu/encoding.h MacRuby/branches/icu/re.cpp MacRuby/branches/icu/string.c Modified: MacRuby/branches/icu/encoding.h =================================================================== --- MacRuby/branches/icu/encoding.h 2010-03-03 20:37:56 UTC (rev 3683) +++ MacRuby/branches/icu/encoding.h 2010-03-03 21:40:18 UTC (rev 3684) @@ -301,6 +301,7 @@ long rb_str_chars_len(VALUE str); UChar rb_str_get_uchar(VALUE str, long pos); void rb_str_append_uchar(VALUE str, UChar c); +void rb_str_append_uchars(VALUE str, UChar *chars, long len); unsigned long rb_str_hash_uchars(const UChar *chars, long chars_len); long rb_uchar_strtol(UniChar *chars, long chars_len, long pos, long *end_offset); Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-03 20:37:56 UTC (rev 3683) +++ MacRuby/branches/icu/re.cpp 2010-03-03 21:40:18 UTC (rev 3684) @@ -1607,8 +1607,83 @@ VALUE rb_reg_quote(VALUE pat) { - // TODO - return pat; + UChar *chars = NULL; + long chars_len = 0; + bool need_free = false; + VALUE result; + + rb_str_get_uchars(pat, &chars, &chars_len, &need_free); + + long pos = 0; + for (; pos < chars_len; pos++) { + switch (chars[pos]) { + case '[': case ']': case '{': case '}': + case '(': case ')': case '|': case '-': + case '*': case '.': case '\\': case '?': + case '+': case '^': case '$': case ' ': + case '#': case '\t': case '\f': case '\v': + case '\n': case '\r': + goto meta_found; + } + } + + result = rb_unicode_str_new(chars, chars_len); + goto bail; + +meta_found: + result = rb_unicode_str_new(NULL, (chars_len * 2) + 1); + + // Copy up to metacharacter. + rb_str_append_uchars(result, &chars[0], pos); + + for (; pos < chars_len; pos++) { + UChar c = chars[pos]; + switch (c) { + case '[': case ']': case '{': case '}': + case '(': case ')': case '|': case '-': + case '*': case '.': case '\\': case '?': + case '+': case '^': case '$': case '#': + rb_str_append_uchar(result, '\\'); + break; + + case ' ': + rb_str_append_uchar(result, '\\'); + rb_str_append_uchar(result, ' '); + continue; + + case '\t': + rb_str_append_uchar(result, '\\'); + rb_str_append_uchar(result, 't'); + continue; + + case '\n': + rb_str_append_uchar(result, '\\'); + rb_str_append_uchar(result, 'n'); + continue; + + case '\r': + rb_str_append_uchar(result, '\\'); + rb_str_append_uchar(result, 'r'); + continue; + + case '\f': + rb_str_append_uchar(result, '\\'); + rb_str_append_uchar(result, 'f'); + continue; + + case '\v': + rb_str_append_uchar(result, '\\'); + rb_str_append_uchar(result, 'v'); + continue; + } + rb_str_append_uchar(result, c); + } + +bail: + if (need_free) { + free(chars); + } + return result; } void Modified: MacRuby/branches/icu/string.c =================================================================== --- MacRuby/branches/icu/string.c 2010-03-03 20:37:56 UTC (rev 3683) +++ MacRuby/branches/icu/string.c 2010-03-03 21:40:18 UTC (rev 3684) @@ -4826,6 +4826,21 @@ } } +void +rb_str_append_uchars(VALUE str, UChar *chars, long len) +{ + assert(chars != NULL && len >= 0); + + if (len > 0) { + if (RSTR(str)) { + str_concat_uchars(RSTR(str), chars, len); + } + else { + CFStringAppendCharacters((CFMutableStringRef)str, chars, len); + } + } +} + long rb_str_chars_len(VALUE str) {

1 0

[3683] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3683 http://trac.macosforge.org/projects/ruby/changeset/3683 Author: lsansonetti(a)apple.com Date: 2010-03-03 12:37:56 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added #last_match Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-03 20:31:56 UTC (rev 3682) +++ MacRuby/branches/icu/re.cpp 2010-03-03 20:37:56 UTC (rev 3683) @@ -265,6 +265,48 @@ /* * call-seq: + * Regexp.last_match => matchdata + * Regexp.last_match(n) => str + * + * The first form returns the <code>MatchData</code> object generated by the + * last successful pattern match. Equivalent to reading the global variable + * <code>$~</code>. The second form returns the nth field in this + * <code>MatchData</code> object. + * n can be a string or symbol to reference a named capture. + * + * /c(.)t/ =~ 'cat' #=> 0 + * Regexp.last_match #=> #<MatchData "cat" 1:"a"> + * Regexp.last_match(0) #=> "cat" + * Regexp.last_match(1) #=> "a" + * Regexp.last_match(2) #=> nil + * + * /(?<lhs>\w+)\s*=\s*(?<rhs>\w+)/ =~ "var = val" + * Regexp.last_match #=> #<MatchData "var = val" lhs:"var" rhs:"val"> + * Regexp.last_match(:lhs) #=> "var" + * Regexp.last_match(:rhs) #=> "val" + */ + +static VALUE match_getter(void); +static int match_backref_number(VALUE match, VALUE backref, bool check); + +static VALUE +regexp_last_match(VALUE klass, SEL sel, int argc, VALUE *argv) +{ + VALUE nth; + + if (argc > 0 && rb_scan_args(argc, argv, "01", &nth) == 1) { + VALUE match = rb_backref_get(); + if (NIL_P(match)) { + return Qnil; + } + const int n = match_backref_number(match, nth, true); + return rb_reg_nth_match(n, match); + } + return match_getter(); +} + +/* + * call-seq: * Regexp.try_convert(obj) -> re or nil * * Try to convert obj into a Regexp, using to_regexp method. @@ -892,9 +934,9 @@ (void *)regexp_quote, 1); #if 0 rb_objc_define_method(*(VALUE *)rb_cRegexp, "union", rb_reg_s_union_m, -2); +#endif rb_objc_define_method(*(VALUE *)rb_cRegexp, "last_match", - rb_reg_s_last_match, -1); -#endif + (void *)regexp_last_match, -1); rb_objc_define_method(*(VALUE *)rb_cRegexp, "try_convert", (void *)regexp_try_convert, 1);

1 0

[3682] MacRuby/branches/icu/re.cpp
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3682 http://trac.macosforge.org/projects/ruby/changeset/3682 Author: lsansonetti(a)apple.com Date: 2010-03-03 12:31:56 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added #try_convert Modified Paths: -------------- MacRuby/branches/icu/re.cpp Modified: MacRuby/branches/icu/re.cpp =================================================================== --- MacRuby/branches/icu/re.cpp 2010-03-03 20:28:52 UTC (rev 3681) +++ MacRuby/branches/icu/re.cpp 2010-03-03 20:31:56 UTC (rev 3682) @@ -265,6 +265,36 @@ /* * call-seq: + * Regexp.try_convert(obj) -> re or nil + * + * Try to convert obj into a Regexp, using to_regexp method. + * Returns converted regexp or nil if obj cannot be converted + * for any reason. + * + * Regexp.try_convert(/re/) #=> /re/ + * Regexp.try_convert("re") #=> nil + * + * o = Object.new + * Regexp.try_convert(o) #=> nil + * def o.to_regexp() /foo/ end + * Regexp.try_convert(o) #=> /foo/ + * + */ + +VALUE +rb_check_regexp_type(VALUE re) +{ + return rb_check_convert_type(re, T_REGEXP, "Regexp", "to_regexp"); +} + +static VALUE +regexp_try_convert(VALUE klass, SEL sel, VALUE obj) +{ + return rb_check_regexp_type(obj); +} + +/* + * call-seq: * Regexp.new(string [, options]) => regexp * Regexp.new(regexp) => regexp * Regexp.compile(string [, options]) => regexp @@ -864,9 +894,9 @@ rb_objc_define_method(*(VALUE *)rb_cRegexp, "union", rb_reg_s_union_m, -2); rb_objc_define_method(*(VALUE *)rb_cRegexp, "last_match", rb_reg_s_last_match, -1); +#endif rb_objc_define_method(*(VALUE *)rb_cRegexp, "try_convert", - rb_reg_s_try_convert, 1); -#endif + (void *)regexp_try_convert, 1); rb_objc_define_method(rb_cRegexp, "initialize", (void *)regexp_initialize, -1);

1 0

[3681] MacRuby/branches/icu/symbol.c
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3681 http://trac.macosforge.org/projects/ruby/changeset/3681 Author: lsansonetti(a)apple.com Date: 2010-03-03 12:28:52 -0800 (Wed, 03 Mar 2010) Log Message: ----------- added #empty? Modified Paths: -------------- MacRuby/branches/icu/symbol.c Modified: MacRuby/branches/icu/symbol.c =================================================================== --- MacRuby/branches/icu/symbol.c 2010-03-03 20:28:30 UTC (rev 3680) +++ MacRuby/branches/icu/symbol.c 2010-03-03 20:28:52 UTC (rev 3681) @@ -362,6 +362,19 @@ return sym; } +/* + * call-seq: + * sym.empty? => true or false + * + * Returns that _sym_ is :"" or not. + */ + +static VALUE +rsym_empty(VALUE sym, SEL sel) +{ + return rb_str_chars_len(RSYM(sym)->str) == 0 ? Qtrue : Qfalse; +} + static CFIndex rsym_imp_length(void *rcv, SEL sel) { @@ -389,7 +402,6 @@ rb_objc_define_method(rb_cSymbol, "==", rsym_equal, 1); rb_objc_define_method(rb_cSymbol, "<=>", rsym_cmp, 1); rb_objc_define_method(rb_cSymbol, "eql?", rsym_equal, 1); - //rb_objc_define_method(rb_cSymbol, "<=>", rsym_cmp, 1); rb_objc_define_method(rb_cSymbol, "inspect", rsym_inspect, 0); rb_objc_define_method(rb_cSymbol, "to_proc", rsym_to_proc, 0); rb_objc_define_method(rb_cSymbol, "to_s", rsym_to_s, 0); @@ -397,6 +409,7 @@ rb_objc_define_method(rb_cSymbol, "description", rsym_to_s, 0); rb_objc_define_method(rb_cSymbol, "intern", rsym_to_sym, 0); rb_objc_define_method(rb_cSymbol, "to_sym", rsym_to_sym, 0); + rb_objc_define_method(rb_cSymbol, "empty?", rsym_empty, 0); // Cocoa primitives. rb_objc_install_method2((Class)rb_cSymbol, "length",

1 0

[3680] MacRuby/branches/icu/rakelib/builder/options.rb
by source_changes＠macosforge.org 03 Mar '10

03 Mar '10

Revision: 3680 http://trac.macosforge.org/projects/ruby/changeset/3680 Author: lsansonetti(a)apple.com Date: 2010-03-03 12:28:30 -0800 (Wed, 03 Mar 2010) Log Message: ----------- do not pass -I./onig anymore Modified Paths: -------------- MacRuby/branches/icu/rakelib/builder/options.rb Modified: MacRuby/branches/icu/rakelib/builder/options.rb =================================================================== --- MacRuby/branches/icu/rakelib/builder/options.rb 2010-03-03 20:17:56 UTC (rev 3679) +++ MacRuby/branches/icu/rakelib/builder/options.rb 2010-03-03 20:28:30 UTC (rev 3680) @@ -101,7 +101,7 @@ CC = '/usr/bin/gcc-4.2' CXX = '/usr/bin/g++-4.2' -CFLAGS = "-I. -I./include -I./onig -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions" +CFLAGS = "-I. -I./include -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions" CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD OBJC_CFLAGS = CFLAGS + " -fobjc-gc-only" CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').strip

1 0