diff options
| author | Mike Pall <mike> | 2011-01-26 21:12:54 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2011-01-26 21:14:38 +0100 |
| commit | de0781d610595da2e57fb17d867926ba214e54fa (patch) | |
| tree | 38d40093b339ae45a52b05242a8db1f43f31131b /src/lj_cdata.c | |
| parent | 0622ad9adc8b0e1b1c576277fe41ba6a203389c6 (diff) | |
| download | luajit2-de0781d610595da2e57fb17d867926ba214e54fa.tar.gz | |
FFI: Allow cdata indexing with integer cdata.
Diffstat (limited to 'src/lj_cdata.c')
| -rw-r--r-- | src/lj_cdata.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/lj_cdata.c b/src/lj_cdata.c index 1d0aea85..9033d492 100644 --- a/src/lj_cdata.c +++ b/src/lj_cdata.c @@ -71,6 +71,7 @@ CType *lj_cdata_index(CTState *cts, GCcdata *cd, cTValue *key, uint8_t **pp, { uint8_t *p = (uint8_t *)cdataptr(cd); CType *ct = ctype_get(cts, cd->typeid); + ptrdiff_t idx; /* Resolve reference for cdata object. */ if (ctype_isref(ct->info)) { @@ -88,8 +89,8 @@ collect_attrib: lua_assert(!ctype_isref(ct->info)); /* Interning rejects refs to refs. */ if (tvisnum(key)) { /* Numeric key. */ - ptrdiff_t idx = LJ_64 ? (ptrdiff_t)numV(key) : - (ptrdiff_t)lj_num2int(numV(key)); + idx = LJ_64 ? (ptrdiff_t)numV(key) : (ptrdiff_t)lj_num2int(numV(key)); + integer_key: if (ctype_ispointer(ct->info)) { CTSize sz = lj_ctype_size(cts, ctype_cid(ct->info)); /* Element size. */ if (sz != CTSIZE_INVALID) { @@ -101,6 +102,15 @@ collect_attrib: return ct; } } + } else if (tviscdata(key)) { /* Integer cdata key. */ + GCcdata *cdk = cdataV(key); + CType *ctk = ctype_raw(cts, cdk->typeid); + if (ctype_isenum(ctk->info)) ctk = ctype_child(cts, ctk); + if (ctype_isinteger(ctk->info)) { + lj_cconv_ct_ct(cts, ctype_get(cts, CTID_INT_PSZ), ctk, + (uint8_t *)&idx, cdataptr(cdk), 0); + goto integer_key; + } } else if (tvisstr(key)) { /* String key. */ GCstr *name = strV(key); if (ctype_isptr(ct->info)) { /* Automatically perform '->'. */ |