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

[3809] MacRuby/trunk/re.cpp
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3809 http://trac.macosforge.org/projects/ruby/changeset/3809 Author: lsansonetti(a)apple.com Date: 2010-03-18 15:01:59 -0700 (Thu, 18 Mar 2010) Log Message: ----------- added #fixed_encoding? Modified Paths: -------------- MacRuby/trunk/re.cpp Modified: MacRuby/trunk/re.cpp =================================================================== --- MacRuby/trunk/re.cpp 2010-03-18 21:48:28 UTC (rev 3808) +++ MacRuby/trunk/re.cpp 2010-03-18 22:01:59 UTC (rev 3809) @@ -24,6 +24,7 @@ struct RBasic basic; UnicodeString *unistr; RegexPattern *pattern; + bool fixed_encoding; } rb_regexp_t; #define RREGEXP(o) ((rb_regexp_t *)o) @@ -51,6 +52,7 @@ OBJSETUP(re, klass, T_REGEXP); re->unistr = NULL; re->pattern = NULL; + re->fixed_encoding = false; return re; } @@ -148,9 +150,15 @@ return false; } + bool fixed_encoding = false; + if (IS_RSTR(str) && !str_is_ruby_ascii_only(RSTR(str))) { + fixed_encoding = true; + } + regexp_finalize(regexp); regexp->pattern = pattern; regexp->unistr = unistr; + regexp->fixed_encoding = fixed_encoding; return true; } @@ -961,7 +969,42 @@ return INT2FIX(rb_reg_options(rcv)); } +/* + * call-seq: + * rxp.fixed_encoding? => true or false + * + * Returns false if rxp is applicable to + * a string with any ASCII compatible encoding. + * Returns true otherwise. + * + * r = /a/ + * r.fixed_encoding? #=> false + * r =~ "\u{6666} a" #=> 2 + * r =~ "\xa1\xa2 a".force_encoding("euc-jp") #=> 2 + * r =~ "abc".force_encoding("euc-jp") #=> 0 + * r =~ "\u{6666} a" #=> 2 + * r =~ "\xa1\xa2".force_encoding("euc-jp") #=> ArgumentError + * r =~ "abc".force_encoding("euc-jp") #=> 0 + * + * r = /\u{6666}/ + * r.fixed_encoding? #=> true + * r.encoding #=> #<Encoding:UTF-8> + * r =~ "\u{6666} a" #=> 0 + * r =~ "\xa1\xa2".force_encoding("euc-jp") #=> ArgumentError + * r =~ "abc".force_encoding("euc-jp") #=> nil + * + * r = /a/u + * r.fixed_encoding? #=> true + * r.encoding #=> #<Encoding:UTF-8> + */ + static VALUE +regexp_fixed_encoding(VALUE rcv, SEL sel) +{ + return RREGEXP(rcv)->fixed_encoding ? Qtrue : Qfalse; +} + +static VALUE match_getter(void) { VALUE match = rb_backref_get(); @@ -1093,10 +1136,10 @@ rb_objc_define_method(rb_cRegexp, "source", (void *)regexp_source, 0); rb_objc_define_method(rb_cRegexp, "casefold?", (void *)regexp_casefold, 0); rb_objc_define_method(rb_cRegexp, "options", (void *)regexp_options, 0); + rb_objc_define_method(rb_cRegexp, "fixed_encoding?", + (void *)regexp_fixed_encoding, 0); #if 0 rb_objc_define_method(rb_cRegexp, "encoding", rb_reg_encoding, 0); - rb_objc_define_method(rb_cRegexp, "fixed_encoding?", - rb_reg_fixed_encoding_p, 0); rb_objc_define_method(rb_cRegexp, "names", rb_reg_names, 0); rb_objc_define_method(rb_cRegexp, "named_captures", rb_reg_named_captures, 0);

1 0

[3808] MacRuby/trunk
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3808 http://trac.macosforge.org/projects/ruby/changeset/3808 Author: lsansonetti(a)apple.com Date: 2010-03-18 14:48:28 -0700 (Thu, 18 Mar 2010) Log Message: ----------- added support for regexps marshal'ing Modified Paths: -------------- MacRuby/trunk/marshal.c MacRuby/trunk/re.cpp MacRuby/trunk/re.h Modified: MacRuby/trunk/marshal.c =================================================================== --- MacRuby/trunk/marshal.c 2010-03-18 20:48:58 UTC (rev 3807) +++ MacRuby/trunk/marshal.c 2010-03-18 21:48:28 UTC (rev 3808) @@ -16,6 +16,7 @@ #include "ruby/encoding.h" #include "encoding.h" #include "id.h" +#include "re.h" #include <math.h> #ifdef HAVE_FLOAT_H @@ -786,9 +787,9 @@ case T_REGEXP: w_uclass(obj, rb_cRegexp, arg); w_byte(TYPE_REGEXP, arg); - // TODO - //w_bytes(RREGEXP(obj)->str, RREGEXP(obj)->len, arg); - //w_byte((char)rb_reg_options(obj), arg); + VALUE re_str = rb_regexp_source(obj); + w_bytes(RSTRING_PTR(re_str), RSTRING_LEN(re_str), arg); + w_byte(rb_reg_options_to_mri(rb_reg_options(obj)), arg); break; case T_ARRAY: @@ -1499,7 +1500,7 @@ { volatile VALUE str = r_bytes(arg); const char *cstr = RSTRING_PTR(str); - const int options = r_byte(arg); + const int options = rb_reg_options_from_mri(r_byte(arg)); v = r_entry(rb_reg_new(cstr, strlen(cstr), options), arg); v = r_leave(v, arg); } Modified: MacRuby/trunk/re.cpp =================================================================== --- MacRuby/trunk/re.cpp 2010-03-18 20:48:58 UTC (rev 3807) +++ MacRuby/trunk/re.cpp 2010-03-18 21:48:28 UTC (rev 3808) @@ -789,17 +789,22 @@ * */ -static VALUE -regexp_source(VALUE rcv, SEL sel) +VALUE +rb_regexp_source(VALUE re) { - assert(RREGEXP(rcv)->unistr != NULL); + assert(RREGEXP(re)->unistr != NULL); - const UChar *chars = RREGEXP(rcv)->unistr->getBuffer(); - const int32_t chars_len = RREGEXP(rcv)->unistr->length(); + const UChar *chars = RREGEXP(re)->unistr->getBuffer(); + const int32_t chars_len = RREGEXP(re)->unistr->length(); assert(chars_len >= 0); - VALUE str = rb_unicode_str_new(chars, chars_len); + return rb_unicode_str_new(chars, chars_len); +} +static VALUE +regexp_source(VALUE rcv, SEL sel) +{ + VALUE str = rb_regexp_source(rcv); if (OBJ_TAINTED(rcv)) { OBJ_TAINT(str); } @@ -1824,4 +1829,36 @@ FL_SET(match, MATCH_BUSY); } +int +rb_reg_options_from_mri(int mri_opt) +{ + int opt = 0; + if (mri_opt & 1) { + opt |= REGEXP_OPT_IGNORECASE; + } + if (mri_opt & 2) { + opt |= REGEXP_OPT_EXTENDED; + } + if (mri_opt & 4) { + opt |= REGEXP_OPT_MULTILINE; + } + return opt; +} + +int +rb_reg_options_to_mri(int opt) +{ + int mri_opt = 0; + if (opt & REGEXP_OPT_IGNORECASE) { + mri_opt |= 1; + } + if (opt & REGEXP_OPT_EXTENDED) { + mri_opt |= 2; + } + if (opt & REGEXP_OPT_MULTILINE) { + mri_opt |= 4; + } + return mri_opt; +} + } // extern "C" Modified: MacRuby/trunk/re.h =================================================================== --- MacRuby/trunk/re.h 2010-03-18 20:48:58 UTC (rev 3807) +++ MacRuby/trunk/re.h 2010-03-18 21:48:28 UTC (rev 3808) @@ -22,7 +22,11 @@ VALUE rb_reg_quote(VALUE pat); VALUE rb_reg_regcomp(VALUE str); int rb_reg_search(VALUE re, VALUE str, int pos, bool reverse); +VALUE rb_regexp_source(VALUE re); +int rb_reg_options_to_mri(int opt); +int rb_reg_options_from_mri(int mri_opt); + void regexp_get_uchars(VALUE re, const UChar **chars_p, long *chars_len_p); typedef struct rb_match_result {

1 0

[3807] MacRuby/trunk/bignum.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3807 http://trac.macosforge.org/projects/ruby/changeset/3807 Author: lsansonetti(a)apple.com Date: 2010-03-18 13:48:58 -0700 (Thu, 18 Mar 2010) Log Message: ----------- revert r3806 because it breaks the specs and it also smells like a bad change Revision Links: -------------- http://trac.macosforge.org/projects/ruby/changeset/3806 Modified Paths: -------------- MacRuby/trunk/bignum.c Modified: MacRuby/trunk/bignum.c =================================================================== --- MacRuby/trunk/bignum.c 2010-03-18 16:25:18 UTC (rev 3806) +++ MacRuby/trunk/bignum.c 2010-03-18 20:48:58 UTC (rev 3807) @@ -105,9 +105,15 @@ } } else { - RBIGNUM(big)->as.heap.digits = NULL; - GC_WB(&RBIGNUM(big)->as.heap.digits, ALLOC_N(BDIGIT, len)); - RBIGNUM_SET_LEN(big, len); + if (RBIGNUM_LEN(big) == 0) { + GC_WB(&RBIGNUM(big)->as.heap.digits, ALLOC_N(BDIGIT, len)); + } + else { + void *tmp = ruby_xrealloc(RBIGNUM(big)->as.heap.digits, sizeof(BDIGIT) * len); + if (tmp != RBIGNUM(big)->as.heap.digits) { + GC_WB(&RBIGNUM(big)->as.heap.digits, tmp); + } + } } } }

1 0

[3806] MacRuby/trunk/bignum.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3806 http://trac.macosforge.org/projects/ruby/changeset/3806 Author: pthomson(a)apple.com Date: 2010-03-18 09:25:18 -0700 (Thu, 18 Mar 2010) Log Message: ----------- Fix bug in rb_big_realloc (fixes ticket #615). Modified Paths: -------------- MacRuby/trunk/bignum.c Modified: MacRuby/trunk/bignum.c =================================================================== --- MacRuby/trunk/bignum.c 2010-03-18 08:04:59 UTC (rev 3805) +++ MacRuby/trunk/bignum.c 2010-03-18 16:25:18 UTC (rev 3806) @@ -105,15 +105,9 @@ } } else { - if (RBIGNUM_LEN(big) == 0) { - GC_WB(&RBIGNUM(big)->as.heap.digits, ALLOC_N(BDIGIT, len)); - } - else { - void *tmp = ruby_xrealloc(RBIGNUM(big)->as.heap.digits, sizeof(BDIGIT) * len); - if (tmp != RBIGNUM(big)->as.heap.digits) { - GC_WB(&RBIGNUM(big)->as.heap.digits, tmp); - } - } + RBIGNUM(big)->as.heap.digits = NULL; + GC_WB(&RBIGNUM(big)->as.heap.digits, ALLOC_N(BDIGIT, len)); + RBIGNUM_SET_LEN(big, len); } } }

1 0

[3805] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3805 http://trac.macosforge.org/projects/ruby/changeset/3805 Author: lsansonetti(a)apple.com Date: 2010-03-18 01:04:59 -0700 (Thu, 18 Mar 2010) Log Message: ----------- ditto Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-18 08:01:14 UTC (rev 3804) +++ MacRuby/trunk/string.c 2010-03-18 08:04:59 UTC (rev 3805) @@ -1245,7 +1245,7 @@ VALUE mr_enc_s_is_compatible(VALUE klass, SEL sel, VALUE str1, VALUE str2) { - rb_encoding_t *encoding = str_compatible_encoding(RSTR(str1), + rb_encoding_t *encoding = str_compatible_encoding(str_need_string(str1), str_need_string(str2)); if (encoding == NULL) { return Qnil;

1 0

[3804] MacRuby/trunk/string.c
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3804 http://trac.macosforge.org/projects/ruby/changeset/3804 Author: lsansonetti(a)apple.com Date: 2010-03-18 01:01:14 -0700 (Thu, 18 Mar 2010) Log Message: ----------- fixed bugs in Encoding.compatible? Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-18 05:58:20 UTC (rev 3803) +++ MacRuby/trunk/string.c 2010-03-18 08:01:14 UTC (rev 3804) @@ -1245,18 +1245,12 @@ VALUE mr_enc_s_is_compatible(VALUE klass, SEL sel, VALUE str1, VALUE str2) { - if (SPECIAL_CONST_P(str1) || SPECIAL_CONST_P(str2)) { - return Qnil; - } - assert(IS_RSTR(str1)); // TODO - assert(IS_RSTR(str2)); // TODO - rb_encoding_t *encoding = str_compatible_encoding(RSTR(str1), RSTR(str2)); + rb_encoding_t *encoding = str_compatible_encoding(RSTR(str1), + str_need_string(str2)); if (encoding == NULL) { return Qnil; } - else { - return (VALUE)encoding; - } + return (VALUE)encoding; } static VALUE

1 0

[3803] MacRuby/trunk/include/ruby/ruby.h
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3803 http://trac.macosforge.org/projects/ruby/changeset/3803 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:58:20 -0700 (Wed, 17 Mar 2010) Log Message: ----------- fixed the TOUPPER/TOLOWER macros Modified Paths: -------------- MacRuby/trunk/include/ruby/ruby.h Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2010-03-18 05:34:51 UTC (rev 3802) +++ MacRuby/trunk/include/ruby/ruby.h 2010-03-18 05:58:20 UTC (rev 3803) @@ -1341,12 +1341,10 @@ #define rb_isspace(c) (rb_isascii(c) && isspace(c)) #define rb_isupper(c) (rb_isascii(c) && isupper(c)) #define rb_isxdigit(c) (rb_isascii(c) && isxdigit(c)) -#define rb_tolower(c) (rb_isascii(c) && tolower(c)) -#define rb_toupper(c) (rb_isascii(c) && toupper(c)) +#define rb_tolower(c) (rb_isascii(c) ? tolower(c) : (c)) +#define rb_toupper(c) (rb_isascii(c) ? toupper(c) : (c)) -#ifndef ISPRINT #define ISASCII(c) rb_isascii((unsigned char)(c)) -#undef ISPRINT #define ISPRINT(c) rb_isprint((unsigned char)(c)) #define ISSPACE(c) rb_isspace((unsigned char)(c)) #define ISUPPER(c) rb_isupper((unsigned char)(c)) @@ -1355,7 +1353,6 @@ #define ISALPHA(c) rb_isalpha((unsigned char)(c)) #define ISDIGIT(c) rb_isdigit((unsigned char)(c)) #define ISXDIGIT(c) rb_isxdigit((unsigned char)(c)) -#endif #define TOUPPER(c) rb_toupper((unsigned char)(c)) #define TOLOWER(c) rb_tolower((unsigned char)(c))

1 0

[3802] MacRuby/trunk/re.cpp
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3802 http://trac.macosforge.org/projects/ruby/changeset/3802 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:34:51 -0700 (Wed, 17 Mar 2010) Log Message: ----------- added #hash Modified Paths: -------------- MacRuby/trunk/re.cpp Modified: MacRuby/trunk/re.cpp =================================================================== --- MacRuby/trunk/re.cpp 2010-03-18 05:34:06 UTC (rev 3801) +++ MacRuby/trunk/re.cpp 2010-03-18 05:34:51 UTC (rev 3802) @@ -448,6 +448,26 @@ } /* + * call-seq: + * rxp.hash => fixnum + * + * Produce a hash based on the text and options of this regular expression. + */ + +static VALUE +regexp_hash(VALUE rcv, SEL sel) +{ + UnicodeString *unistr = RREGEXP(rcv)->unistr; + assert(unistr != NULL); + + unsigned long code = rb_str_hash_uchars(unistr->getBuffer(), + unistr->length()); + code += rb_reg_options(rcv); + + return LONG2NUM(code); +} + +/* * call-seq: * rxp == other_rxp => true or false * rxp.eql?(other_rxp) => true or false @@ -1058,7 +1078,7 @@ (void *)regexp_initialize, -1); rb_objc_define_method(rb_cRegexp, "initialize_copy", (void *)regexp_initialize_copy, 1); - //rb_objc_define_method(rb_cRegexp, "hash", rb_reg_hash, 0); + rb_objc_define_method(rb_cRegexp, "hash", (void *)regexp_hash, 0); rb_objc_define_method(rb_cRegexp, "eql?", (void *)regexp_equal, 1); rb_objc_define_method(rb_cRegexp, "==", (void *)regexp_equal, 1); rb_objc_define_method(rb_cRegexp, "=~", (void *)regexp_match, 1);

1 0

[3801] MacRuby/trunk/spec/frozen/core/regexp
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3801 http://trac.macosforge.org/projects/ruby/changeset/3801 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:34:06 -0700 (Wed, 17 Mar 2010) Log Message: ----------- comment a couple of esoteric regexps that do not compile with ICU yet Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/regexp/encoding_spec.rb MacRuby/trunk/spec/frozen/core/regexp/fixed_encoding_spec.rb Modified: MacRuby/trunk/spec/frozen/core/regexp/encoding_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/regexp/encoding_spec.rb 2010-03-18 05:26:07 UTC (rev 3800) +++ MacRuby/trunk/spec/frozen/core/regexp/encoding_spec.rb 2010-03-18 05:34:06 UTC (rev 3801) @@ -20,9 +20,11 @@ /#{}\xc2\xa1/n.encoding.should == Encoding::ASCII_8BIT end +=begin # TODO: will not compile on MacRuby it "defaults to UTF-8 if \\u escapes appear" do /\u{9879}/.encoding.should == Encoding::UTF_8 end +=end it "defaults to UTF-8 if a literal UTF-8 character appears" do /¥/.encoding.should == Encoding::UTF_8 Modified: MacRuby/trunk/spec/frozen/core/regexp/fixed_encoding_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/regexp/fixed_encoding_spec.rb 2010-03-18 05:26:07 UTC (rev 3800) +++ MacRuby/trunk/spec/frozen/core/regexp/fixed_encoding_spec.rb 2010-03-18 05:34:06 UTC (rev 3801) @@ -24,9 +24,11 @@ /needle/e.fixed_encoding?.should be_true end +=begin # XXX will not compile on MacRuby it "returns true if the Regexp contains a \\u escape" do /needle \u{8768}/.fixed_encoding?.should be_true end +=end it "returns true if the Regexp contains a UTF-8 literal" do /文字化け/.fixed_encoding?.should be_true

1 0

[3800] MacRuby/trunk/spec/frozen/core/dir/pwd_spec.rb
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3800 http://trac.macosforge.org/projects/ruby/changeset/3800 Author: lsansonetti(a)apple.com Date: 2010-03-17 22:26:07 -0700 (Wed, 17 Mar 2010) Log Message: ----------- rewrite a spec to not use a side effect Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/dir/pwd_spec.rb Modified: MacRuby/trunk/spec/frozen/core/dir/pwd_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/dir/pwd_spec.rb 2010-03-18 05:13:12 UTC (rev 3799) +++ MacRuby/trunk/spec/frozen/core/dir/pwd_spec.rb 2010-03-18 05:26:07 UTC (rev 3800) @@ -37,7 +37,7 @@ DirSpecs.clear_dirs begin - str = [0xe9].pack 'U' #Unicode \xE9 + str = "\u{e9}" #Unicode \xE9 Dir.mkdir str File.exist?(str).should == true

1 0