Skip to content

string.c: write MRB_STR_SINGLE_BYTE through the accessors it has #7156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matz merged 1 commit into from
Aug 14, 2026
Merged

string.c: write MRB_STR_SINGLE_BYTE through the accessors it has #7156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mrbgems/mruby-string-ext/src/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,7 @@ str_ascii_only_p(mrb_state *mrb, mrb_value str)
if (*p & 0x80) return mrb_false_value();
p++;
}
mrb_str_ptr(str)->flags |= MRB_STR_SINGLE_BYTE;
RSTR_SET_ASCII_FLAG(s);
return mrb_true_value();
}

Expand Down
12 changes: 6 additions & 6 deletions src/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1879,8 +1879,8 @@ str_escape(mrb_state *mrb, mrb_value str, mrb_bool inspect)
char buf[4]; /* `\x??` or UTF-8 character */
mrb_value result = mrb_str_new_lit(mrb, "\"");
#ifdef MRB_UTF8_STRING
uint32_t sb_flag = MRB_STR_SINGLE_BYTE; /* what `result` comes out as */
uint32_t src_sb_flag = MRB_STR_SINGLE_BYTE; /* what the walk found `str` to be */
mrb_bool sb_flag = TRUE; /* whether `result` comes out single byte */
mrb_bool src_sb_flag = TRUE; /* whether the walk found `str` single byte */
#endif

p = RSTRING_PTR(str); pend = RSTRING_END(str);
Expand All @@ -1900,11 +1900,11 @@ str_escape(mrb_state *mrb, mrb_value str, mrb_bool inspect)
character. The escape below turns the second into `\xNN`, so `result`
still is, and only a whole character copied across takes that from
it. */
if (NOASCII(*p)) src_sb_flag = 0;
if (NOASCII(*p)) src_sb_flag = FALSE;
if (clen > 1) {
mrb_str_cat(mrb, result, p, clen);
p += clen-1;
sb_flag = 0;
sb_flag = FALSE;
continue;
}
}
Expand Down Expand Up @@ -1946,8 +1946,8 @@ str_escape(mrb_state *mrb, mrb_value str, mrb_bool inspect)
mrb_str_cat_lit(mrb, result, "\"");
#ifdef MRB_UTF8_STRING
if (inspect) {
mrb_str_ptr(str)->flags |= src_sb_flag;
mrb_str_ptr(result)->flags |= sb_flag;
if (src_sb_flag) RSTR_SET_SINGLE_BYTE_FLAG(mrb_str_ptr(str));
if (sb_flag) RSTR_SET_SINGLE_BYTE_FLAG(mrb_str_ptr(result));
}
else {
RSTR_SET_SINGLE_BYTE_FLAG(mrb_str_ptr(result));
Expand Down
Loading