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

mruby-string-ext: remove some methods moved to mruby-encoding

Browse Source 
- String#valid_encoding?
- String#force_encoding
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-01-16 09:12:09 +09:00
parent 3b1c5d7397
commit 351cd5aa46
2 changed files with 0 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-string-ext/src/string.c
-57
View File
@@ -1321,38 +1321,6 @@ str_uminus(mrb_state *mrb, mrb_value str)
return mrb_obj_freeze(mrb, mrb_str_dup(mrb, str));
}
/*
* call-seq:
* string.valid_encoding? -> true or false
*
* Returns true for a string which is encoded correctly.
*
*/
static mrb_value
str_valid_enc_p(mrb_state *mrb, mrb_value str)
{
#ifdef MRB_UTF8_STRING
#define utf8_islead(c) ((unsigned char)((c)&0xc0) != 0x80)
struct RString *s = mrb_str_ptr(str);
if (RSTR_SINGLE_BYTE_P(s)) return mrb_true_value();
mrb_int byte_len = RSTR_LEN(s);
mrb_int utf8_len = 0;
const char *p = RSTR_PTR(s);
const char *e = p + byte_len;
while (p < e) {
mrb_int len = mrb_utf8len(p, e);
if (len == 1 && (*p & 0x80)) return mrb_false_value();
p += len;
utf8_len++;
}
if (byte_len == utf8_len) RSTR_SET_SINGLE_BYTE_FLAG(s);
#endif
return mrb_true_value();
}
static mrb_value
str_ascii_only_p(mrb_state *mrb, mrb_value str)
{
@@ -1378,29 +1346,6 @@ str_b(mrb_state *mrb, mrb_value self)
}
#endif
static mrb_value
str_force_encoding(mrb_state *mrb, mrb_value self)
{
mrb_value enc;
mrb_get_args(mrb, "S", &enc);
struct RString *s = mrb_str_ptr(self);
if (ENC_COMP_P(enc, ENC_ASCII_8BIT) ||
ENC_COMP_P(enc, ENC_BINARY)) {
s->flags |= MRB_STR_BINARY;
}
#ifdef MRB_UTF8_STRING
else if (ENC_COMP_P(enc, ENC_UTF8)) {
s->flags &= ~MRB_STR_BINARY;
}
#endif
else {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "unknown encoding name - %v", enc);
}
return self;
}
void
mrb_mruby_string_ext_gem_init(mrb_state* mrb)
{
@@ -1439,9 +1384,7 @@ mrb_mruby_string_ext_gem_init(mrb_state* mrb)
mrb_define_method_id(mrb, s, MRB_SYM_Q(casecmp), str_casecmp_p, MRB_ARGS_REQ(1));
mrb_define_method_id(mrb, s, MRB_OPSYM(plus), str_uplus, MRB_ARGS_REQ(1));
mrb_define_method_id(mrb, s, MRB_OPSYM(minus), str_uminus, MRB_ARGS_REQ(1));
mrb_define_method_id(mrb, s, MRB_SYM_Q(valid_encoding), str_valid_enc_p, MRB_ARGS_NONE());
mrb_define_method_id(mrb, s, MRB_SYM_Q(ascii_only), str_ascii_only_p, MRB_ARGS_NONE());
mrb_define_method_id(mrb, s, MRB_SYM(force_encoding), str_force_encoding, MRB_ARGS_REQ(1));
#ifndef HAVE_MRUBY_ENCODING_GEM
mrb_define_method_id(mrb, s, MRB_SYM(b), str_b, MRB_ARGS_NONE());
#endif
mrbgems/mruby-string-ext/test/string.rb
-11
View File
@@ -726,14 +726,3 @@ assert('String#-@') do
a = -(a.freeze)
assert_true(a.frozen?)
end
assert('String#valid_encoding?') do
assert_true "hello".valid_encoding?
if UTF8STRING
assert_true "あ".valid_encoding?
assert_false "\xfe".valid_encoding?
assert_false "あ\xfe".valid_encoding?
else
assert_true "\xfe".valid_encoding?
end
end