change how access is done and add built in array (need to optimise the size)

This commit is contained in:
William Bell
2025-09-09 06:24:23 +01:00
parent d46a6dc209
commit fc7cfc7cfb
22 changed files with 732 additions and 639 deletions

View File

@@ -5,7 +5,6 @@
*/
#include "object.h"
#include "../../hash_data/hash_data.h"
#include "../../memory.h"
#include "type/type.h"
#include <stdbool.h>
@@ -20,35 +19,48 @@ const char *built_in_field_names[BUILT_IN_FIELDS_COUNT] = {
"__string__", "__subtract__", "__multiply__", "__division__",
"__new__", "__init__", "__boolean__", "__get_attr__",
"__binding__", "__function__", "address", "__call__",
"__number__", "log", "length"};
"__number__", "log", "length", "__getattribute__"};
uint64_t built_in_field_hashes[BUILT_IN_FIELDS_COUNT];
ArgonObject *new_object() {
ArgonObject *object = ar_alloc(sizeof(ArgonObject));
memset(object->Builtin_slots, 0, sizeof(object->Builtin_slots));
object->type = TYPE_OBJECT;
object->dict = createHashmap_GC();
add_builtin_field(object, __class__, ARGON_TYPE_TYPE);
add_builtin_field(object, __base__, BASE_CLASS);
object->dict = NULL;
object->as_bool = true;
return object;
}
void init_built_in_field_hashes() {
for (int i = 0; i < BUILT_IN_FIELDS_COUNT; i++) {
built_in_field_hashes[i] = siphash64_bytes(
built_in_field_names[i], strlen(built_in_field_names[i]), siphash_key);
}
ArgonObject *new_class() {
ArgonObject *object = new_object();
add_builtin_field(object, __class__, ARGON_TYPE_TYPE);
add_builtin_field(object, __base__, BASE_CLASS);
return object;
}
void add_builtin_field(ArgonObject *target, built_in_fields field,
ArgonObject *object) {
hashmap_insert_GC(target->dict, built_in_field_hashes[field],
(char *)built_in_field_names[field], object, 0);
ArgonObject *new_instance(ArgonObject *of) {
ArgonObject *object = new_object();
add_builtin_field(object, __class__, of);
return object;
}
inline void add_builtin_field(ArgonObject *target, built_in_fields field,
ArgonObject *object) {
target->Builtin_slots[field] = object;
// hashmap_insert_GC(target->dict, built_in_field_hashes[field],
// (char *)built_in_field_names[field], object, 0);
}
void add_field(ArgonObject *target, char *name, uint64_t hash,
ArgonObject *object) {
for (size_t i = 0; i < BUILT_IN_FIELDS_COUNT; i++) {
if (strcmp(name, built_in_field_names[i])) {
target->Builtin_slots[i] = object;
return;
}
}
if (!object->dict)
object->dict = createHashmap_GC();
hashmap_insert_GC(target->dict, hash, name, object, 0);
}
@@ -60,7 +72,7 @@ ArgonObject *bind_object_to_function(ArgonObject *object,
add_builtin_field(bound_method_wrapper, __binding__, object);
add_builtin_field(bound_method_wrapper, __function__, function);
ArgonObject *function_name =
get_builtin_field(function, __name__, false, false);
get_builtin_field(function, __name__);
if (function_name)
add_builtin_field(bound_method_wrapper, __name__, function_name);
return bound_method_wrapper;
@@ -79,7 +91,7 @@ ArgonObject *get_field_for_class_l(ArgonObject *target, char *name,
}
return object;
}
target = get_builtin_field(target, __base__, false, false);
target = get_builtin_field(target, __base__);
}
return NULL;
}
@@ -87,6 +99,13 @@ ArgonObject *get_field_for_class_l(ArgonObject *target, char *name,
ArgonObject *get_field_l(ArgonObject *target, char *name, uint64_t hash,
size_t length, bool recursive,
bool disable_method_wrapper) {
for (size_t i = 0; i < BUILT_IN_FIELDS_COUNT; i++) {
if (strcmp(name, built_in_field_names[i])) {
return target->Builtin_slots[i];
}
}
if (!target->dict)
return NULL;
ArgonObject *object = hashmap_lookup_GC(target->dict, hash);
if (!recursive || object)
return object;
@@ -94,38 +113,35 @@ ArgonObject *get_field_l(ArgonObject *target, char *name, uint64_t hash,
if (disable_method_wrapper)
binding = NULL;
return get_field_for_class_l(
hashmap_lookup_GC(target->dict, built_in_field_hashes[__class__]), name,
get_builtin_field(target, __class__), name,
hash, length, binding);
}
ArgonObject *get_builtin_field_for_class(ArgonObject *target,
built_in_fields field,
ArgonObject *binding_object) {
while (target) {
ArgonObject *object = get_builtin_field(target, field, false, false);
if (object) {
if ((object->type == TYPE_FUNCTION ||
object->type == TYPE_NATIVE_FUNCTION) &&
binding_object) {
object = bind_object_to_function(binding_object, object);
}
return object;
ArgonObject *object = get_builtin_field(target, field);
if (object) {
if ((object->type == TYPE_FUNCTION ||
object->type == TYPE_NATIVE_FUNCTION) &&
binding_object) {
object = bind_object_to_function(binding_object, object);
}
target = get_builtin_field(target, __base__, false, false);
return object;
}
return NULL;
}
ArgonObject *get_builtin_field(ArgonObject *target, built_in_fields field,
bool recursive, bool disable_method_wrapper) {
ArgonObject *object =
hashmap_lookup_GC(target->dict, built_in_field_hashes[field]);
if (!recursive || object)
return object;
ArgonObject *binding = target;
if (disable_method_wrapper)
binding = NULL;
return get_builtin_field_for_class(
hashmap_lookup_GC(target->dict, built_in_field_hashes[__class__]), field,
binding);
ArgonObject *get_builtin_field(ArgonObject *target, built_in_fields field) {
return target->Builtin_slots[field];
// ArgonObject *object =
// hashmap_lookup_GC(target->dict, built_in_field_hashes[field]);
// if (!recursive || object)
// return object;
// ArgonObject *binding = target;
// if (disable_method_wrapper)
// binding = NULL;
// return get_builtin_field_for_class(
// hashmap_lookup_GC(target->dict, built_in_field_hashes[__class__]),
// field, binding);
}