Changeset 60725 in webkit

Timestamp:

Jun 4, 2010 5:23:07 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-04 Jedrzej Nowacki <​jedrzej.nowacki@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

New QtScript API; QScriptValue::instanceOf.

New function create an easy way to check value's prototype hierarchy.

[Qt] QScriptValue should have an instanceOf method
​https://bugs.webkit.org/show_bug.cgi?id=40120

• qt/api/qscriptvalue.cpp: (QScriptValue::instanceOf):
• qt/api/qscriptvalue.h:
• qt/api/qscriptvalue_p.h: (QScriptValuePrivate::instanceOf):
• qt/tests/qscriptvalue/tst_qscriptvalue.h:
• qt/tests/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp: (tst_QScriptValue::instanceOf_initData): (tst_QScriptValue::instanceOf_makeData): (tst_QScriptValue::instanceOf_test):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qscriptvalue.cpp (modified) (1 diff)
• qt/api/qscriptvalue.h (modified) (1 diff)
• qt/api/qscriptvalue_p.h (modified) (2 diffs)
• qt/tests/qscriptvalue/tst_qscriptvalue.h (modified) (2 diffs)
• qt/tests/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-06-04  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        New QtScript API; QScriptValue::instanceOf.
+
+        New function create an easy way to check value's prototype hierarchy.
+
+        [Qt] QScriptValue should have an instanceOf method
+        https://bugs.webkit.org/show_bug.cgi?id=40120
+
+        * qt/api/qscriptvalue.cpp:
+        (QScriptValue::instanceOf):
+        * qt/api/qscriptvalue.h:
+        * qt/api/qscriptvalue_p.h:
+        (QScriptValuePrivate::instanceOf):
+        * qt/tests/qscriptvalue/tst_qscriptvalue.h:
+        * qt/tests/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp:
+        (tst_QScriptValue::instanceOf_initData):
+        (tst_QScriptValue::instanceOf_makeData):
+        (tst_QScriptValue::instanceOf_test):
+
 2010-06-04  Gavin Barraclough  <barraclough@apple.com>
 

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -586 +586 @@
     return d_ptr->strictlyEquals(QScriptValuePrivate::get(other));
 }
+
+/*!
+    Returns true if this QScriptValue is an instance of
+    \a other; otherwise returns false.
+
+    This QScriptValue is considered to be an instance of \a other if
+    \a other is a function and the value of the \c{prototype}
+    property of \a other is in the prototype chain of this
+    QScriptValue.
+*/
+bool QScriptValue::instanceOf(const QScriptValue& other) const
+{
+    return d_ptr->instanceOf(QScriptValuePrivate::get(other));
+}

trunk/JavaScriptCore/qt/api/qscriptvalue.h

@@ -62 +62 @@
     bool equals(const QScriptValue& other) const;
     bool strictlyEquals(const QScriptValue& other) const;
+    bool instanceOf(const QScriptValue& other) const;
 
     QScriptEngine* engine() const;

trunk/JavaScriptCore/qt/api/qscriptvalue_p.h

@@ -110 +110 @@
     inline bool equals(QScriptValuePrivate* other);
     inline bool strictlyEquals(QScriptValuePrivate* other);
+    inline bool instanceOf(QScriptValuePrivate* other);
     inline bool assignEngine(QScriptEnginePrivate* engine);
 
@@ -671 +672 @@
 }
 
+inline bool QScriptValuePrivate::instanceOf(QScriptValuePrivate* other)
+{
+    if (!isJSBased() || !other->isObject())
+        return false;
+    return JSValueIsInstanceOfConstructor(context(), value(), other->object(), /* exception */ 0);
+}
+
 /*!
   Tries to assign \a engine to this value. Returns true on success; otherwise returns false.

trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.h

@@ -110 +110 @@
     void strictlyEquals();
 
+    void instanceOf_data();
+    void instanceOf();
+
 private:
     typedef void (tst_QScriptValue::*InitDataFunction)();
@@ -199 +202 @@
     void strictlyEquals_test(const char*, const QScriptValue&);
 
+    void instanceOf_initData();
+    void instanceOf_makeData(const char*);
+    void instanceOf_test(const char*, const QScriptValue&);
+
 private:
     QScriptEngine* engine;

trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp

@@ -1678 +1678 @@
 
 DEFINE_TEST_FUNCTION(strictlyEquals)
+
+
+void tst_QScriptValue::instanceOf_initData()
+{
+    QTest::addColumn<QScriptValue>("other");
+    QTest::addColumn<bool>("expected");
+    initScriptValues();
+}
+
+static QString instanceOf_array[] = {
+    "engine->evaluate(\"[]\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"[]\") <=> engine->evaluate(\"Array\")",
+    "engine->evaluate(\"Date.prototype\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Function.prototype\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Object\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Object\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"Array\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Array\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"Number\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Number\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"Function\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Function\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"(function() { return 1; })\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"(function() { return 1; })\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"(function() { return 'ciao'; })\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"(function() { return 'ciao'; })\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"(function() { throw new Error('foo' })\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new Object()\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"Array\")",
+    "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"a = new Object( a.foo = 22; a.foo\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"Null\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"True\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"False\") <=> engine->evaluate(\"Object\")"};
+
+void tst_QScriptValue::instanceOf_makeData(const char *expr)
+{
+    static QSet<QString> equals;
+    if (equals.isEmpty()) {
+        equals.reserve(29);
+        for (unsigned i = 0; i < 29; ++i)
+            equals.insert(instanceOf_array[i]);
+    }
+    QHash<QString, QScriptValue>::const_iterator it;
+    for (it = m_values.constBegin(); it != m_values.constEnd(); ++it) {
+        QString tag = QString::fromLatin1("%20 <=> %21").arg(expr).arg(it.key());
+        newRow(tag.toLatin1()) << it.value() << equals.contains(tag);
+    }
+}
+
+void tst_QScriptValue::instanceOf_test(const char *, const QScriptValue& value)
+{
+    QFETCH(QScriptValue, other);
+    QFETCH(bool, expected);
+    QCOMPARE(value.instanceOf(other), expected);
+}
+
+DEFINE_TEST_FUNCTION(instanceOf)