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
24839d74
Commit
24839d74
authored
Mar 09, 2014
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1834 from cremno/use-nan-and-infinity-macros
use NAN and INFINITY macros
parents
ee57789c
8a4faae5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
include/mruby/value.h
include/mruby/value.h
+2
-0
src/numeric.c
src/numeric.c
+5
-5
No files found.
include/mruby/value.h
View file @
24839d74
...
...
@@ -72,6 +72,8 @@ typedef short mrb_sym;
# define PRIo64 "I64o"
# define PRIx64 "I64x"
# define PRIX64 "I64X"
# define INFINITY ((float)(DBL_MAX * DBL_MAX))
# define NAN ((float)(INFINITY - INFINITY))
# else
# include <inttypes.h>
# endif
...
...
src/numeric.c
View file @
24839d74
...
...
@@ -304,8 +304,8 @@ flodivmod(mrb_state *mrb, mrb_float x, mrb_float y, mrb_float *divp, mrb_float *
mrb_float
mod
;
if
(
y
==
0
.
0
)
{
div
=
str_to_mrb_float
(
"inf"
)
;
mod
=
str_to_mrb_float
(
"nan"
)
;
div
=
INFINITY
;
mod
=
NAN
;
}
else
{
mod
=
fmod
(
x
,
y
);
...
...
@@ -775,7 +775,7 @@ fix_mod(mrb_state *mrb, mrb_value x)
mrb_int
mod
;
if
(
mrb_fixnum
(
y
)
==
0
)
{
return
mrb_float_value
(
mrb
,
str_to_mrb_float
(
"nan"
)
);
return
mrb_float_value
(
mrb
,
NAN
);
}
fixdivmod
(
mrb
,
a
,
mrb_fixnum
(
y
),
0
,
&
mod
);
return
mrb_fixnum_value
(
mod
);
...
...
@@ -805,8 +805,8 @@ fix_divmod(mrb_state *mrb, mrb_value x)
mrb_int
div
,
mod
;
if
(
mrb_fixnum
(
y
)
==
0
)
{
return
mrb_assoc_new
(
mrb
,
mrb_float_value
(
mrb
,
str_to_mrb_float
(
"inf"
)
),
mrb_float_value
(
mrb
,
str_to_mrb_float
(
"nan"
)
));
return
mrb_assoc_new
(
mrb
,
mrb_float_value
(
mrb
,
INFINITY
),
mrb_float_value
(
mrb
,
NAN
));
}
fixdivmod
(
mrb
,
mrb_fixnum
(
x
),
mrb_fixnum
(
y
),
&
div
,
&
mod
);
return
mrb_assoc_new
(
mrb
,
mrb_fixnum_value
(
div
),
mrb_fixnum_value
(
mod
));
...
...
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