Skip to content

Commit

Permalink
Merge pull request ruby#3270 from ruby/fix-isinf
Browse files Browse the repository at this point in the history
_finitef is unavailable on Windows x86
  • Loading branch information
kddnewton authored Dec 2, 2024
2 parents ec5c11c + 9064d87 commit 3167699
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
11 changes: 0 additions & 11 deletions include/prism/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,6 @@
# define PRISM_HAS_FILESYSTEM
#endif

/**
* isinf on Windows is defined as accepting a float, but on POSIX systems it
* accepts a float, a double, or a long double. We want to mirror this behavior
* on windows.
*/
#ifdef _WIN32
# include <float.h>
# undef isinf
# define isinf(x) (sizeof(x) == sizeof(float) ? !_finitef(x) : !_finite(x))
#endif

/**
* If you build prism with a custom allocator, configure it with
* "-D PRISM_XALLOCATOR" to use your own allocator that defines xmalloc,
Expand Down
9 changes: 8 additions & 1 deletion src/prism.c
Original file line number Diff line number Diff line change
Expand Up @@ -4142,7 +4142,14 @@ pm_double_parse(pm_parser_t *parser, const pm_token_t *token) {

// If errno is set, then it should only be ERANGE. At this point we need to
// check if it's infinity (it should be).
if (errno == ERANGE && isinf(value)) {
if (
errno == ERANGE &&
#ifdef _WIN32
!_finite(value)
#else
isinf(value)
#endif
) {
int warn_width;
const char *ellipsis;

Expand Down
8 changes: 7 additions & 1 deletion src/static_literals.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,13 @@ pm_static_literal_inspect_node(pm_buffer_t *buffer, const pm_static_literals_met
case PM_FLOAT_NODE: {
const double value = ((const pm_float_node_t *) node)->value;

if (isinf(value)) {
if (
#ifdef _WIN32
!_finite(value)
#else
isinf(value)
#endif
) {
if (*node->location.start == '-') {
pm_buffer_append_byte(buffer, '-');
}
Expand Down

0 comments on commit 3167699

Please sign in to comment.