DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FFI: Change tonumber(cdata) semantics. Return nil for non-numbers.

Browse Source
This commit is contained in:
Mike Pall
2011-06-06 19:56:55 +02:00
parent a48058a791
commit 22946f268b
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib_base.c
View File

@@ -197,21 +197,20 @@ LJLIB_ASM(tonumber) LJLIB_REC(.)
#if LJ_HASFFI
if (tviscdata(o)) {
CTState *cts = ctype_cts(L);
if (LJ_DUALNUM) {
CType *ct = ctype_raw(cts, cdataV(o)->typeid);
if (ctype_isinteger_or_bool(ct->info)) {
int64_t i;
lj_cconv_ct_tv(cts, ctype_get(cts, CTID_INT64), (uint8_t *)&i, o, 0);
if ((ct->size == 8 && (ct->info & CTF_UNSIGNED)) ?
(uint64_t)i <= 0x7fffffffu : checki32(i)) {
setintV(L->base-1, (int32_t)i);
return FFH_RES(1);
} /* else: retry and convert to double. */
CType *ct = lj_ctype_rawref(cts, cdataV(o)->typeid);
if (ctype_isenum(ct->info)) ct = ctype_child(cts, ct);
if (ctype_isnum(ct->info) || ctype_iscomplex(ct->info)) {
if (LJ_DUALNUM && ctype_isinteger_or_bool(ct->info) &&
ct->size <= 4 && !(ct->size == 4 && (ct->info & CTF_UNSIGNED))) {
int32_t i;
lj_cconv_ct_tv(cts, ctype_get(cts, CTID_INT32), (uint8_t *)&i, o, 0);
setintV(L->base-1, i);
return FFH_RES(1);
}
lj_cconv_ct_tv(cts, ctype_get(cts, CTID_DOUBLE),
(uint8_t *)&(L->base-1)->n, o, 0);
return FFH_RES(1);
}
lj_cconv_ct_tv(cts, ctype_get(cts, CTID_DOUBLE),
(uint8_t *)&(L->base-1)->n, o, 0);
return FFH_RES(1);
}
#endif
} else {