From 7047c52d7be0dbe8c6e35e8ca04ccf408e5a2769 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sun, 20 Oct 2019 16:26:10 +0900 Subject: Use `mrb_str_cat_str` instead of `mrb_str_concat` if possible --- mrbgems/mruby-string-ext/src/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mrbgems') diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index acf780005..ffad0f527 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -174,8 +174,8 @@ mrb_str_concat_m(mrb_state *mrb, mrb_value self) str = int_chr_binary(mrb, str); #endif else - str = mrb_ensure_string_type(mrb, str); - mrb_str_concat(mrb, self, str); + mrb_ensure_string_type(mrb, str); + mrb_str_cat_str(mrb, self, str); return self; } -- cgit v1.2.3 From 941b99955a1da1156648e31293707884423fdcd1 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Mon, 21 Oct 2019 18:50:52 +0900 Subject: Remove `Kernel#getc` `Kernel#getc` has been removed since Ruby 1.9 and is not defined in ISO. --- mrbgems/mruby-io/mrblib/kernel.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mrbgems') diff --git a/mrbgems/mruby-io/mrblib/kernel.rb b/mrbgems/mruby-io/mrblib/kernel.rb index 42d5bb1d1..9cb3b5650 100644 --- a/mrbgems/mruby-io/mrblib/kernel.rb +++ b/mrbgems/mruby-io/mrblib/kernel.rb @@ -28,8 +28,4 @@ module Kernel def gets(*args) $stdin.gets(*args) end - - def getc(*args) - $stdin.getc(*args) - end end -- cgit v1.2.3 From 11184e9186f26264b7d453dce56c9a16f2f59b15 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 22 Oct 2019 22:46:58 +0900 Subject: Remove unnecessary `mrb_string_p()` check. --- mrbgems/mruby-io/src/io.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mrbgems') diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 624c27f47..9474011ce 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -907,11 +907,7 @@ mrb_io_syswrite(mrb_state *mrb, mrb_value io) } mrb_get_args(mrb, "S", &str); - if (!mrb_string_p(str)) { - buf = mrb_funcall(mrb, str, "to_s", 0); - } else { - buf = str; - } + buf = str; if (fptr->fd2 == -1) { fd = fptr->fd; -- cgit v1.2.3 From 9540a8309c451ab92fc105ff10868a720e5ec315 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 22 Oct 2019 22:49:12 +0900 Subject: Remove unnecessary `mrb_funcall()`. --- mrbgems/mruby-io/src/io.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mrbgems') diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 9474011ce..3a6932b3a 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -284,12 +284,13 @@ mrb_io_alloc(mrb_state *mrb) #endif static int -option_to_fd(mrb_state *mrb, mrb_value obj, const char *key) +option_to_fd(mrb_state *mrb, mrb_value hash, const char *key) { - mrb_value opt = mrb_funcall(mrb, obj, "[]", 1, mrb_symbol_value(mrb_intern_static(mrb, key, strlen(key)))); - if (mrb_nil_p(opt)) { - return -1; - } + mrb_value opt; + + if (!mrb_hash_p(hash)) return -1; + opt = mrb_hash_fetch(mrb, hash, mrb_symbol_value(mrb_intern_static(mrb, key, strlen(key))), mrb_nil_value()); + if (mrb_nil_p(opt)) return -1; switch (mrb_type(opt)) { case MRB_TT_DATA: /* IO */ -- cgit v1.2.3