admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

move String#clear to mruby-string-ext; ref #2370

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-06-07 22:28:42 +09:00
parent 76012a885d
commit 6459a98448
4 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-string-ext/src/string.c
+32
View File
@@ -239,6 +239,37 @@ mrb_str_lines(mrb_state *mrb, mrb_value self)
return result;
}
/*
* call-seq:
* string.clear -> string
*
* Makes string empty.
*
* a = "abcde"
* a.clear #=> ""
*/
static mrb_value
mrb_str_clear(mrb_state *mrb, mrb_value str)
{
struct RString *s = mrb_str_ptr(str);
if (!RSTR_SHARED_P(s) && !RSTR_EMBED_P(s)) {
if (s->flags & MRB_STR_NOFREE) {
s->flags &= ~MRB_STR_NOFREE;
}
else {
mrb_free(mrb, s->as.heap.ptr);
}
s->as.heap.ptr = 0;
s->as.heap.len = 0;
}
RSTR_UNSET_SHARED_FLAG(s);
RSTR_SET_EMBED_FLAG(s);
RSTR_SET_EMBED_LEN(s, 0);
RSTRING_PTR(str)[0] = '\0';
return str;
}
void
mrb_mruby_string_ext_gem_init(mrb_state* mrb)
{
@@ -256,6 +287,7 @@ mrb_mruby_string_ext_gem_init(mrb_state* mrb)
mrb_define_method(mrb, s, "oct", mrb_str_oct, MRB_ARGS_NONE());
mrb_define_method(mrb, s, "chr", mrb_str_chr, MRB_ARGS_NONE());
mrb_define_method(mrb, s, "lines", mrb_str_lines, MRB_ARGS_NONE());
mrb_define_method(mrb, s, "clear", mrb_str_clear, MRB_ARGS_NONE());
}
void
mrbgems/mruby-string-ext/test/string.rb
+21
View File
@@ -172,3 +172,24 @@ assert('String#lines') do
assert_equal ["\n", "\n", "\n"], "\n\n\n".lines
assert_equal [], "".lines
end
assert('String#clear') do
# embed string
s = "foo"
assert_equal("", s.clear)
assert_equal("", s)
# not embed string and not shared string
s = "foo" * 100
a = s
assert_equal("", s.clear)
assert_equal("", s)
assert_equal("", a)
# shared string
s = "foo" * 100
a = s[10, 90] # create shared string
assert_equal("", s.clear) # clear
assert_equal("", s) # s is cleared
assert_not_equal("", a) # a should not be affected
end
src/string.c
-32
View File
@@ -2497,37 +2497,6 @@ mrb_str_bytes(mrb_state *mrb, mrb_value str)
return a;
}
/*
* call-seq:
* string.clear -> string
*
* Makes string empty.
*
* a = "abcde"
* a.clear #=> ""
*/
static mrb_value
mrb_str_clear(mrb_state *mrb, mrb_value str)
{
struct RString *s = mrb_str_ptr(str);
if (!RSTR_SHARED_P(s) && !RSTR_EMBED_P(s)) {
if (s->flags & MRB_STR_NOFREE) {
s->flags &= ~MRB_STR_NOFREE;
}
else {
mrb_free(mrb, s->as.heap.ptr);
}
s->as.heap.ptr = 0;
s->as.heap.len = 0;
}
RSTR_UNSET_SHARED_FLAG(s);
RSTR_SET_EMBED_FLAG(s);
RSTR_SET_EMBED_LEN(s, 0);
RSTRING_PTR(str)[0] = '\0';
return str;
}
/* ---------------------------*/
void
mrb_init_string(mrb_state *mrb)
@@ -2579,5 +2548,4 @@ mrb_init_string(mrb_state *mrb)
mrb_define_method(mrb, s, "upcase!", mrb_str_upcase_bang, MRB_ARGS_REQ(1)); /* 15.2.10.5.43 */
mrb_define_method(mrb, s, "inspect", mrb_str_inspect, MRB_ARGS_NONE()); /* 15.2.10.5.46(x) */
mrb_define_method(mrb, s, "bytes", mrb_str_bytes, MRB_ARGS_NONE());
mrb_define_method(mrb, s, "clear", mrb_str_clear, MRB_ARGS_NONE());
}
test/t/string.rb
-21
View File
@@ -515,24 +515,3 @@ assert('String#each_byte') do
assert_equal bytes1, bytes2
end
assert('String#clear') do
# embed string
s = "foo"
assert_equal("", s.clear)
assert_equal("", s)
# not embed string and not shared string
s = "foo" * 100
a = s
assert_equal("", s.clear)
assert_equal("", s)
assert_equal("", a)
# shared string
s = "foo" * 100
a = s[10, 90] # create shared string
assert_equal("", s.clear) # clear
assert_equal("", s) # s is cleared
assert_not_equal("", a) # a should not be affected
end