krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-05-07 17:21:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added opaque attributes to API

Browse Source
This commit is contained in:
Kayne Ruse
2026-05-06 16:02:27 +10:00
parent 7cdb81e0bf
commit 60a0fe8907
4 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/toy_attributes.c
+25 -7
View File
@@ -6,9 +6,12 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
//if set, used for delegating to user-defined code
static Toy_OpaqueAttributeHandler opaqueAttributeCallback = NULL;
//NOTE: there is no need to call 'Toy_freeValue' on the arguments, as the VM assumes you don't //NOTE: there is no need to call 'Toy_freeValue' on the arguments, as the VM assumes you don't
Toy_Value handleStringAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute) { Toy_Value Toy_private_handleStringAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute) {
if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "length", 6) == 0) { if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "length", 6) == 0) {
return TOY_VALUE_FROM_INTEGER(TOY_VALUE_AS_STRING(compound)->info.length); return TOY_VALUE_FROM_INTEGER(TOY_VALUE_AS_STRING(compound)->info.length);
} }
@@ -144,7 +147,7 @@ static void attr_arraySort(Toy_VM* vm) {
//URGENT: attr_arraySort //URGENT: attr_arraySort
} }
Toy_Value handleArrayAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute) { Toy_Value Toy_private_handleArrayAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute) {
if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "length", 6) == 0) { if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "length", 6) == 0) {
return TOY_VALUE_FROM_INTEGER(TOY_VALUE_AS_ARRAY(compound)->count); return TOY_VALUE_FROM_INTEGER(TOY_VALUE_AS_ARRAY(compound)->count);
} }
@@ -220,23 +223,23 @@ static void attr_tableForEach(Toy_VM* vm) {
//URGENT: attr_tableForEach //URGENT: attr_tableForEach
} }
Toy_Value handleTableAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute) { Toy_Value Toy_private_handleTableAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute) {
if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "length", 6) == 0) { if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "length", 6) == 0) {
return TOY_VALUE_FROM_INTEGER(TOY_VALUE_AS_ARRAY(compound)->count); return TOY_VALUE_FROM_INTEGER(TOY_VALUE_AS_ARRAY(compound)->count);
} }
else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "insert", 4) == 0) { else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "insert", 6) == 0) {
Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableInsert); Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableInsert);
return TOY_VALUE_FROM_FUNCTION(fn); return TOY_VALUE_FROM_FUNCTION(fn);
} }
else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "hasKey", 4) == 0) { else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "hasKey", 6) == 0) {
Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableHasKey); Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableHasKey);
return TOY_VALUE_FROM_FUNCTION(fn); return TOY_VALUE_FROM_FUNCTION(fn);
} }
else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "remove", 4) == 0) { else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "remove", 6) == 0) {
Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableRemove); Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableRemove);
return TOY_VALUE_FROM_FUNCTION(fn); return TOY_VALUE_FROM_FUNCTION(fn);
} }
else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "forEach", 4) == 0) { else if (strncmp(TOY_VALUE_AS_STRING(attribute)->leaf.data, "forEach", 7) == 0) { //BUG: compare the contents AND length of these strings
Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableForEach); Toy_Function* fn = Toy_createFunctionFromCallback(&vm->memoryBucket, attr_tableForEach);
return TOY_VALUE_FROM_FUNCTION(fn); return TOY_VALUE_FROM_FUNCTION(fn);
} }
@@ -247,3 +250,18 @@ Toy_Value handleTableAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attrib
return TOY_VALUE_FROM_NULL(); return TOY_VALUE_FROM_NULL();
} }
} }
Toy_Value Toy_private_handleOpaqueAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute) {
if (opaqueAttributeCallback == NULL) {
char buffer[256];
snprintf(buffer, 256, "Unknown attribute '%s' of type '%s' (did you set the opaque callbacks?)", TOY_VALUE_AS_STRING(attribute)->leaf.data, Toy_private_getValueTypeAsCString(compound.type));
Toy_error(buffer);
return TOY_VALUE_FROM_NULL();
}
return opaqueAttributeCallback(vm, compound, attribute);
}
void Toy_private_setOpaqueAttributeHandler(Toy_OpaqueAttributeHandler cb) {
opaqueAttributeCallback = cb;
}
source/toy_attributes.h
+11 -4
View File
@@ -1,12 +1,10 @@
#pragma once #pragma once
#include "toy_common.h"
#include "toy_value.h" #include "toy_value.h"
#include "toy_vm.h" #include "toy_vm.h"
Toy_Value handleStringAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
Toy_Value handleArrayAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
Toy_Value handleTableAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
// [x] string.length // [x] string.length
// [x] string.asUpper // [x] string.asUpper
// [x] string.asLower // [x] string.asLower
@@ -20,3 +18,12 @@ Toy_Value handleTableAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attrib
// [x] table.hasKey(x) // [x] table.hasKey(x)
// [x] table.remove(x) // [x] table.remove(x)
// [ ] table.forEach(fn) // fn(x,y) -> void // [ ] table.forEach(fn) // fn(x,y) -> void
TOY_API Toy_Value Toy_private_handleStringAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
TOY_API Toy_Value Toy_private_handleArrayAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
TOY_API Toy_Value Toy_private_handleTableAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
TOY_API Toy_Value Toy_private_handleOpaqueAttributes(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
//plug-and-play attributes for custom objects
typedef Toy_Value (*Toy_OpaqueAttributeHandler)(Toy_VM* vm, Toy_Value compound, Toy_Value attribute);
TOY_API void Toy_private_setOpaqueAttributeHandler(Toy_OpaqueAttributeHandler cb);
source/toy_value.c
+4 -1
View File
@@ -141,6 +141,9 @@ Toy_Value Toy_copyValue(Toy_Bucket** bucketHandle, Toy_Value value) {
return TOY_VALUE_FROM_FUNCTION(Toy_copyFunction(bucketHandle, value.as.function)); return TOY_VALUE_FROM_FUNCTION(Toy_copyFunction(bucketHandle, value.as.function));
case TOY_VALUE_OPAQUE: case TOY_VALUE_OPAQUE:
//copy opaques by value
return value;
case TOY_VALUE_ANY: case TOY_VALUE_ANY:
case TOY_VALUE_REFERENCE: case TOY_VALUE_REFERENCE:
case TOY_VALUE_UNKNOWN: case TOY_VALUE_UNKNOWN:
@@ -650,7 +653,7 @@ Toy_String* Toy_stringifyValue(Toy_Bucket** bucketHandle, Toy_Value value) {
case TOY_VALUE_OPAQUE: case TOY_VALUE_OPAQUE:
//dummy //dummy
return Toy_createStringLength(bucketHandle, "<opaque>", 6); return Toy_createStringLength(bucketHandle, "<opaque>", 8);
case TOY_VALUE_ANY: case TOY_VALUE_ANY:
case TOY_VALUE_REFERENCE: case TOY_VALUE_REFERENCE:
source/toy_vm.c
+6 -3
View File
@@ -428,13 +428,16 @@ static void processAttribute(Toy_VM* vm) {
//type-based attributes //type-based attributes
if (TOY_VALUE_IS_STRING(compound)) { if (TOY_VALUE_IS_STRING(compound)) {
result = handleStringAttributes(vm, compound, attribute); result = Toy_private_handleStringAttributes(vm, compound, attribute);
} }
else if (TOY_VALUE_IS_ARRAY(compound)) { else if (TOY_VALUE_IS_ARRAY(compound)) {
result = handleArrayAttributes(vm, compound, attribute); result = Toy_private_handleArrayAttributes(vm, compound, attribute);
} }
else if (TOY_VALUE_IS_TABLE(compound)) { else if (TOY_VALUE_IS_TABLE(compound)) {
result = handleTableAttributes(vm, compound, attribute); result = Toy_private_handleTableAttributes(vm, compound, attribute);
}
else if (TOY_VALUE_IS_OPAQUE(compound)) {
result = Toy_private_handleOpaqueAttributes(vm, compound, attribute);
} }
else { else {
char buffer[256]; char buffer[256];