summaryrefslogtreecommitdiffhomepage
path: root/mrblib
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-02-18 09:11:54 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-02-18 09:11:54 +0900
commit5568df5efee7a7220008227ea622121320c2b49b (patch)
tree729ae20519f664d2150900e6efbb6ae63fae7626 /mrblib
parentdf38a31d3438284ff73fa691b13cb4d0a77e6520 (diff)
parentb04183fd9cc0297005fbe378d2c136516999b82a (diff)
downloadmruby-5568df5efee7a7220008227ea622121320c2b49b.tar.gz
mruby-5568df5efee7a7220008227ea622121320c2b49b.zip
:Merge branch 'master' of github.com:mruby/mruby
Conflicts: src/class.c
Diffstat (limited to 'mrblib')
-rw-r--r--mrblib/string.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/mrblib/string.rb b/mrblib/string.rb
index 9b11bb2e5..8a4894dd4 100644
--- a/mrblib/string.rb
+++ b/mrblib/string.rb
@@ -28,8 +28,10 @@ class String
#
# ISO 15.2.10.5.18
def gsub(*args, &block)
+ lc = ''
if args.size == 2
- split(args[0]).join(args[1])
+ lc = args[1] if self[-1] == args[0]
+ split(args[0]).join(args[1]) + lc
elsif args.size == 1 && block
split(args[0]).join(block.call(args[0]))
else