fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-09 03:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[script] Add support for Infinity and NaN

Browse source 
The rules are inhertited from C (NaN != NaN etc).
This commit is contained in:
Charlie Brej 2009-08-27 15:33:16 +01:00
parent fec26df01c
commit f86e899810
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/plugins/splash/script/script-object.c
View file

@ -150,7 +150,6 @@ script_obj_t *script_obj_new_null (void)
script_obj_t *script_obj_new_number (script_number_t number)
{
if (isnan (number)) return script_obj_new_null ();
script_obj_t *obj = malloc (sizeof (script_obj_t));
obj->type = SCRIPT_OBJ_TYPE_NUMBER;
obj->refcount = 1;
@ -220,14 +219,10 @@ script_number_t script_obj_as_number (script_obj_t *obj)
return obj->data.number;
case SCRIPT_OBJ_TYPE_NULL:
return NAN;
case SCRIPT_OBJ_TYPE_REF:
case SCRIPT_OBJ_TYPE_HASH:
case SCRIPT_OBJ_TYPE_FUNCTION:
case SCRIPT_OBJ_TYPE_NATIVE:
return NAN;
case SCRIPT_OBJ_TYPE_STRING:
return NAN;
}
@ -580,10 +575,15 @@ script_obj_cmp_result_t script_obj_cmp (script_obj_t *script_obj_a,
{
if (script_obj_is_number (script_obj_b))
{
script_number_t diff = script_obj_as_number (script_obj_a) - script_obj_as_number (script_obj_b);
if (diff < 0) return SCRIPT_OBJ_CMP_RESULT_LT;
if (diff > 0) return SCRIPT_OBJ_CMP_RESULT_GT;
return SCRIPT_OBJ_CMP_RESULT_EQ;
script_number_t num_a = script_obj_as_number (script_obj_a);
script_number_t num_b = script_obj_as_number (script_obj_b);
if (num_b == 21)
printf("%f-%f ", num_a, num_b);
if (num_a < num_b) return SCRIPT_OBJ_CMP_RESULT_LT;
if (num_a > num_b) return SCRIPT_OBJ_CMP_RESULT_GT;
if (num_a == num_b) return SCRIPT_OBJ_CMP_RESULT_EQ;
return SCRIPT_OBJ_CMP_RESULT_NE;
}
}
else if (script_obj_is_string (script_obj_a))

11
src/plugins/splash/script/script-parse.c
View file

@ -28,6 +28,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <assert.h>
#include <math.h>
#include <stdbool.h>
#include <string.h>
#include <stdbool.h>
@ -185,6 +186,16 @@ static script_exp_t *script_parse_exp_tm (script_scan_t *scan)
exp = malloc (sizeof (script_exp_t));
if (script_scan_token_is_identifier_of_value (curtoken, "NULL"))
exp->type = SCRIPT_EXP_TYPE_TERM_NULL;
else if (script_scan_token_is_identifier_of_value (curtoken, "INFINITY"))
{
exp->type = SCRIPT_EXP_TYPE_TERM_NUMBER;
exp->data.number = INFINITY;
}
else if (script_scan_token_is_identifier_of_value (curtoken, "NAN"))
{
exp->type = SCRIPT_EXP_TYPE_TERM_NUMBER;
exp->data.number = NAN;
}
else if (script_scan_token_is_identifier_of_value (curtoken, "global"))
exp->type = SCRIPT_EXP_TYPE_TERM_GLOBAL;
else if (script_scan_token_is_identifier_of_value (curtoken, "local"))