fix: resolved an issue with the behavior of typeof and implements

Author: jacopodl

argon/vm/datatype/arobject.cpp

@@ -82,7 +82,7 @@ ArObject *type_get_attr(const ArObject *instance, ArObject *key, bool static_att
         return nullptr;
     }
 
-    if (!aprop.IsPublic() && !TraitIsImplemented(instance, base)) {
+    if (!aprop.IsPublic() && !TraitIsImplemented(ancestor, base)) {
         ErrorFormat(kAccessViolationError[0], kAccessViolationError[1],
                     ARGON_RAW_STRING((String *) key), ancestor->name);
 
@@ -1096,16 +1096,10 @@ bool argon::vm::datatype::TypeInit(TypeInfo *type, ArObject *auxiliary) {
     return false;
 }
 
-bool argon::vm::datatype::TraitIsImplemented(const ArObject *object, const TypeInfo *type) {
-    const TypeInfo *obj_type;
-
-    if (object == nullptr || type == nullptr)
+bool argon::vm::datatype::TraitIsImplemented(const TypeInfo *obj_type, const TypeInfo *type) {
+    if (obj_type == nullptr || type == nullptr)
         return false;
 
-    if ((const TypeInfo *) object == type)
-        return true;
-
-    obj_type = AR_GET_TYPE(object);
     if (obj_type == type)
         return true;
 
@@ -1121,6 +1115,13 @@ bool argon::vm::datatype::TraitIsImplemented(const ArObject *object, const TypeI
     return false;
 }
 
+bool argon::vm::datatype::TypeOF(const ArObject *object, const TypeInfo *type) {
+    if (AR_TYPEOF(object, type))
+        return true;
+
+    return TraitIsImplemented( AR_GET_TYPE(object), type);
+}
+
 int argon::vm::datatype::MonitorAcquire(ArObject *object) {
     auto *monitor = AR_GET_MON(object).load(std::memory_order_consume);
 

argon/vm/datatype/arobject.h

@@ -70,7 +70,9 @@ namespace argon::vm::datatype {
 
     bool TypeInit(TypeInfo *type, ArObject *auxiliary);
 
-    bool TraitIsImplemented(const ArObject *object, const TypeInfo *type);
+    bool TraitIsImplemented(const TypeInfo *obj_type, const TypeInfo *type);
+
+    bool TypeOF(const ArObject *object, const TypeInfo *type);
 
     int MonitorAcquire(ArObject *object);
 

argon/vm/datatype/function.cpp

@@ -249,7 +249,7 @@ ArObject *argon::vm::datatype::FunctionInvokeNative(Function *func, ArObject **a
     if (f_count > 0 && func->IsMethod()) {
         instance = *f_args;
 
-        if (!TraitIsImplemented(instance, func->base)) {
+        if (!TraitIsImplemented(AR_GET_TYPE(instance), func->base)) {
             ErrorFormat(kTypeError[0], kTypeError[5], ARGON_RAW_STRING(func->qname), AR_TYPE_NAME(instance));
             goto ERROR;
         }

argon/vm/mod/builtins.cpp

@@ -192,15 +192,25 @@ ARGON_FUNCTION(builtins_iscallable, iscallable,
 }
 
 ARGON_FUNCTION(builtins_implements, implements,
-               "Check if object implements all the indicated traits.\n"
+               "Check if type implements all the indicated traits.\n"
                "\n"
                "- Parameters:\n"
-               "  - obj: Object to check.\n"
+               "  - obj: Type to check.\n"
                "  - ...traits: Traits list.\n"
-               "- Returns: True if the object implements ALL indicated traits, false otherwise.",
+               "- Returns: True if type implements ALL indicated traits, false otherwise.",
                ": obj, : traits", true, false) {
+    if (!AR_TYPEOF(*args, type_type_)) {
+        ErrorFormat(kTypeError[0], kTypeError[1], AR_TYPE_QNAME(*args));
+        return nullptr;
+    }
+
     for (ArSize i = 1; i < argc; i++) {
-        if (!TraitIsImplemented(args[0], (TypeInfo *) args[i]))
+        if (!AR_TYPEOF(args[i], type_type_)) {
+            ErrorFormat(kTypeError[0], kTypeError[1], AR_TYPE_QNAME(args[i]));
+            return nullptr;
+        }
+
+        if (!TraitIsImplemented((const TypeInfo *) args[0], (TypeInfo *) args[i]))
             return BoolToArBool(false);
     }
 
@@ -241,8 +251,20 @@ ARGON_FUNCTION(builtins_require, require,
     Result *result;
 
     auto *fiber = argon::vm::GetFiber();
+    auto *path = (String *) *args;
+
+    auto index = StringRFind(path, ".");
+    if (index > 0) {
+        path = StringSubs(path, 0, index);
+        if (path == nullptr)
+            return nullptr;
+    }
+
+    auto *mod = LoadModule(fiber->context->imp, path, nullptr);
+
+    if (index >= 0)
+        Release(path);
 
-    auto *mod = LoadModule(fiber->context->imp, ((String *) *args), nullptr);
     if (mod != nullptr) {
         if ((result = ResultNew((ArObject *) mod, true)) == nullptr)
             Release(mod);
@@ -348,10 +370,7 @@ ARGON_FUNCTION(builtins_typeof, typeof,
     for (auto i = 1; i < argc; i++) {
         auto *tp = (const TypeInfo *) args[i];
 
-        if (!AR_TYPEOF(tp, type_type_))
-            tp = AR_GET_TYPE(tp);
-
-        if (AR_TYPEOF(base, tp))
+        if (TypeOF(base, tp))
             return BoolToArBool(true);
     }