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

[3769] MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags .txt
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3769 http://trac.macosforge.org/projects/ruby/changeset/3769 Author: lsansonetti(a)apple.com Date: 2010-03-15 20:08:19 -0700 (Mon, 15 Mar 2010) Log Message: ----------- tag a failing spec Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt 2010-03-16 02:06:20 UTC (rev 3768) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt 2010-03-16 03:08:19 UTC (rev 3769) @@ -1,8 +1,9 @@ fails:Regexps with encoding modifiers supports /e (EUC encoding) fails:Regexps with encoding modifiers supports /e (EUC encoding) with interpolation fails:Regexps with encoding modifiers supports /e (EUC encoding) with interpolation /o -fails:Regexps with encoding modifiers supports /s (Windows_31J encoding) +fails:Regexps with encoding modifiers supports /n (No encoding) fails:Regexps with encoding modifiers supports /n (No encoding) with interpolation fails:Regexps with encoding modifiers supports /n (No encoding) with interpolation /o +fails:Regexps with encoding modifiers supports /s (Windows_31J encoding) fails:Regexps with encoding modifiers supports /s (Windows_31J encoding) with interpolation fails:Regexps with encoding modifiers supports /s (Windows_31J encoding) with interpolation and /o

1 0

[3768] MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/ character_classes_tags.txt
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3768 http://trac.macosforge.org/projects/ruby/changeset/3768 Author: lsansonetti(a)apple.com Date: 2010-03-15 19:06:20 -0700 (Mon, 15 Mar 2010) Log Message: ----------- ditto Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt 2010-03-16 02:04:20 UTC (rev 3767) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt 2010-03-16 02:06:20 UTC (rev 3768) @@ -1,9 +1,3 @@ -#fails:Regexp with character classes matches Unicode digits with [[:alnum:]] -#fails:Regexp with character classes matches Unicode space characters with [[:blank:]] -#fails:Regexp with character classes matches Unicode format characters with [[:cntrl:]] -#fails:Regexp with character classes matches Unicode digits with [[:digit:]] -#fails:Regexp with character classes matches Unicode digits with [[:graph:]] -#fails:Regexp with character classes matches Unicode private-use characters with [[:graph:]] critical:Regexp with character classes matches Unicode lowercase letter characters with [[:lower:]] critical:Regexp with character classes matches Unicode lowercase letter characters with [[:print:]] critical:Regexp with character classes matches Unicode lowercase characters with [[:word:]]

1 0

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

16 Mar '10

Revision: 3767 http://trac.macosforge.org/projects/ruby/changeset/3767 Author: lsansonetti(a)apple.com Date: 2010-03-15 19:04:20 -0700 (Mon, 15 Mar 2010) Log Message: ----------- marking specs as not compliant, untagging passing specs Modified Paths: -------------- MacRuby/trunk/spec/frozen/language/regexp/character_classes_spec.rb MacRuby/trunk/spec/frozen/language/regexp/versions/character_classes_1.9.rb MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt Modified: MacRuby/trunk/spec/frozen/language/regexp/character_classes_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/regexp/character_classes_spec.rb 2010-03-16 02:03:57 UTC (rev 3766) +++ MacRuby/trunk/spec/frozen/language/regexp/character_classes_spec.rb 2010-03-16 02:04:20 UTC (rev 3767) @@ -66,7 +66,9 @@ it 'supports [] (character class)' do /[a-z]+/.match("fooBAR").to_a.should == ["foo"] - /[\b]/.match("\b").to_a.should == ["\b"] # \b inside character class is backspace + not_compliant_on :macruby do + /[\b]/.match("\b").to_a.should == ["\b"] # \b inside character class is backspace + end end it 'supports [[:alpha:][:digit:][:etc:]] (predefined character classes)' do @@ -86,9 +88,13 @@ # Parsing /[[:lower:][:digit:]A-C]+/.match("a1ABCDEF").to_a.should == ["a1ABC"] # can be composed with other constructs in the character class /[^[:lower:]A-C]+/.match("abcABCDEF123def").to_a.should == ["DEF123"] # negated character class - /[:alnum:]+/.match("a:l:n:u:m").to_a.should == ["a:l:n:u:m"] # should behave like regular character class composed of the individual letters + not_compliant_on :macruby do + /[:alnum:]+/.match("a:l:n:u:m").to_a.should == ["a:l:n:u:m"] # should behave like regular character class composed of the individual letters + end /[\[:alnum:]+/.match("[:a:l:n:u:m").to_a.should == ["[:a:l:n:u:m"] # should behave like regular character class composed of the individual letters - lambda { eval('/[[:alpha:]-[:digit:]]/') }.should raise_error(SyntaxError) # can't use character class as a start value of range + not_compliant_on :macruby do + lambda { eval('/[[:alpha:]-[:digit:]]/') }.should raise_error(SyntaxError) # can't use character class as a start value of range + end end language_version __FILE__, "character_classes" Modified: MacRuby/trunk/spec/frozen/language/regexp/versions/character_classes_1.9.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/regexp/versions/character_classes_1.9.rb 2010-03-16 02:03:57 UTC (rev 3766) +++ MacRuby/trunk/spec/frozen/language/regexp/versions/character_classes_1.9.rb 2010-03-16 02:04:20 UTC (rev 3767) @@ -22,8 +22,11 @@ "\u{0660}".match(/[[:alnum:]]/).to_a.should == ["\u{0660}"] end -it "matches Unicode marks with [[:alnum:]]" do - "\u{36F}".match(/[[:alnum:]]/).to_a.should == ["\u{36F}"] +not_compliant_on :macruby do + # And also 1.9.2... + it "matches Unicode marks with [[:alnum:]]" do + "\u{36F}".match(/[[:alnum:]]/).to_a.should == ["\u{36F}"] + end end it "doesn't match Unicode control characters with [[:alnum:]]" do @@ -42,8 +45,11 @@ "\u{0660}".match(/[[:alpha:]]/).to_a.should == [] end -it "matches Unicode marks with [[:alpha:]]" do - "\u{36F}".match(/[[:alpha:]]/).to_a.should == ["\u{36F}"] +not_compliant_on :macruby do + # And also 1.9.2... + it "matches Unicode marks with [[:alpha:]]" do + "\u{36F}".match(/[[:alpha:]]/).to_a.should == ["\u{36F}"] + end end it "doesn't match Unicode control characters with [[:alpha:]]" do @@ -161,12 +167,17 @@ "\u{16}".match(/[[:graph:]]/).should be_nil end -it "doesn't match Unicode format characters with [[:graph:]]" do - "\u{2060}".match(/[[:graph:]]/).should be_nil +not_compliant_on :macruby do + it "doesn't match Unicode format characters with [[:graph:]]" do + "\u{2060}".match(/[[:graph:]]/).should be_nil + end end -it "doesn't match Unicode private-use characters with [[:graph:]]" do - "\u{E001}".match(/[[:graph:]]/).should be_nil +not_compliant_on :macruby do + # And also 1.9.2... + it "doesn't match Unicode private-use characters with [[:graph:]]" do + "\u{E001}".match(/[[:graph:]]/).should be_nil + end end it "matches Unicode lowercase letter characters with [[:lower:]]" do @@ -247,15 +258,19 @@ "\u{16}".match(/[[:print:]]/).should be_nil end -it "doesn't match Unicode format characters with [[:print:]]" do - "\u{2060}".match(/[[:print:]]/).should be_nil +not_compliant_on :macruby do + it "doesn't match Unicode format characters with [[:print:]]" do + "\u{2060}".match(/[[:print:]]/).should be_nil + end end -it "doesn't match Unicode private-use characters with [[:print:]]" do - "\u{E001}".match(/[[:print:]]/).should be_nil +not_compliant_on :macruby do + # And 1.9.2... + it "doesn't match Unicode private-use characters with [[:print:]]" do + "\u{E001}".match(/[[:print:]]/).should be_nil + end end - it "doesn't match Unicode lowercase letter characters with [[:punct:]]" do "\u{FF41}".match(/[[:punct:]]/).should be_nil "\u{1D484}".match(/[[:punct:]]/).should be_nil @@ -424,9 +439,11 @@ "F".match(/[[:xdigit:]]/).to_a.should == ["F"] end -it "doesn't match Unicode digits [^0-9] with [[:xdigit:]]" do - "\u{0660}".match(/[[:xdigit:]]/).should be_nil - "\u{FF12}".match(/[[:xdigit:]]/).should be_nil +not_compliant_on :macruby do + it "doesn't match Unicode digits [^0-9] with [[:xdigit:]]" do + "\u{0660}".match(/[[:xdigit:]]/).should be_nil + "\u{FF12}".match(/[[:xdigit:]]/).should be_nil + end end it "doesn't match Unicode marks with [[:xdigit:]]" do @@ -476,8 +493,11 @@ "\u{36F}".match(/[[:word:]]/).to_a.should == ["\u{36F}"] end -it "doesn't match Unicode Nl characters with [[:word:]]" do - "\u{16EE}".match(/[[:word:]]/).should be_nil +not_compliant_on :macruby do + # And 1.9.2... + it "doesn't match Unicode Nl characters with [[:word:]]" do + "\u{16EE}".match(/[[:word:]]/).should be_nil + end end it "doesn't match Unicode No characters with [[:word:]]" do Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt 2010-03-16 02:03:57 UTC (rev 3766) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/character_classes_tags.txt 2010-03-16 02:04:20 UTC (rev 3767) @@ -1,36 +1,9 @@ -fails:Regexp with character classes matches Unicode digits with [[:alnum:]] -fails:Regexp with character classes matches Unicode space characters with [[:blank:]] -fails:Regexp with character classes matches Unicode format characters with [[:cntrl:]] -fails:Regexp with character classes matches Unicode digits with [[:digit:]] -fails:Regexp with character classes matches Unicode digits with [[:graph:]] -fails:Regexp with character classes matches Unicode private-use characters with [[:graph:]] -fails:Regexp with character classes matches Unicode lowercase letter characters with [[:lower:]] -fails:Regexp with character classes doesn't match Unicode marks with [[:lower:]] -fails:Regexp with character classes matches Unicode lowercase letter characters with [[:print:]] -fails:Regexp with character classes matches Unicode uppercase letter characters with [[:print:]] -fails:Regexp with character classes matches Unicode title-case characters with [[:print:]] -fails:Regexp with character classes matches Unicode digits with [[:print:]] -fails:Regexp with character classes matches Unicode private-use characters with [[:print:]] -fails:Regexp with character classes doesn't match Unicode digits with [[:punct:]] -fails:Regexp with character classes matches Unicode Pd characters with [[:punct:]] -fails:Regexp with character classes matches Unicode Pe characters with [[:punct:]] -fails:Regexp with character classes doesn't match Unicode format characters with [[:punct:]] -fails:Regexp with character classes matches Unicode Zs characters with [[:space:]] -fails:Regexp with character classes matches Unicode Zl characters with [[:space:]] -fails:Regexp with character classes matches Unicode Zp characters with [[:space:]] -fails:Regexp with character classes doesn't match Unicode lowercase characters with [[:upper:]] -fails:Regexp with character classes matches Unicode uppercase characters with [[:upper:]] -fails:Regexp with character classes matches Unicode lowercase characters with [[:word:]] -fails:Regexp with character classes matches Unicode uppercase characters with [[:word:]] -fails:Regexp with character classes matches Unicode title-case characters with [[:word:]] -fails:Regexp with character classes matches Unicode decimal digits with [[:word:]] -fails:Regexp with character classes doesn't match Unicode private-use characters with [[:cntrl:]] -fails:Regexp with character classes doesn't match Unicode format characters with [[:graph:]] -fails:Regexp with character classes doesn't match Unicode format characters with [[:print:]] -fails:Regexp with character classes doesn't match Unicode No characters with [[:word:]] -fails:Regexp with character classes matches Unicode Pf characters with [[:punct:]] -fails:Regexp with character classes matches Unicode letter characters with [[:alnum:]] -fails:Regexp with character classes matches Unicode letter characters with [[:alpha:]] -fails:Regexp with character classes matches Unicode letter characters with [[:graph:]] -fails:Regexp with character classes matches Unicode Pi characters with [[:punct:]] -fails:Regexp with character classes matches Unicode Po characters with [[:punct:]] +#fails:Regexp with character classes matches Unicode digits with [[:alnum:]] +#fails:Regexp with character classes matches Unicode space characters with [[:blank:]] +#fails:Regexp with character classes matches Unicode format characters with [[:cntrl:]] +#fails:Regexp with character classes matches Unicode digits with [[:digit:]] +#fails:Regexp with character classes matches Unicode digits with [[:graph:]] +#fails:Regexp with character classes matches Unicode private-use characters with [[:graph:]] +critical:Regexp with character classes matches Unicode lowercase letter characters with [[:lower:]] +critical:Regexp with character classes matches Unicode lowercase letter characters with [[:print:]] +critical:Regexp with character classes matches Unicode lowercase characters with [[:word:]] Modified: MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt 2010-03-16 02:03:57 UTC (rev 3766) +++ MacRuby/trunk/spec/frozen/tags/macruby/language/regexp/encoding_tags.txt 2010-03-16 02:04:20 UTC (rev 3767) @@ -1,6 +1,7 @@ -fails:Regexps with encoding modifiers supports /n (Normal encoding) +fails:Regexps with encoding modifiers supports /e (EUC encoding) +fails:Regexps with encoding modifiers supports /e (EUC encoding) with interpolation +fails:Regexps with encoding modifiers supports /e (EUC encoding) with interpolation /o fails:Regexps with encoding modifiers supports /s (Windows_31J encoding) -fails:Regexps with encoding modifiers supports /n (No encoding) fails:Regexps with encoding modifiers supports /n (No encoding) with interpolation fails:Regexps with encoding modifiers supports /n (No encoding) with interpolation /o fails:Regexps with encoding modifiers supports /s (Windows_31J encoding) with interpolation

1 0

[3766] MacRuby/trunk/parse.y
by source_changes＠macosforge.org 16 Mar '10

16 Mar '10

Revision: 3766 http://trac.macosforge.org/projects/ruby/changeset/3766 Author: lsansonetti(a)apple.com Date: 2010-03-15 19:03:57 -0700 (Mon, 15 Mar 2010) Log Message: ----------- support unicode code points via \u{} Modified Paths: -------------- MacRuby/trunk/parse.y Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2010-03-15 22:01:12 UTC (rev 3765) +++ MacRuby/trunk/parse.y 2010-03-16 02:03:57 UTC (rev 3766) @@ -5508,13 +5508,20 @@ } } +#include <unicode/utf8.h> + static void parser_tokaddmbc(struct parser_params *parser, int c, rb_encoding *enc) { #if WITH_OBJC - /* FIXME */ - char *buf = tokspace(1); - *(buf) = c; + const int bytelen = U8_LENGTH(c); + uint8_t *buf = (uint8_t *)tokspace(bytelen); + UBool error = false; + int offset = 0; + U8_APPEND(buf, offset, bytelen, c, error); + if (error) { + rb_raise(rb_eArgError, "invalid unicode point U+%d", c); + } #else int len = rb_enc_codelen(c, enc); rb_enc_mbcput(c, tokspace(len), enc);

1 0

[3765] MacRuby/trunk/spec/frozen/language/regexp
by source_changes＠macosforge.org 15 Mar '10

15 Mar '10

Revision: 3765 http://trac.macosforge.org/projects/ruby/changeset/3765 Author: lsansonetti(a)apple.com Date: 2010-03-15 15:01:12 -0700 (Mon, 15 Mar 2010) Log Message: ----------- mark 2 specs as not compliant on macruby because of ICU limitations Modified Paths: -------------- MacRuby/trunk/spec/frozen/language/regexp/back-references_spec.rb MacRuby/trunk/spec/frozen/language/regexp/repetition_spec.rb Modified: MacRuby/trunk/spec/frozen/language/regexp/back-references_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/regexp/back-references_spec.rb 2010-03-15 22:00:44 UTC (rev 3764) +++ MacRuby/trunk/spec/frozen/language/regexp/back-references_spec.rb 2010-03-15 22:01:12 UTC (rev 3765) @@ -42,7 +42,7 @@ /(foo.)\1/.match("foo1foo2").should be_nil end - not_compliant_on :ironruby do + not_compliant_on :ironruby, :macruby do it 'resets nested \<n> backreference before match of outer subexpression' do /(a\1?){2}/.match("aaaa").to_a.should == ["aa", "a"] end Modified: MacRuby/trunk/spec/frozen/language/regexp/repetition_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/regexp/repetition_spec.rb 2010-03-15 22:00:44 UTC (rev 3764) +++ MacRuby/trunk/spec/frozen/language/regexp/repetition_spec.rb 2010-03-15 22:01:12 UTC (rev 3765) @@ -35,9 +35,11 @@ /.([0-9]){3,5}?foo/.match("9876543210foo").to_a.should == ["543210foo", "0"] end end - - it 'does not treat {m,n}+ as possessive' do - /foo(A{0,1}+)Abar/.match("fooAAAbar").to_a.should == ["fooAAAbar", "AA"] + + not_compliant_on :macruby do + it 'does not treat {m,n}+ as possessive' do + /foo(A{0,1}+)Abar/.match("fooAAAbar").to_a.should == ["fooAAAbar", "AA"] + end end it 'supports ? (0 or 1 of previous subexpression)' do

1 0

[3764] MacRuby/trunk/spec/frozen/language/regexp/encoding_spec.rb
by source_changes＠macosforge.org 15 Mar '10

15 Mar '10

Revision: 3764 http://trac.macosforge.org/projects/ruby/changeset/3764 Author: lsansonetti(a)apple.com Date: 2010-03-15 15:00:44 -0700 (Mon, 15 Mar 2010) Log Message: ----------- remove unnecessary not_compliant_on call Modified Paths: -------------- MacRuby/trunk/spec/frozen/language/regexp/encoding_spec.rb Modified: MacRuby/trunk/spec/frozen/language/regexp/encoding_spec.rb =================================================================== --- MacRuby/trunk/spec/frozen/language/regexp/encoding_spec.rb 2010-03-13 09:07:51 UTC (rev 3763) +++ MacRuby/trunk/spec/frozen/language/regexp/encoding_spec.rb 2010-03-15 22:00:44 UTC (rev 3764) @@ -7,62 +7,60 @@ # core/regexp/encoding_spec.rb for 1.9 ruby_version_is ""..."1.9" do - not_compliant_on :macruby do - it 'supports /e (EUC encoding)' do - match = /./e.match("\303\251") - match.to_a.should == ["\303\251"] - end - - it 'supports /e (EUC encoding) with interpolation' do - match = /#{/./}/e.match("\303\251") - match.to_a.should == ["\303\251"] - end - - it 'supports /e (EUC encoding) with interpolation and /o' do - match = /#{/./}/e.match("\303\251") - match.to_a.should == ["\303\251"] - end - - it 'supports /n (Normal encoding)' do - /./n.match("\303\251").to_a.should == ["\303"] - end - - it 'supports /n (Normal encoding) with interpolation' do - /#{/./}/n.match("\303\251").to_a.should == ["\303"] - end - - it 'supports /n (Normal encoding) with interpolation and /o' do - /#{/./}/no.match("\303\251").to_a.should == ["\303"] - end - - it 'supports /s (SJIS encoding)' do - /./s.match("\303\251").to_a.should == ["\303"] - end - - it 'supports /s (SJIS encoding) with interpolation' do - /#{/./}/s.match("\303\251").to_a.should == ["\303"] - end - - it 'supports /s (SJIS encoding) with interpolation and /o' do - /#{/./}/so.match("\303\251").to_a.should == ["\303"] - end - - it 'supports /u (UTF8 encoding)' do - /./u.match("\303\251").to_a.should == ["\303\251"] - end + it 'supports /e (EUC encoding)' do + match = /./e.match("\303\251") + match.to_a.should == ["\303\251"] + end + + it 'supports /e (EUC encoding) with interpolation' do + match = /#{/./}/e.match("\303\251") + match.to_a.should == ["\303\251"] + end + + it 'supports /e (EUC encoding) with interpolation and /o' do + match = /#{/./}/e.match("\303\251") + match.to_a.should == ["\303\251"] + end + + it 'supports /n (Normal encoding)' do + /./n.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /n (Normal encoding) with interpolation' do + /#{/./}/n.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /n (Normal encoding) with interpolation and /o' do + /#{/./}/no.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /s (SJIS encoding)' do + /./s.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /s (SJIS encoding) with interpolation' do + /#{/./}/s.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /s (SJIS encoding) with interpolation and /o' do + /#{/./}/so.match("\303\251").to_a.should == ["\303"] + end + + it 'supports /u (UTF8 encoding)' do + /./u.match("\303\251").to_a.should == ["\303\251"] + end - it 'supports /u (UTF8 encoding) with interpolation' do - /#{/./}/u.match("\303\251").to_a.should == ["\303\251"] - end + it 'supports /u (UTF8 encoding) with interpolation' do + /#{/./}/u.match("\303\251").to_a.should == ["\303\251"] + end - it 'supports /u (UTF8 encoding) with interpolation and /o' do - /#{/./}/uo.match("\303\251").to_a.should == ["\303\251"] - end - - it 'selects last of multiple encoding specifiers' do - /foo/ensuensuens.should == /foo/s - end + it 'supports /u (UTF8 encoding) with interpolation and /o' do + /#{/./}/uo.match("\303\251").to_a.should == ["\303\251"] end + + it 'selects last of multiple encoding specifiers' do + /foo/ensuensuens.should == /foo/s + end end ruby_version_is "1.9" do

1 0

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

13 Mar '10

Revision: 3763 http://trac.macosforge.org/projects/ruby/changeset/3763 Author: lsansonetti(a)apple.com Date: 2010-03-13 01:07:51 -0800 (Sat, 13 Mar 2010) Log Message: ----------- get rid of #hash since the super class defines it Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-13 08:37:11 UTC (rev 3762) +++ MacRuby/trunk/string.c 2010-03-13 09:07:51 UTC (rev 3763) @@ -5047,19 +5047,6 @@ } /* - * call-seq: - * str.hash => fixnum - * - * Return a hash based on the string's length and content. - */ - -static VALUE -rstr_hash(VALUE str, SEL sel) -{ - return LONG2NUM(rb_str_hash(str)); -} - -/* * call-seq: * str.partition(sep) => [head, sep, tail] * @@ -5364,7 +5351,6 @@ rb_objc_define_method(rb_cRubyString, "tr_s", rstr_tr_s, 2); rb_objc_define_method(rb_cRubyString, "tr_s!", rstr_tr_s_bang, 2); rb_objc_define_method(rb_cRubyString, "sum", rstr_sum, -1); - rb_objc_define_method(rb_cRubyString, "hash", rstr_hash, 0); rb_objc_define_method(rb_cRubyString, "partition", rstr_partition, 1); rb_objc_define_method(rb_cRubyString, "rpartition", rstr_rpartition, 1); rb_objc_define_method(rb_cRubyString, "crypt", rstr_crypt, 1);

1 0

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

13 Mar '10

Revision: 3762 http://trac.macosforge.org/projects/ruby/changeset/3762 Author: lsansonetti(a)apple.com Date: 2010-03-13 00:37:11 -0800 (Sat, 13 Mar 2010) Log Message: ----------- oops Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-13 07:28:48 UTC (rev 3761) +++ MacRuby/trunk/string.c 2010-03-13 08:37:11 UTC (rev 3762) @@ -5450,6 +5450,7 @@ "cannot coerce NSString %p as UTF-8 data", (void *)str); } str = rb_str_new2(buf); + free(buf); } } str_make_data_binary(RSTR(str));

1 0

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

13 Mar '10

Revision: 3761 http://trac.macosforge.org/projects/ruby/changeset/3761 Author: lsansonetti(a)apple.com Date: 2010-03-12 23:28:48 -0800 (Fri, 12 Mar 2010) Log Message: ----------- added support for NSString -> bytestring coercion Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-13 04:33:48 UTC (rev 3760) +++ MacRuby/trunk/string.c 2010-03-13 07:28:48 UTC (rev 3761) @@ -5432,11 +5432,28 @@ VALUE rb_str_bstr(VALUE str) { - if (IS_RSTR(str)) { - str_make_data_binary(RSTR(str)); - return str; + if (!IS_RSTR(str)) { + const char *cptr = CFStringGetCStringPtr((CFStringRef)str, + kCFStringEncodingUTF8); + if (cptr != NULL) { + str = rb_str_new2(cptr); + } + else { + const long max = CFStringGetMaximumSizeForEncoding( + CFStringGetLength((CFStringRef)str), kCFStringEncodingUTF8); + assert(max > 0); + char *buf = (char *)malloc(max + 1); + if (!CFStringGetCString((CFStringRef)str, buf, max, + kCFStringEncodingUTF8)) { + free(buf); + rb_raise(rb_eArgError, + "cannot coerce NSString %p as UTF-8 data", (void *)str); + } + str = rb_str_new2(buf); + } } - abort(); // TODO + str_make_data_binary(RSTR(str)); + return str; } uint8_t *

1 0

[3760] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 13 Mar '10

13 Mar '10

Revision: 3760 http://trac.macosforge.org/projects/ruby/changeset/3760 Author: lsansonetti(a)apple.com Date: 2010-03-12 20:33:48 -0800 (Fri, 12 Mar 2010) Log Message: ----------- moved a spec out of a fixture file (not sure why it was added there...) Modified Paths: -------------- MacRuby/trunk/spec/macruby/fixtures/method.rb MacRuby/trunk/spec/macruby/language/objc_method_spec.rb Modified: MacRuby/trunk/spec/macruby/fixtures/method.rb =================================================================== --- MacRuby/trunk/spec/macruby/fixtures/method.rb 2010-03-13 04:31:56 UTC (rev 3759) +++ MacRuby/trunk/spec/macruby/fixtures/method.rb 2010-03-13 04:33:48 UTC (rev 3760) @@ -69,16 +69,3 @@ x + x2 == 42 end end - -require File.dirname(__FILE__) + "/../spec_helper" - -describe "An Obj-C object" do - before :each do - @o = TestMethod.new - end - - it "allows the use of #[] and #[]= as respective shortcuts to objectForKey: and setObject:forKey:" do - @o['foo'] = 'ok' - @o['foo'].should == 'ok' - end -end Modified: MacRuby/trunk/spec/macruby/language/objc_method_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2010-03-13 04:31:56 UTC (rev 3759) +++ MacRuby/trunk/spec/macruby/language/objc_method_spec.rb 2010-03-13 04:33:48 UTC (rev 3760) @@ -691,3 +691,14 @@ @um.canUndo.should == false end end + +describe "An Obj-C object" do + before :each do + @o = TestMethod.new + end + + it "allows the use of #[] and #[]= as respective shortcuts to objectForKey: and setObject:forKey:" do + @o['foo'] = 'ok' + @o['foo'].should == 'ok' + end +end

1 0