gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FFI: Support __tostring metamethod for pointers to structs, too.

Browse Source
This commit is contained in:
Mike Pall 2011-06-11 18:30:22 +02:00
parent a58eb604f4
commit 287de611a2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib_ffi.c
View File

@ -273,7 +273,9 @@ LJLIB_CF(ffi_meta___tostring)
msg = "ctype<%s>"; msg = "ctype<%s>";
id = *(CTypeID *)p; id = *(CTypeID *)p;
} else { } else {
CType *ct = ctype_raw(ctype_cts(L), id); CTState *cts = ctype_cts(L);
CType *ct = ctype_raw(cts, id);
if (ctype_isref(ct->info)) ct = ctype_rawchild(cts, ct);
if (ctype_iscomplex(ct->info)) { if (ctype_iscomplex(ct->info)) {
setstrV(L, L->top-1, lj_ctype_repr_complex(L, cdataptr(cd), ct->size)); setstrV(L, L->top-1, lj_ctype_repr_complex(L, cdataptr(cd), ct->size));
goto checkgc; goto checkgc;
@ -281,16 +283,19 @@ LJLIB_CF(ffi_meta___tostring)
setstrV(L, L->top-1, lj_ctype_repr_int64(L, *(uint64_t *)cdataptr(cd), setstrV(L, L->top-1, lj_ctype_repr_int64(L, *(uint64_t *)cdataptr(cd),
(ct->info & CTF_UNSIGNED))); (ct->info & CTF_UNSIGNED)));
goto checkgc; goto checkgc;
} else if (ctype_isstruct(ct->info) || ctype_isvector(ct->info)) {
/* Handle ctype __tostring metamethod. */
CTState *cts = ctype_cts(L);
cTValue *tv = lj_ctype_meta(cts, id, MM_tostring);
if (tv)
return lj_meta_tailcall(L, tv);
} else if (ctype_isptr(ct->info)) {
p = cdata_getptr(p, ct->size);
} else if (ctype_isfunc(ct->info)) { } else if (ctype_isfunc(ct->info)) {
p = *(void **)p; p = *(void **)p;
} else {
if (ctype_isptr(ct->info)) {
p = cdata_getptr(p, ct->size);
ct = ctype_rawchild(cts, ct);
}
if (ctype_isstruct(ct->info) || ctype_isvector(ct->info)) {
/* Handle ctype __tostring metamethod. */
cTValue *tv = lj_ctype_meta(cts, ctype_typeid(cts, ct), MM_tostring);
if (tv)
return lj_meta_tailcall(L, tv);
}
} }
} }
lj_str_pushf(L, msg, strdata(lj_ctype_repr(L, id, NULL)), p); lj_str_pushf(L, msg, strdata(lj_ctype_repr(L, id, NULL)), p);