From ec04fa7e8d60971fb4b51255c6e84a81f87a0593 Mon Sep 17 00:00:00 2001 From: Akito Mochizuki Date: Thu, 19 Jun 2014 17:34:17 +0900 Subject: Modify return value of String#slice! if idx == self.size --- mrbgems/mruby-string-ext/mrblib/string.rb | 2 +- mrbgems/mruby-string-ext/test/string.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mrbgems/mruby-string-ext') diff --git a/mrbgems/mruby-string-ext/mrblib/string.rb b/mrbgems/mruby-string-ext/mrblib/string.rb index 1acdf150f..b8cb93199 100644 --- a/mrbgems/mruby-string-ext/mrblib/string.rb +++ b/mrbgems/mruby-string-ext/mrblib/string.rb @@ -169,7 +169,7 @@ class String if arg1 != nil && arg2 != nil idx = arg1 idx += self.size if arg1 < 0 - if idx >= 0 && idx < self.size && arg2 > 0 + if idx >= 0 && idx <= self.size && arg2 > 0 str = self[idx, arg2] else return nil diff --git a/mrbgems/mruby-string-ext/test/string.rb b/mrbgems/mruby-string-ext/test/string.rb index 01c0be9d2..2a8dd0cca 100644 --- a/mrbgems/mruby-string-ext/test/string.rb +++ b/mrbgems/mruby-string-ext/test/string.rb @@ -218,7 +218,7 @@ assert('String#slice!') do assert_equal "Foo", a a = "FooBar" - assert_nil a.slice!(6, 2) + assert_equal "", a.slice!(6, 2) assert_equal "FooBar", a a = "FooBar" -- cgit v1.2.3