Skip to content

M
mruby
Unverified Commit 477be452 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub
Browse files
Options

Merge pull request #4592 from shuujii/set-MRB_STR_ASCII-flag-in-String-inspect 

Set `MRB_STR_ASCII` flag in `String#inspect`
parents d7435506 fe8b463c
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
src/string.c
View file @ 477be452
...@@ -2789,6 +2789,9 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str) ...@@ -2789,6 +2789,9 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str)
const char *p, *pend; const char *p, *pend;
char buf[CHAR_ESC_LEN + 1]; char buf[CHAR_ESC_LEN + 1];
mrb_value result = mrb_str_new_lit(mrb, "\""); mrb_value result = mrb_str_new_lit(mrb, "\"");
#ifdef MRB_UTF8_STRING
uint32_t ascii_flag = MRB_STR_ASCII;
#endif
p = RSTRING_PTR(str); pend = RSTRING_END(str); p = RSTRING_PTR(str); pend = RSTRING_END(str);
for (;p < pend; p++) { for (;p < pend; p++) {
...@@ -2805,6 +2808,7 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str) ...@@ -2805,6 +2808,7 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str)
} }
mrb_str_cat(mrb, result, buf, clen); mrb_str_cat(mrb, result, buf, clen);
p += clen-1; p += clen-1;
ascii_flag = 0;
continue; continue;
} }
#endif #endif
...@@ -2846,7 +2850,10 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str) ...@@ -2846,7 +2850,10 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str)
} }
} }
mrb_str_cat_lit(mrb, result, "\""); mrb_str_cat_lit(mrb, result, "\"");
RSTR_COPY_ASCII_FLAG(mrb_str_ptr(result), mrb_str_ptr(str)); #ifdef MRB_UTF8_STRING
mrb_str_ptr(str)->flags |= ascii_flag;
mrb_str_ptr(result)->flags |= ascii_flag;
#endif
return result; return result;
} }
......
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