Initial work on [[HasProperty]]

diff --git a/qmljs_objects.cpp b/qmljs_objects.cpp
index 52c825f..464b9cc 100644 (file)
--- a/qmljs_objects.cpp
+++ b/qmljs_objects.cpp
@@ -83,12 +83,12 @@ bool Object::canSetProperty(Context *ctx, String *name)
     return true;
 }
 
-bool Object::hasProperty(Context *, String *name) const
+bool Object::hasProperty(Context *ctx, String *name) const
 {
     if (members)
         return members->find(name) != 0;
 
-    return false;
+    return prototype ? prototype->hasProperty(ctx, name) : false;
 }
 
 bool Object::deleteProperty(Context *, String *name, bool flag)

diff --git a/qv4isel_x86_64.cpp b/qv4isel_x86_64.cpp
index cdf50f8..e60dd56 100644 (file)
--- a/qv4isel_x86_64.cpp
+++ b/qv4isel_x86_64.cpp
@@ -697,11 +697,7 @@ void InstructionSelection::visitMove(IR::Move *s)
                     case IR::OpStrictEqual: op = __qmljs_se; break;
                     case IR::OpStrictNotEqual: op = __qmljs_sne; break;
                     case IR::OpInstanceof: op = __qmljs_instanceof; break;
-
-                    case IR::OpIn:
-                        Q_UNIMPLEMENTED();
-                        assert(!"TODO");
-                        break;
+                    case IR::OpIn: op = __qmljs_in; break;
 
                     case IR::OpAnd:
                     case IR::OpOr: