Changeset 62007 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 28, 2010, 8:19:59 AM (15 years ago)

Author:

[email protected]

Message:

2010-06-28 Caio Marcelo de Oliveira Filho <​[email protected]>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QScriptValue should have API for accessing object properties
​https://bugs.webkit.org/show_bug.cgi?id=40903

Make possible to access properties inside QScriptValues. While this
still doesn't support the ResolveLocal parameter, it is already useful
for testing the API.

The tests from upstream QtScript weren't imported since most of them
depend on the setProperty() function as well. A simple test was created.

• qt/api/qscriptvalue.cpp: (QScriptValue::property):
• qt/api/qscriptvalue.h: (QScriptValue::):
• qt/api/qscriptvalue_p.h: (QScriptValuePrivate::property):
• qt/tests/qscriptvalue/tst_qscriptvalue.cpp: (tst_QScriptValue::propertySimple):
• qt/tests/qscriptvalue/tst_qscriptvalue.h:

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-06-28  Caio Marcelo de Oliveira Filho  <[email protected]>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QScriptValue should have API for accessing object properties
+        https://bugs.webkit.org/show_bug.cgi?id=40903
+
+        Make possible to access properties inside QScriptValues. While this
+        still doesn't support the ResolveLocal parameter, it is already useful
+        for testing the API.
+
+        The tests from upstream QtScript weren't imported since most of them
+        depend on the setProperty() function as well. A simple test was created.
+
+        * qt/api/qscriptvalue.cpp:
+        (QScriptValue::property):
+        * qt/api/qscriptvalue.h:
+        (QScriptValue::):
+        * qt/api/qscriptvalue_p.h:
+        (QScriptValuePrivate::property):
+        * qt/tests/qscriptvalue/tst_qscriptvalue.cpp:
+        (tst_QScriptValue::propertySimple):
+        * qt/tests/qscriptvalue/tst_qscriptvalue.h:
+
 2010-06-28  Xan Lopez  <[email protected]>
 

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -628 +628 @@
     return d_ptr->instanceOf(QScriptValuePrivate::get(other));
 }
+
+/*!
+  Returns the value of this QScriptValue's property with the given \a name,
+  using the given \a mode to resolve the property.
+
+  If no such property exists, an invalid QScriptValue is returned.
+
+  If the property is implemented using a getter function (i.e. has the
+  PropertyGetter flag set), calling property() has side-effects on the
+  script engine, since the getter function will be called (possibly
+  resulting in an uncaught script exception). If an exception
+  occurred, property() returns the value that was thrown (typically
+  an \c{Error} object).
+
+  \sa setProperty(), propertyFlags(), QScriptValueIterator
+*/
+QScriptValue QScriptValue::property(const QString& name, const ResolveFlags& mode) const
+{
+    return QScriptValuePrivate::get(d_ptr->property(name, mode));
+}
+
+/*!
+  \overload
+
+  Returns the property at the given \a arrayIndex, using the given \a
+  mode to resolve the property.
+
+  This function is provided for convenience and performance when
+  working with array objects.
+
+  If this QScriptValue is not an Array object, this function behaves
+  as if property() was called with the string representation of \a
+  arrayIndex.
+*/
+QScriptValue QScriptValue::property(quint32 arrayIndex, const ResolveFlags& mode) const
+{
+    return QScriptValuePrivate::get(d_ptr->property(arrayIndex, mode));
+}

trunk/JavaScriptCore/qt/api/qscriptvalue.h

@@ -33 +33 @@
 
 class QScriptValue {
-public:    
+public:
+    enum ResolveFlag {
+        ResolveLocal     = 0x00,
+        ResolvePrototype = 0x01
+    };
+
+    Q_DECLARE_FLAGS(ResolveFlags, ResolveFlag)
+
     enum SpecialValue {
         NullValue,
@@ -67 +74 @@
     bool strictlyEquals(const QScriptValue& other) const;
     bool instanceOf(const QScriptValue& other) const;
+
+    QScriptValue property(const QString& name, const ResolveFlags& mode = ResolvePrototype) const;
+    QScriptValue property(quint32 arrayIndex, const ResolveFlags& mode = ResolvePrototype) const;
 
     QScriptEngine* engine() const;

trunk/JavaScriptCore/qt/api/qscriptvalue_p.h

@@ -120 +120 @@
     inline bool instanceOf(QScriptValuePrivate* other);
     inline bool assignEngine(QScriptEnginePrivate* engine);
+
+    inline QScriptValuePrivate* property(const QString& name, const QScriptValue::ResolveFlags& mode);
+    inline QScriptValuePrivate* property(quint32 arrayIndex, const QScriptValue::ResolveFlags& mode);
 
     inline QScriptValuePrivate* call(const QScriptValuePrivate* , const QScriptValueList& args);
@@ -757 +760 @@
 }
 
+inline QScriptValuePrivate* QScriptValuePrivate::property(const QString& name, const QScriptValue::ResolveFlags& mode)
+{
+    if (!isObject())
+        return new QScriptValuePrivate;
+
+    if (mode & QScriptValue::ResolveLocal) {
+        qWarning("QScriptValue::property(): ResolveLocal not supported yet.");
+        return new QScriptValuePrivate;
+    }
+
+    JSRetainPtr<JSStringRef> nameRef(Adopt, QScriptConverter::toString(name));
+    QScriptValuePrivate* result = new QScriptValuePrivate(m_engine.constData(), JSObjectGetProperty(*m_engine, *this, nameRef.get(), /* exception */ 0));
+
+    return result;
+}
+
+inline QScriptValuePrivate* QScriptValuePrivate::property(quint32 arrayIndex, const QScriptValue::ResolveFlags& mode)
+{
+    if (!isObject())
+        return new QScriptValuePrivate;
+
+    if (mode & QScriptValue::ResolveLocal) {
+        qWarning("QScriptValue::property(): ResolveLocal not supported yet.");
+        return new QScriptValuePrivate;
+    }
+
+    return new QScriptValuePrivate(m_engine.constData(), JSObjectGetPropertyAtIndex(*m_engine, *this, arrayIndex, /* exception */ 0));
+}
+
 QScriptValuePrivate* QScriptValuePrivate::call(const QScriptValuePrivate*, const QScriptValueList& args)
 {

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

@@ -581 +581 @@
 }
 
+void tst_QScriptValue::propertySimple()
+{
+    QScriptEngine eng;
+
+    QScriptValue simpleObject(eng.evaluate("new Object({ test: 1, other: 2 })"));
+    QCOMPARE(simpleObject.property("test").toUInt32(), quint32(1));
+    QCOMPARE(simpleObject.property("other").toUInt32(), quint32(2));
+
+    QScriptValue simpleArray(eng.evaluate("new Array(7, 8, 9)"));
+    QCOMPARE(simpleArray.property("length").toUInt32(), quint32(3));
+    QCOMPARE(simpleArray.property(2).toUInt32(), quint32(9));
+}
+
 QTEST_MAIN(tst_QScriptValue)

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

@@ -52 +52 @@
     void ctor();
     void toObjectSimple();
+    void propertySimple();
 
     // Generated test functions.