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

[3839] MacRuby/trunk/spec/frozen/core/kernel/String_spec.rb
by source_changes＠macosforge.org 21 Mar '10

21 Mar '10

Revision: 3839 http://trac.macosforge.org/projects/ruby/changeset/3839 Author: lsansonetti(a)apple.com Date: 2010-03-20 17:08:35 -0700 (Sat, 20 Mar 2010) Log Message: ----------- avoid side effect Modified Paths: -------------- MacRuby/trunk/spec/frozen/core/kernel/String_spec.rb Modified: MacRuby/trunk/spec/frozen/core/kernel/String_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/kernel/String_spec.rb 2010-03-21 00:01:18 UTC (rev 3838) +++ MacRuby/trunk/spec/frozen/core/kernel/String_spec.rb 2010-03-21 00:08:35 UTC (rev 3839) @@ -16,7 +16,7 @@ end it "converts a constant to a String" do - @object.send(@method, Object).should == "Object" + @object.send(@method, Object).should == Object.to_s end it "calls #to_s to convert an arbitrary object to a String" do

1 0

[3838] MacRuby/trunk/ext/openssl/lib/openssl/x509-internal.rb
by source_changes＠macosforge.org 21 Mar '10

21 Mar '10

Revision: 3838 http://trac.macosforge.org/projects/ruby/changeset/3838 Author: joshua.ballanco(a)apple.com Date: 2010-03-20 17:01:18 -0700 (Sat, 20 Mar 2010) Log Message: ----------- Escape hash in extended regexp Modified Paths: -------------- MacRuby/trunk/ext/openssl/lib/openssl/x509-internal.rb Modified: MacRuby/trunk/ext/openssl/lib/openssl/x509-internal.rb =================================================================== --- MacRuby/trunk/ext/openssl/lib/openssl/x509-internal.rb 2010-03-20 04:53:53 UTC (rev 3837) +++ MacRuby/trunk/ext/openssl/lib/openssl/x509-internal.rb 2010-03-21 00:01:18 UTC (rev 3838) @@ -70,7 +70,7 @@ QuoteChar = /[^\\"]/ AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/ AttributeValue = / - (?!["#])((?:#{StringChar}|#{Pair})*)| + (?!["\#])((?:#{StringChar}|#{Pair})*)| \#(#{HexString})| "((?:#{QuoteChar}|#{Pair})*)" /x

1 0

[3837] MacRuby/trunk/lib/mkmf.rb
by source_changes＠macosforge.org 20 Mar '10

20 Mar '10

Revision: 3837 http://trac.macosforge.org/projects/ruby/changeset/3837 Author: lsansonetti(a)apple.com Date: 2010-03-19 21:53:53 -0700 (Fri, 19 Mar 2010) Log Message: ----------- fixing a bug (patch imported from upstream 1.9) Modified Paths: -------------- MacRuby/trunk/lib/mkmf.rb Modified: MacRuby/trunk/lib/mkmf.rb =================================================================== --- MacRuby/trunk/lib/mkmf.rb 2010-03-20 00:17:53 UTC (rev 3836) +++ MacRuby/trunk/lib/mkmf.rb 2010-03-20 04:53:53 UTC (rev 3837) @@ -370,7 +370,7 @@ def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, - 'src' => CONFTEST_C, + 'src' => "#{CONFTEST_C}", 'arch_hdrdir' => "#$arch_hdrdir", 'top_srcdir' => $top_srcdir.quote, 'INCFLAGS' => "#$INCFLAGS",

1 0

[3836] MacRuby/trunk/spec/frozen/tags/macruby/core/symbol
by source_changes＠macosforge.org 20 Mar '10

20 Mar '10

Revision: 3836 http://trac.macosforge.org/projects/ruby/changeset/3836 Author: lsansonetti(a)apple.com Date: 2010-03-19 17:17:53 -0700 (Fri, 19 Mar 2010) Log Message: ----------- untag specs that now pass Removed Paths: ------------- MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/capitalize_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/downcase_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/inspect_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/swapcase_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/upcase_tags.txt Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/capitalize_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/capitalize_tags.txt 2010-03-20 00:17:41 UTC (rev 3835) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/capitalize_tags.txt 2010-03-20 00:17:53 UTC (rev 3836) @@ -1,9 +0,0 @@ -fails:Symbol#capitalize returns a Symbol -fails:Symbol#capitalize converts the first character to uppercase if it is ASCII -fails:Symbol#capitalize leaves the first character alone if it is not an alphabetical ASCII character -fails:Symbol#capitalize converts subsequent uppercase ASCII characters to their lowercase equivalents -fails:Symbol#capitalize leaves ASCII characters already in the correct case as they were -fails:Symbol#capitalize works with both upper- and lowercase ASCII characters in the same Symbol -fails:Symbol#capitalize leaves uppercase Unicode characters as they were -fails:Symbol#capitalize leaves lowercase Unicode characters as they were -fails:Symbol#capitalize leaves non-alphabetic ASCII characters as they were Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/downcase_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/downcase_tags.txt 2010-03-20 00:17:41 UTC (rev 3835) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/downcase_tags.txt 2010-03-20 00:17:53 UTC (rev 3836) @@ -1,5 +0,0 @@ -fails:Symbol#downcase returns a Symbol -fails:Symbol#downcase converts uppercase ASCII characters to their lowercase equivalents -fails:Symbol#downcase leaves lowercase Unicode characters as they were -fails:Symbol#downcase leaves uppercase Unicode characters as they were -fails:Symbol#downcase leaves non-alphabetic ASCII characters as they were Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/inspect_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/inspect_tags.txt 2010-03-20 00:17:41 UTC (rev 3835) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/inspect_tags.txt 2010-03-20 00:17:53 UTC (rev 3836) @@ -1,5 +0,0 @@ -fails:Symbol#inspect returns self as a symbol literal for :"\"" -fails:Symbol#inspect returns self as a symbol literal for :"!" -fails:Symbol#inspect returns self as a symbol literal for :"\"\"" -fails:Symbol#inspect returns self as a symbol literal for :"!~" -fails:Symbol#inspect returns self as a symbol literal for :"!=" Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/swapcase_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/swapcase_tags.txt 2010-03-20 00:17:41 UTC (rev 3835) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/swapcase_tags.txt 2010-03-20 00:17:53 UTC (rev 3836) @@ -1,7 +0,0 @@ -fails:Symbol#swapcase returns a Symbol -fails:Symbol#swapcase converts lowercase ASCII characters to their uppercase equivalents -fails:Symbol#swapcase converts uppercase ASCII characters to their lowercase equivalents -fails:Symbol#swapcase works with both upper- and lowercase ASCII characters in the same Symbol -fails:Symbol#swapcase leaves uppercase Unicode characters as they were -fails:Symbol#swapcase leaves lowercase Unicode characters as they were -fails:Symbol#swapcase leaves non-alphabetic ASCII characters as they were Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/upcase_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/upcase_tags.txt 2010-03-20 00:17:41 UTC (rev 3835) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/symbol/upcase_tags.txt 2010-03-20 00:17:53 UTC (rev 3836) @@ -1,4 +0,0 @@ -fails:Symbol#upcase returns a Symbol -fails:Symbol#upcase converts lowercase ASCII characters to their uppercase equivalents -fails:Symbol#upcase leaves lowercase Unicode characters as they were -fails:Symbol#upcase leaves non-alphabetic ASCII characters as they were

1 0

[3835] MacRuby/trunk/encoding.h
by source_changes＠macosforge.org 20 Mar '10

20 Mar '10

Revision: 3835 http://trac.macosforge.org/projects/ruby/changeset/3835 Author: lsansonetti(a)apple.com Date: 2010-03-19 17:17:41 -0700 (Fri, 19 Mar 2010) Log Message: ----------- ditto Modified Paths: -------------- MacRuby/trunk/encoding.h Modified: MacRuby/trunk/encoding.h =================================================================== --- MacRuby/trunk/encoding.h 2010-03-20 00:17:30 UTC (rev 3834) +++ MacRuby/trunk/encoding.h 2010-03-20 00:17:41 UTC (rev 3835) @@ -292,6 +292,10 @@ VALUE mr_enc_s_is_compatible(VALUE klass, SEL sel, VALUE str1, VALUE str2); VALUE rb_str_intern_fast(VALUE str); VALUE rstr_aref(VALUE str, SEL sel, int argc, VALUE *argv); +VALUE rstr_swapcase(VALUE str, SEL sel); +VALUE rstr_capitalize(VALUE str, SEL sel); +VALUE rstr_upcase(VALUE str, SEL sel); +VALUE rstr_downcase(VALUE str, SEL sel); // The following functions should always been prefered over anything else, // especially if this "else" is RSTRING_PTR and RSTRING_LEN.

1 0

[3834] MacRuby/trunk
by source_changes＠macosforge.org 20 Mar '10

20 Mar '10

Revision: 3834 http://trac.macosforge.org/projects/ruby/changeset/3834 Author: lsansonetti(a)apple.com Date: 2010-03-19 17:17:30 -0700 (Fri, 19 Mar 2010) Log Message: ----------- added Symbol #upcase, #downcase, #swapcase, #capitalize Modified Paths: -------------- MacRuby/trunk/string.c MacRuby/trunk/symbol.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-20 00:00:58 UTC (rev 3833) +++ MacRuby/trunk/string.c 2010-03-20 00:17:30 UTC (rev 3834) @@ -3762,7 +3762,7 @@ * "hEllO".downcase #=> "hello" */ -static VALUE +VALUE rstr_downcase(VALUE str, SEL sel) { str = rb_str_new3(str); @@ -3806,7 +3806,7 @@ * "hEllO".upcase #=> "HELLO" */ -static VALUE +VALUE rstr_upcase(VALUE str, SEL sel) { str = rb_str_new3(str); @@ -3854,7 +3854,7 @@ * "cYbEr_PuNk11".swapcase #=> "CyBeR_pUnK11" */ -static VALUE +VALUE rstr_swapcase(VALUE str, SEL sel) { str = rb_str_new3(str); @@ -3910,7 +3910,7 @@ * "123ABC".capitalize #=> "123abc" */ -static VALUE +VALUE rstr_capitalize(VALUE str, SEL sel) { str = rb_str_new3(str); Modified: MacRuby/trunk/symbol.c =================================================================== --- MacRuby/trunk/symbol.c 2010-03-20 00:00:58 UTC (rev 3833) +++ MacRuby/trunk/symbol.c 2010-03-20 00:17:30 UTC (rev 3834) @@ -621,6 +621,58 @@ return rstr_aref(RSYM(sym)->str, sel, argc, argv); } +/* + * call-seq: + * sym.upcase => symbol + * + * Same as <code>sym.to_s.upcase.intern</code>. + */ + +static VALUE +rsym_upcase(VALUE sym, SEL sel) +{ + return ID2SYM(rb_intern_str(rstr_upcase(RSYM(sym)->str, sel))); +} + +/* + * call-seq: + * sym.downcase => symbol + * + * Same as <code>sym.to_s.downcase.intern</code>. + */ + +static VALUE +rsym_downcase(VALUE sym, SEL sel) +{ + return ID2SYM(rb_intern_str(rstr_downcase(RSYM(sym)->str, sel))); +} + +/* + * call-seq: + * sym.capitalize => symbol + * + * Same as <code>sym.to_s.capitalize.intern</code>. + */ + +static VALUE +rsym_capitalize(VALUE sym, SEL sel) +{ + return ID2SYM(rb_intern_str(rstr_capitalize(RSYM(sym)->str, sel))); +} + +/* + * call-seq: + * sym.swapcase => symbol + * + * Same as <code>sym.to_s.swapcase.intern</code>. + */ + +static VALUE +rsym_swapcase(VALUE sym, SEL sel) +{ + return ID2SYM(rb_intern_str(rstr_swapcase(RSYM(sym)->str, sel))); +} + static CFIndex rsym_imp_length(void *rcv, SEL sel) { @@ -658,6 +710,10 @@ rb_objc_define_method(rb_cSymbol, "to_sym", rsym_to_sym, 0); rb_objc_define_method(rb_cSymbol, "empty?", rsym_empty, 0); rb_objc_define_method(rb_cSymbol, "[]", rsym_aref, -1); + rb_objc_define_method(rb_cSymbol, "upcase", rsym_upcase, 0); + rb_objc_define_method(rb_cSymbol, "downcase", rsym_downcase, 0); + rb_objc_define_method(rb_cSymbol, "swapcase", rsym_swapcase, 0); + rb_objc_define_method(rb_cSymbol, "capitalize", rsym_capitalize, 0); // Cocoa primitives. rb_objc_install_method2((Class)rb_cSymbol, "length",

1 0

[3833] MacRuby/trunk/spec/frozen
by source_changes＠macosforge.org 20 Mar '10

20 Mar '10

Revision: 3833 http://trac.macosforge.org/projects/ruby/changeset/3833 Author: lsansonetti(a)apple.com Date: 2010-03-19 17:00:58 -0700 (Fri, 19 Mar 2010) Log Message: ----------- untag specs that now pass Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/valid_encoding_tags.txt Removed Paths: ------------- MacRuby/trunk/spec/frozen/core/string/valid_encoding_spec_disabled.rb MacRuby/trunk/spec/frozen/tags/macruby/core/string/casecmp_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/chomp_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/chop_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/entries_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/include_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/lstrip_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/match_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/rpartition_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/rstrip_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/strip_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/sub_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_a_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_c_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_i_tags.txt Deleted: MacRuby/trunk/spec/frozen/core/string/valid_encoding_spec_disabled.rb =================================================================== --- MacRuby/trunk/spec/frozen/core/string/valid_encoding_spec_disabled.rb 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/core/string/valid_encoding_spec_disabled.rb 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,49 +0,0 @@ -# coding: UTF-8 -ruby_version_is "1.9" do - describe "String#valid_encoding?" do - it "returns true for a valid encoding" do - "abcdef".valid_encoding?.should be_true - "こんにちは".valid_encoding?.should be_true - "\xE3\x81\x82".valid_encoding?.should be_true # 'あ' in UTF-8 - end - - it "returns true for a valid encoding and a null character" do - "abc\0def".valid_encoding?.should be_true - "こん\0にちは".valid_encoding?.should be_true - "\0\xE3\x81\x82".valid_encoding?.should be_true # 'あ' in UTF-8 - end - - it "always returns true for binary encoding" do - 'abcdef'.force_encoding('ASCII-8BIT').valid_encoding?.should be_true - 'こんにちは'.force_encoding('ASCII-8BIT').valid_encoding?.should be_true - "\xE3\x81\x82".force_encoding('ASCII-8BIT').valid_encoding?.should be_true # 'あ' in UTF-8 - "\xE3".force_encoding('ASCII-8BIT').valid_encoding?.should be_true - end - - it "returns false for an invalid encoding" do - "\xE3".valid_encoding?.should be_false - "\xE3\x0\x82".valid_encoding?.should be_false - "\xA4\xA2".valid_encoding?.should be_false # 'あ' in EUC-JP (invalid UTF-8) - end - - it "returns false when a valid encoding has been made invalid" do - str = 'こんにちは' - str.setbyte(0, 0) - str.valid_encoding?.should be_false - - str = 'こんにちは' - str.force_encoding('EUC-JP') - str.valid_encoding?.should be_false - end - - it "returns true for an invalid encoding made valid" do - str = "\xE3\x0\x82" - str.setbyte(1, 0x81) - str.valid_encoding?.should be_true - - str = "\xA4\xA2" # 'あ' in EUC-JP - str.force_encoding('EUC-JP') # set the correct encoding - str.valid_encoding?.should be_true - end - end -end Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/casecmp_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/casecmp_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/casecmp_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1 +0,0 @@ -fails:String#casecmp doesn't do case mapping for non-ascii characters Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/chomp_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/chomp_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/chomp_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,2 +0,0 @@ -fails:String#chomp with separator removes carriage return (except \r) chars multiple times when separator is an empty string -fails:String#chomp! with separator modifies self in place and returns self Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/chop_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/chop_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/chop_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,3 +0,0 @@ -fails:String#chop! raises a TypeError when self is frozen -fails:String#chop! raises a RuntimeError when self is frozen -fails:String#chop returns a new string with the last character removed Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/entries_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/entries_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/entries_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,2 +0,0 @@ -fails:String#entries returns an empty array for empty strings -fails:String#entries returns an array containing the string for non-empty strings Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/gsub_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,11 +1,8 @@ fails:String#gsub with pattern and replacement untrusts the result if the original string or replacement is untrusted -fails:String#gsub with pattern and block raises a RuntimeError if the string is modified while substituting fails:String#gsub with pattern and block untrusts the result if the original string or replacement is untrusted fails:String#gsub! with pattern and replacement untrusts self if replacement is untrusted fails:String#gsub! with pattern and block untrusts self if block's result is untrusted fails:String#gsub with pattern and Hash untrusts the result if the original string is untrusted fails:String#gsub with pattern and Hash untrusts the result if a hash value is untrusted fails:String#gsub with pattern and Hash raises a TypeError if the hash has a default proc -fails:String#gsub! with pattern and replacement raises a RuntimeError when self is frozen -fails:String#gsub! with pattern and block raises a RuntimeError when self is frozen fails:String#gsub with pattern and replacement supports \G which matches at the beginning of the remaining (non-matched) string Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/include_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/include_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/include_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,2 +0,0 @@ -fails:String#include? with Fixnum returns true if self contains the given char -fails:String#include? with Fixnum uses fixnum % 256 Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/initialize_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,3 +0,0 @@ -critical:String#initialize raises TypeError on inconvertible object -critical:String#initialize converts its argument to a string representation -fails:String#initialize raises a TypeError if self is frozen Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/lstrip_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/lstrip_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/lstrip_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1 +0,0 @@ -fails:String#lstrip! modifies self in place and returns self Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/match_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/match_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/match_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1 +0,0 @@ -fails:String#match tries to convert pattern to a string via to_str Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/rpartition_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/rpartition_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/rpartition_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,2 +0,0 @@ -critical:String#rpartition with String converts its argument using :to_str -fails:String#rpartition with String returns an array of substrings based on splitting on the given string Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/rstrip_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/rstrip_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/rstrip_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1 +0,0 @@ -fails:String#rstrip returns a copy of self with trailing whitespace removed Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/strip_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/strip_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/strip_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1 +0,0 @@ -fails:String#strip returns a new string with leading and trailing whitespace removed Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/sub_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/sub_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/sub_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,3 +0,0 @@ -fails:String#sub! with pattern, replacement raises a TypeError when self is frozen -fails:String#sub! with pattern and block raises a RuntimeError if the string is modified while substituting -fails:String#sub! with pattern, replacement raises a RuntimeError when self is frozen Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_a_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_a_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_a_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,2 +0,0 @@ -fails:String#to_a returns an empty array for empty strings -fails:String#to_a returns an array containing the string for non-empty strings Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_c_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_c_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_c_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,24 +0,0 @@ -critical:String#to_c returns a Complex object -critical:String#to_c understands integers -critical:String#to_c understands negative integers -critical:String#to_c understands fractions (numerator/denominator) for the real part -critical:String#to_c understands fractions (numerator/denominator) for the imaginary part -critical:String#to_c understands negative fractions (-numerator/denominator) for the real part -critical:String#to_c understands negative fractions (-numerator/denominator) for the imaginary part -critical:String#to_c understands floats (a.b) for the real part -critical:String#to_c understands floats (a.b) for the imaginary part -critical:String#to_c understands negative floats (-a.b) for the real part -critical:String#to_c understands negative floats (-a.b) for the imaginary part -critical:String#to_c understands an integer followed by 'i' to mean that integer is the imaginary part -critical:String#to_c understands a negative integer followed by 'i' to mean that negative integer is the imaginary part -critical:String#to_c understands an 'i' by itself as denoting a complex number with an imaginary part of 1 -critical:String#to_c understands a '-i' by itself as denoting a complex number with an imaginary part of -1 -critical:String#to_c understands 'a+bi' to mean a complex number with 'a' as the real part, 'b' as the imaginary -critical:String#to_c understands 'a-bi' to mean a complex number with 'a' as the real part, '-b' as the imaginary -critical:String#to_c understands scientific notation for the real part -critical:String#to_c understands negative scientific notation for the real part -critical:String#to_c understands scientific notation for the imaginary part -critical:String#to_c understands negative scientific notation for the imaginary part -critical:String#to_c understands scientific notation for the real and imaginary part in the same String -critical:String#to_c understands negative scientific notation for the real and imaginary part in the same String -critical:String#to_c returns a complex number with 0 as the real part, 0 as the imaginary part for unrecognised Strings Deleted: MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_i_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_i_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/to_i_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,2 +0,0 @@ -fails:String#to_i ignores leading underscores -fails:String#to_i ignores a leading mix of whitespaces and underscores Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/valid_encoding_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/valid_encoding_tags.txt 2010-03-19 23:58:12 UTC (rev 3832) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/valid_encoding_tags.txt 2010-03-20 00:00:58 UTC (rev 3833) @@ -1,4 +1 @@ fails:String#valid_encoding? returns true for all encodings self is valid in -fails:String#valid_encoding? returns false if self is valid in one encoding, but invalid in the one it's tagged with -fails:String#valid_encoding? returns false if self contains a character invalid in the associated encoding -fails:String#valid_encoding? returns false if a valid String had an invalid character appended to it

1 0

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

19 Mar '10

Revision: 3832 http://trac.macosforge.org/projects/ruby/changeset/3832 Author: lsansonetti(a)apple.com Date: 2010-03-19 16:58:12 -0700 (Fri, 19 Mar 2010) Log Message: ----------- fixed misc bugs in #chomp, #sub, #gsub, #strip Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-19 22:42:44 UTC (rev 3831) +++ MacRuby/trunk/string.c 2010-03-19 23:58:12 UTC (rev 3832) @@ -3179,8 +3179,8 @@ long to_del = 0; if (rs == rb_default_rs - || rslen == 0 || (rslen == 1 && rb_str_get_uchar(rs, 0) == '\n')) { + // Remove trailing carriage return. UChar c = str_get_uchar(RSTR(str), len - 1, false); if (c == '\n') { to_del++; @@ -3190,7 +3190,22 @@ to_del++; } } + else if (rslen == 0) { + // Remove all trailing carriage returns. + for (int i = len - 1; i >= 0; i--) { + UChar c = str_get_uchar(RSTR(str), i, false); + if (c != '\n') { + break; + } + to_del++; + if (i > 0 && str_get_uchar(RSTR(str), i - 1, false) == '\r') { + to_del++; + i--; + } + } + } else if (rslen <= len) { + // Remove trailing substring. if (str_index_for_string(RSTR(str), str_need_string(rs), len - rslen, -1, false, false) >= 0) { to_del += rslen; @@ -3428,6 +3443,11 @@ rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); } + if (!block_given) { + // RubySpec compliance... + rstr_modify(str); + } + VALUE pat = get_pat(argv[0], true); if (rb_reg_search(pat, str, 0, false) >= 0) { VALUE match = rb_backref_get(); @@ -3438,7 +3458,11 @@ if (block_given || !NIL_P(hash)) { if (block_given) { rb_match_busy(match); + const unsigned long hash = rb_str_hash(str); repl = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match))); + if (rb_str_hash(str) != hash) { + rb_raise(rb_eRuntimeError, "string modified"); + } } else { repl = rb_hash_aref(hash, rstr_substr(str, results[0].beg, @@ -3554,6 +3578,11 @@ const long len = str_length(RSTR(str), false); VALUE match = Qnil; + if (bang) { + // RubySpec compliance... + rstr_modify(str); + } + while (true) { const long pos = rb_reg_search(pat, str, offset, false); if (pos < 0) { @@ -3613,7 +3642,6 @@ rb_backref_set(match); if (bang) { - rstr_modify(str); str_replace(RSTR(str), dest); } else { @@ -4051,7 +4079,8 @@ // Strip right side. long pos = len - 1; while (pos >= 0) { - if (!iswspace(rb_str_get_uchar(str, pos))) { + UChar c = rb_str_get_uchar(str, pos); + if (!iswspace(c) && c != '\0') { break; } pos--;

1 0

[3831] MacRuby/trunk/random.c
by source_changes＠macosforge.org 19 Mar '10

19 Mar '10

Revision: 3831 http://trac.macosforge.org/projects/ruby/changeset/3831 Author: pthomson(a)apple.com Date: 2010-03-19 15:42:44 -0700 (Fri, 19 Mar 2010) Log Message: ----------- Fix random generation of bignums on 64-bit 10.6+ machines. Modified Paths: -------------- MacRuby/trunk/random.c Modified: MacRuby/trunk/random.c =================================================================== --- MacRuby/trunk/random.c 2010-03-19 22:36:34 UTC (rev 3830) +++ MacRuby/trunk/random.c 2010-03-19 22:42:44 UTC (rev 3831) @@ -473,7 +473,11 @@ static VALUE limited_big_rand(struct MT *mt, struct RBignum *limit) { +#if SIZEOF_BDIGITS < 8 const long len = (RBIGNUM_LEN(limit) * SIZEOF_BDIGITS + 3) / 4; +#else + const long len = (RBIGNUM_LEN(limit) * SIZEOF_BDIGITS + 3) / 8; +#endif struct RBignum *val = (struct RBignum *)rb_big_clone((VALUE)limit); RBIGNUM_SET_SIGN(val, 1); #if SIZEOF_BDIGITS == 2

1 0

[3830] MacRuby/trunk/spec/frozen/tags/macruby/language
by source_changes＠macosforge.org 19 Mar '10

19 Mar '10

Revision: 3830 http://trac.macosforge.org/projects/ruby/changeset/3830 Author: lsansonetti(a)apple.com Date: 2010-03-19 15:36:34 -0700 (Fri, 19 Mar 2010) Log Message: ----------- tag remaining failing language specs Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/language/encoding_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/magic_comment_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/encoding_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/encoding_tags.txt 2010-03-19 22:26:45 UTC (rev 3829) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/encoding_tags.txt 2010-03-19 22:36:34 UTC (rev 3830) @@ -1 +1,2 @@ fails:The __ENCODING__ pseudo-variable is the evaluated strings's one inside an eval +fails:The __ENCODING__ pseudo-variable is US-ASCII by default Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/magic_comment_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/magic_comment_tags.txt 2010-03-19 22:26:45 UTC (rev 3829) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/magic_comment_tags.txt 2010-03-19 22:36:34 UTC (rev 3830) @@ -1 +1,2 @@ fails:Magic comment must be at the first line +fails:Magic comment must be at the first of line

1 0