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

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

19 Mar '10

Revision: 3819 http://trac.macosforge.org/projects/ruby/changeset/3819 Author: lsansonetti(a)apple.com Date: 2010-03-18 20:09:53 -0700 (Thu, 18 Mar 2010) Log Message: ----------- fixed a few bugs in #sprintf Modified Paths: -------------- MacRuby/trunk/sprintf.c Modified: MacRuby/trunk/sprintf.c =================================================================== --- MacRuby/trunk/sprintf.c 2010-03-19 02:10:49 UTC (rev 3818) +++ MacRuby/trunk/sprintf.c 2010-03-19 03:09:53 UTC (rev 3819) @@ -435,7 +435,8 @@ continue; } if (format_str[i + 1] == '%') { - cstr_update(&format_str, &format_str_capa, i, 1, 0); + num = cstr_update(&format_str, &format_str_capa, i, 1, 0); + format_len += num; continue; } @@ -747,23 +748,25 @@ arg = rb_big2str(num, base); if (!sign_pad && IS_NEG(num) && negative_pad != 0) { - break; // TODO -#if 0 - UChar neg = CFStringGetCharacterAtIndex(negative_pad, 0); - char *str_ptr = (char *)RSTRING_PTR(arg) + 1; + UChar neg = rb_str_get_uchar(negative_pad, 0); if (base == 8) { - *str_ptr |= ((~0 << 3) >> ((3 * strlen(str_ptr)) % - (sizeof(BDIGIT) * 8))) & ~(~0 << 3); + UChar c = rb_str_get_uchar(arg, 1); + const long len = rb_str_chars_len(arg) - 1; + c |= ((~0 << 3) >> ((3 * len) + % (sizeof(BDIGIT) * 8))) & ~(~0 << 3); + rb_str_update(arg, 1, 1, rb_unicode_str_new(&c, 1)); } - while (*str_ptr++ == neg) { + for (int i = 1, count = rb_str_chars_len(arg); i < count; + i++) { + if (rb_str_get_uchar(arg, i) != neg) { + break; + } num_index++; } - rb_str_update(arg, 0, num_index, (VALUE)negative_pad); - rb_str_update(arg, 0, 0, (VALUE)CFSTR("..")); + rb_str_update(arg, 0, num_index, negative_pad); + rb_str_update(arg, 0, 0, rb_str_new2("..")); num_index = 2; -#endif } - if (precision_flag) { pad_format_value(arg, num_index, precision + (IS_NEG(num)

1 0

[3818] MacRuby/trunk/spec/frozen/tags/macruby/core/string/rindex_tags.txt
by source_changes＠macosforge.org 19 Mar '10

19 Mar '10

Revision: 3818 http://trac.macosforge.org/projects/ruby/changeset/3818 Author: lsansonetti(a)apple.com Date: 2010-03-18 19:10:49 -0700 (Thu, 18 Mar 2010) Log Message: ----------- untag specs that now pass Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/rindex_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/rindex_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/rindex_tags.txt 2010-03-19 02:10:36 UTC (rev 3817) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/rindex_tags.txt 2010-03-19 02:10:49 UTC (rev 3818) @@ -1,13 +1 @@ -fails:String#rindex with object tries to convert obj to a string via to_str -fails:String#rindex with Fixnum doesn't use fixnum % 256 -fails:String#rindex with Fixnum returns nil if the character isn't found -fails:String#rindex with Fixnum tries to convert start_offset to an integer via to_int -fails:String#rindex with String behaves the same as String#rindex(char) for one-character strings -fails:String#rindex with String returns the index of the last occurrence of the given substring -fails:String#rindex with String starts the search at the given offset -fails:String#rindex with String returns nil if the substring isn't found -fails:String#rindex with String tries to convert start_offset to an integer via to_int -fails:String#rindex with Regexp behaves the same as String#rindex(string) for escaped string regexps -fails:String#rindex with Regexp tries to convert start_offset to an integer via to_int -fails:String#rindex with String behaves the same as String#rindex(?char) for one-character strings -fails:String#rindex with Regexp starts the search at the given offset +fails:String#rindex with Regexp supports \G which matches at the given start offset

1 0

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

19 Mar '10

Revision: 3817 http://trac.macosforge.org/projects/ruby/changeset/3817 Author: lsansonetti(a)apple.com Date: 2010-03-18 19:10:36 -0700 (Thu, 18 Mar 2010) Log Message: ----------- fixed a bunch of bugs in #rindex Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-03-19 02:10:21 UTC (rev 3816) +++ MacRuby/trunk/string.c 2010-03-19 02:10:36 UTC (rev 3817) @@ -1003,7 +1003,7 @@ return 0; } if (searched->length_in_bytes == 0) { - return start_offset_in_bytes; + return backward_search ? end_offset_in_bytes : start_offset_in_bytes; } str_must_have_compatible_encoding(self, searched); str_make_same_format(self, searched); @@ -1020,12 +1020,12 @@ } if (backward_search) { - for (long offset_in_bytes = end_offset_in_bytes; - offset_in_bytes >= start_offset_in_bytes; - offset_in_bytes -= increment) { - if (memcmp(self->data.bytes+offset_in_bytes, searched->data.bytes, + for (long offset = end_offset_in_bytes - increment; + offset >= start_offset_in_bytes; + offset -= increment) { + if (memcmp(self->data.bytes + offset, searched->data.bytes, searched->length_in_bytes) == 0) { - return offset_in_bytes; + return offset; } } } @@ -1033,12 +1033,12 @@ const long max_offset_in_bytes = end_offset_in_bytes - searched->length_in_bytes + 1; - for (long offset_in_bytes = start_offset_in_bytes; - offset_in_bytes < max_offset_in_bytes; - offset_in_bytes += increment) { - if (memcmp(self->data.bytes+offset_in_bytes, searched->data.bytes, + for (long offset = start_offset_in_bytes; + offset < max_offset_in_bytes; + offset += increment) { + if (memcmp(self->data.bytes + offset, searched->data.bytes, searched->length_in_bytes) == 0) { - return offset_in_bytes; + return offset; } } } @@ -1956,11 +1956,11 @@ } } if (pos >= len) { - pos = len - 1; + pos = len; } } else { - pos = len - 1; + pos = len; } switch (TYPE(sub)) { @@ -1972,8 +1972,10 @@ StringValue(sub); // fall through case T_STRING: - pos = str_index_for_string(RSTR(self), str_need_string(sub), - 0, pos - 1, true, true); + if (rb_str_chars_len(sub) > 0) { + pos = str_index_for_string(RSTR(self), str_need_string(sub), + 0, pos, true, true); + } break; }

1 0

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

19 Mar '10

Revision: 3816 http://trac.macosforge.org/projects/ruby/changeset/3816 Author: lsansonetti(a)apple.com Date: 2010-03-18 19:10:21 -0700 (Thu, 18 Mar 2010) Log Message: ----------- added support for reverse regexps (naive but working) Modified Paths: -------------- MacRuby/trunk/re.cpp Modified: MacRuby/trunk/re.cpp =================================================================== --- MacRuby/trunk/re.cpp 2010-03-19 02:09:47 UTC (rev 3815) +++ MacRuby/trunk/re.cpp 2010-03-19 02:10:21 UTC (rev 3816) @@ -553,10 +553,6 @@ int rb_reg_search(VALUE re, VALUE str, int pos, bool reverse) { - if (reverse) { - rb_raise(rb_eRuntimeError, "reverse searching is not implemented yet"); - } - const long len = rb_str_chars_len(str); if (pos > len || pos < 0) { rb_backref_set(Qnil); @@ -576,8 +572,24 @@ u_errorName(status)); } - if (!matcher->find(pos, status)) { + if (reverse) { + const int orig = pos; + while (pos >= 0) { + if (matcher->find(pos, status)) { + if (matcher->start(status) <= orig) { + break; + } + } + pos--; + } + if (pos < 0) { + // No match. + goto no_match; + } + } + else if (!matcher->find(pos, status)) { // No match. +no_match: rb_backref_set(Qnil); delete matcher; delete unistr;

1 0

[3815] MacRuby/trunk/dispatcher.cpp
by source_changes＠macosforge.org 19 Mar '10

19 Mar '10

Revision: 3815 http://trac.macosforge.org/projects/ruby/changeset/3815 Author: lsansonetti(a)apple.com Date: 2010-03-18 19:09:47 -0700 (Thu, 18 Mar 2010) Log Message: ----------- when dispatching a custom #respond_to? method, do not pass the second optional argument in case the arity is incompatible Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-03-18 23:21:52 UTC (rev 3814) +++ MacRuby/trunk/dispatcher.cpp 2010-03-19 02:09:47 UTC (rev 3815) @@ -1956,7 +1956,15 @@ int n = 0; args[n++] = ID2SYM(rb_intern(sel_getName(sel))); if (priv) { - args[n++] = Qtrue; + rb_vm_method_node_t *node = method_node_get(imp); + if (node != NULL + && (2 < node->arity.min + || (node->arity.max != -1 && 2 > node->arity.max))) { + // Do nothing, custom respond_to? method incompatible arity. + } + else { + args[n++] = Qtrue; + } } return rb_vm_call(obj, selRespondTo, n, args, false) == Qtrue; }

1 0

[3814] MacRuby/trunk/spec/frozen/tags/macruby/core/string
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3814 http://trac.macosforge.org/projects/ruby/changeset/3814 Author: lsansonetti(a)apple.com Date: 2010-03-18 16:21:52 -0700 (Thu, 18 Mar 2010) Log Message: ----------- tag more specs Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/encode_tags.txt MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/encode_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/encode_tags.txt 2010-03-18 23:13:02 UTC (rev 3813) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/encode_tags.txt 2010-03-18 23:21:52 UTC (rev 3814) @@ -27,3 +27,4 @@ fails:String#encode replaces xml characters fails:String#encode replaces xml characters and quotes the result fails:String#encode with no arguments returns a copy of self transcoded to Encoding.default_internal +fails:String#encode with no arguments returns a copy of self Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt 2010-03-18 23:13:02 UTC (rev 3813) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/unpack_tags.txt 2010-03-18 23:21:52 UTC (rev 3814) @@ -13,3 +13,4 @@ fails:String#unpack with 'm' directive returns an array by decoding self according to the format string fails:String#unpack with 'IiLlSs' directives uses sizeof(int) as an integer fails:String#unpack with 'lL' uses 4 bytes for an integer +fails:String#unpack with 'M' directive returns an array by decoding self according to the format string

1 0

[3813] MacRuby/trunk/spec/frozen/tags/macruby/core/string/tr_s_tags.txt
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3813 http://trac.macosforge.org/projects/ruby/changeset/3813 Author: lsansonetti(a)apple.com Date: 2010-03-18 16:13:02 -0700 (Thu, 18 Mar 2010) Log Message: ----------- tag failing #tr_s specs Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/string/tr_s_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/string/tr_s_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/string/tr_s_tags.txt 2010-03-18 23:06:28 UTC (rev 3812) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/string/tr_s_tags.txt 2010-03-18 23:13:02 UTC (rev 3813) @@ -1,3 +1,6 @@ fails:String#tr_s accepts c1-c2 notation to denote ranges of characters fails:String#tr_s translates chars not in from_string when it starts with a ^ fails:String#tr_s! raises a TypeError if self is frozen +fails:String#tr_s returns a string processed according to tr with newly duplicate characters removed +fails:String#tr_s pads to_str with its last char if it is shorter than from_string +fails:String#tr_s! modifies self in place

1 0

[3812] MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3812 http://trac.macosforge.org/projects/ruby/changeset/3812 Author: lsansonetti(a)apple.com Date: 2010-03-18 16:06:28 -0700 (Thu, 18 Mar 2010) Log Message: ----------- untag specs that now pass Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt 2010-03-18 23:06:14 UTC (rev 3811) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/integer/chr_tags.txt 2010-03-18 23:06:28 UTC (rev 3812) @@ -1,12 +1,9 @@ -critical:Integer#chr raises a RangeError if self is out of the ASCII character range -fails:Integer#chr without argument returns a US-ASCII String if self is between 0 and 127 (inclusive) fails:Integer#chr without argument interprets self as a codepoint in the corresponding character set fails:Integer#chr without argument raises a RangeError is self is greater than 255 and the internal encoding is nil fails:Integer#chr without argument infers the encoding from Encoding.default_internal -fails:Integer#chr with an encoding argument returns a String -fails:Integer#chr with an encoding argument converts a String to an Encoding as Encoding.find does -fails:Integer#chr with an encoding argument returns characters in the specified encoding even if they exist in US-ASCII fails:Integer#chr with an encoding argument behaves as called with no argument if encoding is specified as ASCII-8BIT and self is between 128 and 255 fails:Integer#chr with an encoding argument interprets self as a codepoint in the corresponding character set fails:Integer#chr with an encoding argument raises a RangeError if self is an invalid codepoint for the given encoding fails:Integer#chr with an encoding argument raises a RangeError is self is less than 0 +fails:Integer#chr with an encoding argument accepts an Encoding object as an argument +fails:Integer#chr with an encoding argument accepts a String as an argument

1 0

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

18 Mar '10

Revision: 3811 http://trac.macosforge.org/projects/ruby/changeset/3811 Author: lsansonetti(a)apple.com Date: 2010-03-18 16:06:14 -0700 (Thu, 18 Mar 2010) Log Message: ----------- fixed some bugs in Numeric#chr Modified Paths: -------------- MacRuby/trunk/include/ruby/encoding.h MacRuby/trunk/numeric.c MacRuby/trunk/sprintf.c Modified: MacRuby/trunk/include/ruby/encoding.h =================================================================== --- MacRuby/trunk/include/ruby/encoding.h 2010-03-18 22:02:12 UTC (rev 3810) +++ MacRuby/trunk/include/ruby/encoding.h 2010-03-18 23:06:14 UTC (rev 3811) @@ -126,8 +126,6 @@ void rb_enc_set_default_external(VALUE encoding); long rb_memsearch(const void*,long,const void*,long,rb_encoding*); -VALUE rb_num_to_chr(VALUE, rb_encoding *); - RUBY_EXTERN VALUE rb_cEncoding; static inline int Modified: MacRuby/trunk/numeric.c =================================================================== --- MacRuby/trunk/numeric.c 2010-03-18 22:02:12 UTC (rev 3810) +++ MacRuby/trunk/numeric.c 2010-03-18 23:06:14 UTC (rev 3811) @@ -19,7 +19,10 @@ #include <ruby/node.h> #include "vm.h" #include "id.h" +#include "encoding.h" +#include <unicode/utf8.h> + #ifdef HAVE_FLOAT_H #include <float.h> #endif @@ -1919,29 +1922,6 @@ return rb_vm_call(num, selMINUS, 1, &one, false); } -VALUE -rb_num_to_chr(VALUE num, rb_encoding *enc) -{ - // XXX completely broken - long i = NUM2LONG(num); - char c[2] = {i, '\0'}; - - if (enc) { - return rb_enc_str_new(c, 1, enc); - } - else { - if (i < 0 || 0xff < i) { - rb_raise(rb_eRangeError, "%"PRIdVALUE " out of char range", i); - } - if (i < 0x80) { - return rb_usascii_str_new(c, 1); - } - else { - return rb_str_new(c, 1); - } - } -} - /* * call-seq: * int.chr([encoding]) => string @@ -1957,10 +1937,79 @@ static VALUE int_chr(VALUE num, SEL sel, int argc, VALUE *argv) { - if (argc > 1) { - rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc); + long i = NUM2LONG(num); + rb_encoding_t *enc = NULL; + + switch (argc) { + case 0: + if (i < 0) { +out_of_range: + rb_raise(rb_eRangeError, "%"PRIdVALUE " out of char range", i); + } + if (0xff < i) { + goto decode; + } + else { + char c = (char)i; + if (i < 0x80) { + return rb_usascii_str_new(&c, 1); + } + return rb_bstr_new_with_data((uint8_t *)&c, 1); + } + break; + + case 1: + break; + + default: + rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", + argc); } - return rb_num_to_chr(num, (argc ? rb_to_encoding(argv[0]) : NULL)); + + enc = rb_to_encoding(argv[0]); + +decode: + if (i < 0 || i > UINT_MAX) { + goto out_of_range; + } + + if (enc == NULL) { + enc = rb_encodings[ENCODING_BINARY]; + } + + if (enc == rb_encodings[ENCODING_BINARY]) { + uint8_t c = (uint8_t)i; + return rb_bstr_new_with_data(&c, 1); + } + + if (enc == rb_encodings[ENCODING_ASCII]) { + if (i >= 0x80) { + goto out_of_range; + } + char c = (char)i; + return rb_enc_str_new(&c, 1, enc); + } + + if (enc == rb_encodings[ENCODING_UTF8]) { + const int bytelen = U8_LENGTH(i); + if (bytelen <= 0) { + goto out_of_range; + } + uint8_t *buf = (uint8_t *)malloc(bytelen); + int offset = 0; + UBool error = false; + U8_APPEND(buf, offset, bytelen, i, error); + if (error) { + free(buf); + goto out_of_range; + } + VALUE str = rb_enc_str_new((char *)buf, bytelen, enc); + free(buf); + return str; + } + + rb_raise(rb_eArgError, "encoding `%s' not supported yet", + RSTRING_PTR(rb_inspect((VALUE)enc))); } static VALUE Modified: MacRuby/trunk/sprintf.c =================================================================== --- MacRuby/trunk/sprintf.c 2010-03-18 22:02:12 UTC (rev 3810) +++ MacRuby/trunk/sprintf.c 2010-03-18 23:06:14 UTC (rev 3811) @@ -628,9 +628,13 @@ arg = rb_str_substr(arg, 0, 1); } else { - // rb_num_to_chr is broken so leave out the - // enc or we don't get range checking - arg = rb_num_to_chr(arg, NULL /*rb_enc_get(fmt)*/); + long num = NUM2LONG(arg); + if (num < 0 || i > 0xff) { + rb_raise(rb_eRangeError, "%ld out of char range", + num); + } + char c = (char)num; + arg = rb_str_new(&c, 1); } complete = true; break;

1 0

[3810] MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/ fixed_encoding_tags.txt
by source_changes＠macosforge.org 18 Mar '10

18 Mar '10

Revision: 3810 http://trac.macosforge.org/projects/ruby/changeset/3810 Author: lsansonetti(a)apple.com Date: 2010-03-18 15:02:12 -0700 (Thu, 18 Mar 2010) Log Message: ----------- untag specs that now pass Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/fixed_encoding_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/fixed_encoding_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/fixed_encoding_tags.txt 2010-03-18 22:01:59 UTC (rev 3809) +++ MacRuby/trunk/spec/frozen/tags/macruby/core/regexp/fixed_encoding_tags.txt 2010-03-18 22:02:12 UTC (rev 3810) @@ -1,4 +1,3 @@ fails:Regexp#fixed_encoding? returns true if the 'u' modifier was supplied to the Regexp fails:Regexp#fixed_encoding? returns true if the 's' modifier was supplied to the Regexp fails:Regexp#fixed_encoding? returns true if the 'e' modifier was supplied to the Regexp -fails:Regexp#fixed_encoding? returns true if the Regexp contains a \u escape

1 0