summaryrefslogtreecommitdiffhomepage
path: root/src/string.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-07-04 23:01:16 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2019-07-04 23:07:18 +0900
commit991bdd4ed7b0aa6fd6bee4fa5c62283365dcf15d (patch)
tree260ebd44581919a1b209d11f2d98ac7340a79a3d /src/string.c
parentf4f3ced955ec2849f1f5e0be6ffdcac923078db6 (diff)
downloadmruby-991bdd4ed7b0aa6fd6bee4fa5c62283365dcf15d.tar.gz
mruby-991bdd4ed7b0aa6fd6bee4fa5c62283365dcf15d.zip
Rename `MRB_STR_NO_UTF` to 'MRB_STR_ASCII`; close #4550
In #4550, @shuuji proposed the name name `MRB_STR_NO_MULTI_BYTE` for more precise description. Although I agree that the name name is correct, but the flag means the string does not contain multi byte UTF-8 characters, i.e. all characters fit in the range of ASCII.
Diffstat (limited to 'src/string.c')
-rw-r--r--src/string.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/string.c b/src/string.c
index 7a094b3a7..805cf01dc 100644
--- a/src/string.c
+++ b/src/string.c
@@ -260,12 +260,12 @@ utf8_strlen(mrb_value str)
{
mrb_int byte_len = RSTRING_LEN(str);
- if (RSTRING(str)->flags & MRB_STR_NO_UTF) {
+ if (RSTRING(str)->flags & MRB_STR_ASCII) {
return byte_len;
}
else {
mrb_int utf8_len = mrb_utf8_len(RSTRING_PTR(str), byte_len);
- if (byte_len == utf8_len) RSTRING(str)->flags |= MRB_STR_NO_UTF;
+ if (byte_len == utf8_len) RSTRING(str)->flags |= MRB_STR_ASCII;
return utf8_len;
}
}
@@ -512,8 +512,8 @@ str_replace(mrb_state *mrb, struct RString *s1, struct RString *s2)
mrb_check_frozen(mrb, s1);
if (s1 == s2) return mrb_obj_value(s1);
- s1->flags &= ~MRB_STR_NO_UTF;
- s1->flags |= s2->flags&MRB_STR_NO_UTF;
+ s1->flags &= ~MRB_STR_ASCII;
+ s1->flags |= s2->flags&MRB_STR_ASCII;
len = RSTR_LEN(s2);
if (RSTR_SHARED_P(s1)) {
str_decref(mrb, s1->as.heap.aux.shared);
@@ -651,7 +651,7 @@ MRB_API void
mrb_str_modify(mrb_state *mrb, struct RString *s)
{
mrb_check_frozen(mrb, s);
- s->flags &= ~MRB_STR_NO_UTF;
+ s->flags &= ~MRB_STR_ASCII;
if (RSTR_SHARED_P(s)) {
mrb_shared_string *shared = s->as.heap.aux.shared;