diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string.c | 18 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 9 |
3 files changed, 25 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Tue Aug 23 10:15:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * string.c (rb_fs_setter): check and convert $; value at + assignment. + Tue Aug 23 02:09:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_split_m): show $; name in error message when it @@ -7126,7 +7126,7 @@ rb_str_split_m(int argc, VALUE *argv, VALUE str) split_type = regexp; } else if (rb_enc_asciicompat(enc2) == 1) { - if (RSTRING_LEN(spat) == 1 && RSTRING_PTR(spat)[0] == ' '){ + if (RSTRING_LEN(spat) == 1 && RSTRING_PTR(spat)[0] == ' ') { split_type = awk; } } @@ -8861,6 +8861,18 @@ rb_str_setter(VALUE val, ID id, VALUE *var) *var = val; } +static void +rb_fs_setter(VALUE val, ID id, VALUE *var) +{ + val = rb_fs_check(val); + if (!val) { + rb_raise(rb_eTypeError, + "value of %"PRIsVALUE" must be String or Regexp", + rb_id2str(id)); + } + *var = val; +} + /* * call-seq: @@ -9879,8 +9891,8 @@ Init_String(void) rb_define_method(rb_cString, "ascii_only?", rb_str_is_ascii_only_p, 0); rb_fs = Qnil; - rb_define_variable("$;", &rb_fs); - rb_define_variable("$-F", &rb_fs); + rb_define_hooked_variable("$;", &rb_fs, 0, rb_fs_setter); + rb_define_hooked_variable("$-F", &rb_fs, 0, rb_fs_setter); rb_cSymbol = rb_define_class("Symbol", rb_cObject); rb_include_module(rb_cSymbol, rb_mComparable); diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index e5aa2251a7..4970af15e4 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -1389,13 +1389,14 @@ CODE assert_equal([], "".split(//, 1)) assert_equal("[2, 3]", [1,2,3].slice!(1,10000).inspect, "moved from btest/knownbug") + ensure + $; = fs + end - $; = [] + def test_fs assert_raise_with_message(TypeError, /\$;/) { - "".split + $; = [] } - ensure - $; = fs end def test_split_encoding |