Skip to content

M
mruby
Commit 87ce13f9 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Merge branch 'master' of github.com:mruby/mruby

parents 9ec00ef1 6d00974a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
mrbgems/mruby-string-ext/mrblib/string.rb
View file @ 87ce13f9
...@@ -181,6 +181,7 @@ class String ...@@ -181,6 +181,7 @@ class String
ed = arg1.end ed = arg1.end
beg += self.size if beg < 0 beg += self.size if beg < 0
ed += self.size if ed < 0 ed += self.size if ed < 0
ed -= 1 if arg1.exclude_end?
validated = true validated = true
elsif arg1.kind_of?(String) elsif arg1.kind_of?(String)
validated = true validated = true
...@@ -198,18 +199,18 @@ class String ...@@ -198,18 +199,18 @@ class String
unless str == nil || str == "" unless str == nil || str == ""
if arg1 != nil && arg2 !=nil if arg1 != nil && arg2 !=nil
idx = arg1 >= 0 ? arg1 : self.size+arg1 idx = arg1 >= 0 ? arg1 : self.size+arg1
str2 = self[0...idx] + self[idx+arg2..-1] str2 = self[0...idx] + self[idx+arg2..-1].to_s
else else
if arg1.kind_of?(Range) if arg1.kind_of?(Range)
idx = beg >= 0 ? beg : self.size+beg idx = beg >= 0 ? beg : self.size+beg
idx2 = ed>= 0 ? ed : self.size+ed idx2 = ed>= 0 ? ed : self.size+ed
str2 = self[0...idx] + self[idx2+1..-1] str2 = self[0...idx] + self[idx2+1..-1].to_s
elsif arg1.kind_of?(String) elsif arg1.kind_of?(String)
idx = self.index(arg1) idx = self.index(arg1)
str2 = self[0...idx] + self[idx+arg1.size..-1] unless idx == nil str2 = self[0...idx] + self[idx+arg1.size..-1] unless idx == nil
else else
idx = arg1 >= 0 ? arg1 : self.size+arg1 idx = arg1 >= 0 ? arg1 : self.size+arg1
str2 = self[0...idx] + self[idx+1..-1] str2 = self[0...idx] + self[idx+1..-1].to_s
end end
end end
self.replace(str2) unless str2 == nil self.replace(str2) unless str2 == nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment