Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
dc5de384
Unverified
Commit
dc5de384
authored
Dec 13, 2017
by
Yukihiro "Matz" Matsumoto
Committed by
GitHub
Dec 13, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3894 from mattn/mirb-locale
fix locale message in mirb
parents
1a150a6e
0ab9ac6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
+10
-3
No files found.
mrbgems/mruby-bin-mirb/tools/mirb/mirb.c
View file @
dc5de384
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment