ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scripting: Allow struct access to inline strings

This commit is contained in:
Vicki Pfau 2023-01-26 21:38:00 -08:00
parent 8545271e9e
commit 6bea763b23
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/script/test/classes.c
View File

@ -14,6 +14,7 @@ struct TestA {
int32_t i2; int32_t i2;
int8_t b8; int8_t b8;
int16_t hUnaligned; int16_t hUnaligned;
char str[6];
struct mScriptValue table; struct mScriptValue table;
struct mScriptList list; struct mScriptList list;
int32_t (*ifn0)(struct TestA*); int32_t (*ifn0)(struct TestA*);
@ -105,6 +106,7 @@ mSCRIPT_DEFINE_STRUCT(TestA)
mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, S32, i2) mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, S32, i2)
mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, S8, b8) mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, S8, b8)
mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, S16, hUnaligned) mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, S16, hUnaligned)
mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, CHARP, str)
mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, TABLE, table) mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, TABLE, table)
mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, LIST, list) mSCRIPT_DEFINE_STRUCT_MEMBER(TestA, LIST, list)
mSCRIPT_DEFINE_STRUCT_METHOD(TestA, ifn0) mSCRIPT_DEFINE_STRUCT_METHOD(TestA, ifn0)
@ -191,6 +193,13 @@ M_TEST_DEFINE(testALayout) {
assert_ptr_equal(member->type, mSCRIPT_TYPE_MS_S16); assert_ptr_equal(member->type, mSCRIPT_TYPE_MS_S16);
assert_int_not_equal(member->offset, sizeof(int32_t) * 2 + 1); assert_int_not_equal(member->offset, sizeof(int32_t) * 2 + 1);
member = HashTableLookup(&cls->instanceMembers, "str");
assert_non_null(member);
assert_string_equal(member->name, "str");
assert_null(member->docstring);
assert_ptr_equal(member->type, mSCRIPT_TYPE_MS_CHARP);
assert_int_equal(member->offset, &((struct TestA*) 0)->str);
member = HashTableLookup(&cls->instanceMembers, "table"); member = HashTableLookup(&cls->instanceMembers, "table");
assert_non_null(member); assert_non_null(member);
assert_string_equal(member->name, "table"); assert_string_equal(member->name, "table");
@ -304,6 +313,8 @@ M_TEST_DEFINE(testAGet) {
s.table.type = mSCRIPT_TYPE_MS_TABLE; s.table.type = mSCRIPT_TYPE_MS_TABLE;
s.table.type->alloc(&s.table); s.table.type->alloc(&s.table);
strcpy(s.str, "test");
struct mScriptValue sval = mSCRIPT_MAKE_S(TestA, &s); struct mScriptValue sval = mSCRIPT_MAKE_S(TestA, &s);
struct mScriptValue val; struct mScriptValue val;
struct mScriptValue compare; struct mScriptValue compare;
@ -324,6 +335,10 @@ M_TEST_DEFINE(testAGet) {
assert_true(mScriptObjectGet(&sval, "hUnaligned", &val)); assert_true(mScriptObjectGet(&sval, "hUnaligned", &val));
assert_true(compare.type->equal(&compare, &val)); assert_true(compare.type->equal(&compare, &val));
compare = mSCRIPT_MAKE_CHARP("test");
assert_true(mScriptObjectGet(&sval, "str", &val));
assert_true(compare.type->equal(&compare, &val));
compare = mSCRIPT_MAKE_S32(5); compare = mSCRIPT_MAKE_S32(5);
assert_true(mScriptObjectGet(&sval, "list", &val)); assert_true(mScriptObjectGet(&sval, "list", &val));
assert_ptr_equal(val.type, mSCRIPT_TYPE_MS_LIST); assert_ptr_equal(val.type, mSCRIPT_TYPE_MS_LIST);

9
src/script/types.c
View File

@ -1178,6 +1178,15 @@ static bool _accessRawMember(struct mScriptClassMember* member, void* raw, bool
val->type = mSCRIPT_TYPE_MS_WRAPPER; val->type = mSCRIPT_TYPE_MS_WRAPPER;
val->value.table = raw; val->value.table = raw;
break; break;
case mSCRIPT_TYPE_STRING:
if (member->type == mSCRIPT_TYPE_MS_CHARP) {
val->refs = mSCRIPT_VALUE_UNREF;
val->flags = 0;
val->type = mSCRIPT_TYPE_MS_CHARP;
val->value.opaque = raw;
break;
}
return false;
case mSCRIPT_TYPE_LIST: case mSCRIPT_TYPE_LIST:
val->refs = mSCRIPT_VALUE_UNREF; val->refs = mSCRIPT_VALUE_UNREF;
val->flags = 0; val->flags = 0;