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

Merge pull request #3894 from mattn/mirb-locale

Browse Source 
fix locale message in mirb
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-12-13 23:11:49 +09:00
committed by GitHub
parent 1a150a6e48 0ab9ac6b22
commit dc5de38414
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+10 -3
View File
@@ -95,6 +95,7 @@ static void
p(mrb_state *mrb, mrb_value obj, int prompt)
{
mrb_value val;
char* msg;
val = mrb_funcall(mrb, obj, "inspect", 0);
if (prompt) {
@@ -108,7 +109,9 @@ p(mrb_state *mrb, mrb_value obj, int prompt)
if (!mrb_string_p(val)) {
val = mrb_obj_as_string(mrb, obj);
}
fwrite(RSTRING_PTR(val), RSTRING_LEN(val), 1, stdout);
msg = mrb_locale_from_utf8(RSTRING_PTR(val), RSTRING_LEN(val));
fwrite(msg, strlen(msg), 1, stdout);
mrb_locale_free(msg);
putc('\n', stdout);
}
@@ -537,11 +540,15 @@ done:
else {
if (0 < parser->nwarn) {
/* warning */
printf("line %d: %s\n", parser->warn_buffer[0].lineno, parser->warn_buffer[0].message);
char* msg = mrb_locale_from_utf8(parser->warn_buffer[0].message, -1);
printf("line %d: %s\n", parser->warn_buffer[0].lineno, msg);
mrb_utf8_free(msg);
}
if (0 < parser->nerr) {
/* syntax error */
printf("line %d: %s\n", parser->error_buffer[0].lineno, parser->error_buffer[0].message);
char* msg = mrb_locale_from_utf8(parser->error_buffer[0].message, -1);
printf("line %d: %s\n", parser->error_buffer[0].lineno, msg);
mrb_utf8_free(msg);
}
else {
/* generate bytecode */