CPunch/Cosmo
1
0
Fork 0
mirror of https://github.com/CPunch/Cosmo.git synced 2025-10-11 20:00:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed __index

Browse Source
This commit is contained in:
CPunch
2020-11-20 15:10:49 -06:00
parent 85e7deae7b
commit 6d45c0a676
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cobj.c
View File

@@ -206,7 +206,11 @@ CObjString *cosmoO_allocateString(CState *state, const char *str, size_t sz, uin
bool cosmoO_getObject(CState *state, CObjObject *object, CValue key, CValue *val) {
if (!cosmoT_get(&object->tbl, key, val)) { // if the field doesn't exist in the object, check the proto
if (object->proto != NULL) { // sanity check
// first though, check for __index, if that exists, call it
// first though, check for a member of the proto object, if it fails then lookup __index
if (cosmoO_getObject(state, object->proto, key, val))
return true;
// then check for __index, if that exists, call it
if (cosmoO_getIString(state, object->proto, ISTRING_INDEX, val)) {
cosmoV_pushValue(state, *val); // push function
cosmoV_pushValue(state, cosmoV_newObj(object)); // push object
@@ -215,8 +219,6 @@ bool cosmoO_getObject(CState *state, CObjObject *object, CValue key, CValue *val
*val = *cosmoV_pop(state); // set value to the return value of __index
return true;
}
return cosmoO_getObject(state, object->proto, key, val);
}
return false; // no protoobject to check against