From 98aff0edce3d8f6126787f4b16eba5e8194fc2db Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 23 Aug 2016 01:15:04 +0000 Subject: string.c: rb_fs_setter * string.c (rb_fs_setter): check and convert $; value at assignment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55990 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index f74cbaafd1..9bb739c154 100644 --- a/string.c +++ b/string.c @@ -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); -- cgit v1.2.3