Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-08-03 21:13:09 +00:00
Code Issues Projects Releases Wiki Activity

int-to-float overflow logic iterate

Browse source
This commit is contained in:
John Kerl 2015-11-19 23:06:29 -05:00
parent 2a6ac82961
commit bb92abfcfb
2 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

44
c/mapping/mlr_val.c
View file

@ -800,11 +800,25 @@ static mv_t plus_f_if(mv_t* pa, mv_t* pb) {
mv_t rv = {.type = MT_FLOAT, .u.fltv = a + b};
return rv;
}
static mv_t plus_i_ii(mv_t* pa, mv_t* pb) {
static mv_t plus_n_ii(mv_t* pa, mv_t* pb) {
long long a = pa->u.intv;
long long b = pb->u.intv;
mv_t rv = {.type = MT_INT, .u.intv = a + b};
return rv;
long long c = a + b;
int overflowed = FALSE;
if (a > 0LL) {
if (b > 0LL && c < 0LL)
overflowed = TRUE;
} else if (a < 0LL) {
if (b < 0LL && c > 0LL)
overflowed = TRUE;
}
if (overflowed) {
return (mv_t) {.type = MT_FLOAT, .u.fltv = (double)a + (double)b};
} else {
return (mv_t) {.type = MT_INT, .u.intv = c};
}
}
static mv_binary_func_t* plus_dispositions[MT_MAX][MT_MAX] = {
@ -813,7 +827,7 @@ static mv_binary_func_t* plus_dispositions[MT_MAX][MT_MAX] = {
/*ERROR*/ {plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx},
/*BOOL*/ {plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx},
/*FLOAT*/ {plus_e_xx, plus_e_xx, plus_e_xx, plus_f_ff, plus_f_fi, plus_e_xx},
/*INT*/ {plus_e_xx, plus_e_xx, plus_e_xx, plus_f_if, plus_i_ii, plus_e_xx},
/*INT*/ {plus_e_xx, plus_e_xx, plus_e_xx, plus_f_if, plus_n_ii, plus_e_xx},
/*STRING*/ {plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx, plus_e_xx},
};
@ -841,11 +855,25 @@ static mv_t minus_f_if(mv_t* pa, mv_t* pb) {
mv_t rv = {.type = MT_FLOAT, .u.fltv = a - b};
return rv;
}
static mv_t minus_i_ii(mv_t* pa, mv_t* pb) {
static mv_t minus_n_ii(mv_t* pa, mv_t* pb) {
long long a = pa->u.intv;
long long b = pb->u.intv;
mv_t rv = {.type = MT_INT, .u.intv = a - b};
return rv;
long long c = a - b;
int overflowed = FALSE;
if (a > 0LL) {
if (b < 0LL && c < 0LL)
overflowed = TRUE;
} else if (a < 0LL) {
if (b > 0LL && c > 0LL)
overflowed = TRUE;
}
if (overflowed) {
return (mv_t) {.type = MT_FLOAT, .u.fltv = (double)a + (double)b};
} else {
return (mv_t) {.type = MT_INT, .u.intv = c};
}
}
static mv_binary_func_t* minus_dispositions[MT_MAX][MT_MAX] = {
@ -854,7 +882,7 @@ static mv_binary_func_t* minus_dispositions[MT_MAX][MT_MAX] = {
/*ERROR*/ {minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx},
/*BOOL*/ {minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx},
/*FLOAT*/ {minus_e_xx, minus_e_xx, minus_e_xx, minus_f_ff, minus_f_fi, minus_e_xx},
/*INT*/ {minus_e_xx, minus_e_xx, minus_e_xx, minus_f_if, minus_i_ii, minus_e_xx},
/*INT*/ {minus_e_xx, minus_e_xx, minus_e_xx, minus_f_if, minus_n_ii, minus_e_xx},
/*STRING*/ {minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx, minus_e_xx},
};

2
c/todo.txt
View file

@ -1,8 +1,6 @@
================================================================
BUGFIXES
! -b/m
! $ cat a
x=2
a=3