make objects initialisation through type.__call__
This commit is contained in:
@@ -34,21 +34,22 @@ ArgonObject *bind_object_to_function(ArgonObject *object,
|
||||
add_field(bound_method_wrapper, "__class__", ARGON_METHOD_TYPE);
|
||||
add_field(bound_method_wrapper, "__binding__", object);
|
||||
add_field(bound_method_wrapper, "__function__", function);
|
||||
ArgonObject *function_name = get_field(function, "__name__", false);
|
||||
ArgonObject *function_name = get_field(function, "__name__", false, false);
|
||||
if (function_name)
|
||||
add_field(bound_method_wrapper, "__name__", function_name);
|
||||
return bound_method_wrapper;
|
||||
}
|
||||
|
||||
ArgonObject *get_field_for_class(ArgonObject *target, char *name, ArgonObject *binding_object) {
|
||||
ArgonObject *get_field_for_class(ArgonObject *target, char *name,
|
||||
ArgonObject *binding_object) {
|
||||
char *field = "__base__";
|
||||
while (target) {
|
||||
uint64_t hash = siphash64_bytes(name, strlen(name), siphash_key);
|
||||
ArgonObject *object = hashmap_lookup_GC(target->dict, hash);
|
||||
|
||||
if (object) {
|
||||
if (object->type == TYPE_FUNCTION ||
|
||||
object->type == TYPE_NATIVE_FUNCTION) {
|
||||
if ((object->type == TYPE_FUNCTION ||
|
||||
object->type == TYPE_NATIVE_FUNCTION) && binding_object) {
|
||||
object = bind_object_to_function(binding_object, object);
|
||||
}
|
||||
return object;
|
||||
@@ -59,10 +60,18 @@ ArgonObject *get_field_for_class(ArgonObject *target, char *name, ArgonObject *b
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ArgonObject *get_field(ArgonObject *target, char *name, bool recursive) {
|
||||
ArgonObject *get_field(ArgonObject *target, char *name, bool recursive,
|
||||
bool disable_method_wrapper) {
|
||||
char *field = "__class__";
|
||||
ArgonObject *object = hashmap_lookup_GC(target->dict, siphash64_bytes(name, strlen(name), siphash_key));
|
||||
ArgonObject *object = hashmap_lookup_GC(
|
||||
target->dict, siphash64_bytes(name, strlen(name), siphash_key));
|
||||
if (!recursive || object)
|
||||
return object;
|
||||
return get_field_for_class(hashmap_lookup_GC(target->dict, siphash64_bytes(field, strlen(field), siphash_key)), name, target);
|
||||
ArgonObject *binding = target;
|
||||
if (disable_method_wrapper)
|
||||
binding = NULL;
|
||||
return get_field_for_class(
|
||||
hashmap_lookup_GC(target->dict,
|
||||
siphash64_bytes(field, strlen(field), siphash_key)),
|
||||
name, binding);
|
||||
}
|
||||
@@ -17,8 +17,10 @@ ArgonObject *new_object();
|
||||
|
||||
void add_field(ArgonObject *target, char *name, ArgonObject *object);
|
||||
|
||||
ArgonObject *get_field_for_class(ArgonObject *target, char *name, ArgonObject *binding_object);
|
||||
ArgonObject *get_field_for_class(ArgonObject *target, char *name,
|
||||
ArgonObject *binding_object);
|
||||
|
||||
ArgonObject *get_field(ArgonObject *target, char *name, bool recursive);
|
||||
ArgonObject *get_field(ArgonObject *target, char *name, bool recursive,
|
||||
bool disable_method_wrapper);
|
||||
|
||||
#endif // OBJECT_H
|
||||
Reference in New Issue
Block a user