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
5235e541
Commit
5235e541
authored
Oct 29, 2014
by
Jun Hiroe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mrb_convert_to_integer.
parent
aec12c30
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
include/mruby.h
include/mruby.h
+1
-0
src/object.c
src/object.c
+6
-2
No files found.
include/mruby.h
View file @
5235e541
...
...
@@ -316,6 +316,7 @@ MRB_API mrb_sym mrb_obj_to_sym(mrb_state *mrb, mrb_value name);
MRB_API
mrb_bool
mrb_obj_eq
(
mrb_state
*
,
mrb_value
,
mrb_value
);
MRB_API
mrb_bool
mrb_obj_equal
(
mrb_state
*
,
mrb_value
,
mrb_value
);
MRB_API
mrb_bool
mrb_equal
(
mrb_state
*
mrb
,
mrb_value
obj1
,
mrb_value
obj2
);
MRB_API
mrb_value
mrb_convert_to_integer
(
mrb_state
*
mrb
,
mrb_value
val
,
int
base
);
MRB_API
mrb_value
mrb_Integer
(
mrb_state
*
mrb
,
mrb_value
val
);
MRB_API
mrb_value
mrb_Float
(
mrb_state
*
mrb
,
mrb_value
val
);
MRB_API
mrb_value
mrb_inspect
(
mrb_state
*
mrb
,
mrb_value
obj
);
...
...
src/object.c
View file @
5235e541
...
...
@@ -516,7 +516,7 @@ mrb_to_int(mrb_state *mrb, mrb_value val)
return
mrb_to_integer
(
mrb
,
val
,
"to_int"
);
}
static
mrb_value
MRB_API
mrb_value
mrb_convert_to_integer
(
mrb_state
*
mrb
,
mrb_value
val
,
int
base
)
{
mrb_value
tmp
;
...
...
@@ -537,13 +537,17 @@ mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base)
if
(
base
!=
0
)
goto
arg_error
;
return
val
;
case
MRB_TT_STRING
:
string_conv:
return
mrb_str_to_inum
(
mrb
,
val
,
base
,
TRUE
);
default:
break
;
}
if
(
base
!=
0
)
{
tmp
=
mrb_check_string_type
(
mrb
,
val
);
if
(
!
mrb_nil_p
(
tmp
))
{
return
mrb_str_to_inum
(
mrb
,
val
,
base
,
TRUE
)
;
goto
string_conv
;
}
arg_error:
mrb_raise
(
mrb
,
E_ARGUMENT_ERROR
,
"base specified for non string value"
);
...
...
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