Changeset 68651 in webkit

Timestamp:

Sep 29, 2010 9:31:22 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-29 Caio Marcelo de Oliveira Filho <​caio.oliveira@openbossa.org>

Reviewed by Andreas Kling.

[Qt] QScriptEngine should have an API for creating Date objects
​https://bugs.webkit.org/show_bug.cgi?id=41667

Implement newDate(), isDate() and toDateTime() functions. Use the
QDateTime::{to,set}MSecsSinceEpoch() functions to do the
calculations.

• api/qscriptengine.cpp: (QScriptEngine::newDate):
• api/qscriptengine.h:
• api/qscriptengine_p.cpp: (QScriptEnginePrivate::newDate):
• api/qscriptengine_p.h: (QScriptEnginePrivate::isDate):

• api/qscriptoriginalglobalobject_p.h: (QScriptOriginalGlobalObject::QScriptOriginalGlobalObject): need to keep track of Date Constructor and Prototype. (QScriptOriginalGlobalObject::~QScriptOriginalGlobalObject): ditto. (QScriptOriginalGlobalObject::isDate): use the Date Constructor and Prototype to identify Date values.

• api/qscriptvalue.cpp: (QScriptValue::isDate): (QScriptValue::toDateTime):
• api/qscriptvalue.h:
• api/qscriptvalue_p.h: (QScriptValuePrivate::isDate): (QScriptValuePrivate::toDateTime):
• tests/qscriptengine/tst_qscriptengine.cpp: (tst_QScriptEngine::newDate):

Location:

trunk/JavaScriptCore/qt

Files:

• ChangeLog (modified) (1 diff)
• api/qscriptengine.cpp (modified) (2 diffs)
• api/qscriptengine.h (modified) (2 diffs)
• api/qscriptengine_p.cpp (modified) (1 diff)
• api/qscriptengine_p.h (modified) (3 diffs)
• api/qscriptoriginalglobalobject_p.h (modified) (5 diffs)
• api/qscriptvalue.cpp (modified) (2 diffs)
• api/qscriptvalue.h (modified) (3 diffs)
• api/qscriptvalue_p.h (modified) (5 diffs)
• tests/qscriptengine/tst_qscriptengine.cpp (modified) (3 diffs)

trunk/JavaScriptCore/qt/ChangeLog

@@ +1 @@
+2010-09-29  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QScriptEngine should have an API for creating Date objects
+        https://bugs.webkit.org/show_bug.cgi?id=41667
+
+        Implement newDate(), isDate() and toDateTime() functions. Use the
+        QDateTime::{to,set}MSecsSinceEpoch() functions to do the
+        calculations.
+
+        * api/qscriptengine.cpp:
+        (QScriptEngine::newDate):
+        * api/qscriptengine.h:
+        * api/qscriptengine_p.cpp:
+        (QScriptEnginePrivate::newDate):
+        * api/qscriptengine_p.h:
+        (QScriptEnginePrivate::isDate):
+
+        * api/qscriptoriginalglobalobject_p.h:
+        (QScriptOriginalGlobalObject::QScriptOriginalGlobalObject): need
+        to keep track of Date Constructor and Prototype.
+        (QScriptOriginalGlobalObject::~QScriptOriginalGlobalObject): ditto.
+        (QScriptOriginalGlobalObject::isDate): use the Date Constructor
+        and Prototype to identify Date values.
+
+        * api/qscriptvalue.cpp:
+        (QScriptValue::isDate):
+        (QScriptValue::toDateTime):
+        * api/qscriptvalue.h:
+        * api/qscriptvalue_p.h:
+        (QScriptValuePrivate::isDate):
+        (QScriptValuePrivate::toDateTime):
+        * tests/qscriptengine/tst_qscriptengine.cpp:
+        (tst_QScriptEngine::newDate):
+
 2010-07-27  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

trunk/JavaScriptCore/qt/api/qscriptengine.cpp

@@ -26 +26 @@
 #include "qscriptsyntaxcheckresult_p.h"
 #include "qscriptvalue_p.h"
+#include <QtCore/qdatetime.h>
+#include <QtCore/qnumeric.h>
 
 /*!
@@ -369 +371 @@
 
 /*!
+    Creates a QtScript object of class Date with the given \a value
+    (the number of milliseconds since 01 January 1970, UTC).
+*/
+QScriptValue QScriptEngine::newDate(qsreal value)
+{
+    return QScriptValuePrivate::get(d_ptr->newDate(value));
+}
+
+/*!
+    Creates a QtScript object of class Date from the given \a value.
+
+    \sa QScriptValue::toDateTime()
+*/
+QScriptValue QScriptEngine::newDate(const QDateTime& value)
+{
+    if (value.isValid())
+        return QScriptValuePrivate::get(d_ptr->newDate(qsreal(value.toMSecsSinceEpoch())));
+    return QScriptValuePrivate::get(d_ptr->newDate(qSNaN()));
+}
+
+/*!
   Returns this engine's Global Object.
 

trunk/JavaScriptCore/qt/api/qscriptengine.h

@@ -24 +24 @@
 #include "qscriptstring.h"
 #include "qscriptsyntaxcheckresult.h"
+#include "qscriptvalue.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 
-class QScriptValue;
+class QDateTime;
 class QScriptEnginePrivate;
 
@@ -70 +71 @@
     QScriptValue newObject();
     QScriptValue newArray(uint length = 0);
+    QScriptValue newDate(qsreal value);
+    QScriptValue newDate(const QDateTime& value);
     QScriptValue globalObject() const;
 private:

trunk/JavaScriptCore/qt/api/qscriptengine_p.cpp

@@ -147 +147 @@
 }
 
+QScriptValuePrivate* QScriptEnginePrivate::newDate(qsreal value)
+{
+    JSValueRef exception = 0;
+    JSValueRef argument = JSValueMakeNumber(m_context, value);
+    JSObjectRef result = JSObjectMakeDate(m_context, /* argumentCount */ 1, &argument, &exception);
+
+    if (exception) {
+        setException(exception, NotNullException);
+        return new QScriptValuePrivate();
+    }
+
+    return new QScriptValuePrivate(this, result);
+}
+
 QScriptValuePrivate* QScriptEnginePrivate::globalObject() const
 {

trunk/JavaScriptCore/qt/api/qscriptengine_p.h

@@ -78 +78 @@
     QScriptValuePrivate* newObject() const;
     QScriptValuePrivate* newArray(uint length);
+    QScriptValuePrivate* newDate(qsreal value);
     QScriptValuePrivate* globalObject() const;
 
@@ -84 +85 @@
     inline operator JSGlobalContextRef() const;
 
+    inline bool isDate(JSValueRef value) const;
     inline bool isArray(JSValueRef value) const;
     inline bool isError(JSValueRef value) const;
     inline bool objectHasOwnProperty(JSObjectRef object, JSStringRef property) const;
     inline QVector<JSStringRef> objectGetOwnPropertyNames(JSObjectRef object) const;
+
 private:
     QScriptEngine* q_ptr;
@@ -227 +230 @@
 }
 
+bool QScriptEnginePrivate::isDate(JSValueRef value) const
+{
+    return m_originalGlobalObject.isDate(value);
+}
+
 bool QScriptEnginePrivate::isArray(JSValueRef value) const
 {

trunk/JavaScriptCore/qt/api/qscriptoriginalglobalobject_p.h

@@ -44 +44 @@
     inline QVector<JSStringRef> objectGetOwnPropertyNames(JSObjectRef object) const;
 
+    inline bool isDate(JSValueRef value) const;
     inline bool isArray(JSValueRef value) const;
     inline bool isError(JSValueRef value) const;
@@ -62 +63 @@
     JSObjectRef m_functionConstructor;
     JSValueRef m_functionPrototype;
+    JSObjectRef m_dateConstructor;
+    JSValueRef m_datePrototype;
 
     // Reference to standard JS functions that are not exposed by JSC C API.
@@ -79 +82 @@
     initializeMember(globalObject, propertyName.get(), "Error", m_errorConstructor, m_errorPrototype);
     initializeMember(globalObject, propertyName.get(), "Function", m_functionConstructor, m_functionPrototype);
+    initializeMember(globalObject, propertyName.get(), "Date", m_dateConstructor, m_datePrototype);
 
     propertyName.adopt(JSStringCreateWithUTF8CString("hasOwnProperty"));
@@ -127 +131 @@
     JSValueUnprotect(m_context, m_functionConstructor);
     JSValueUnprotect(m_context, m_functionPrototype);
+    JSValueUnprotect(m_context, m_dateConstructor);
+    JSValueUnprotect(m_context, m_datePrototype);
     JSValueUnprotect(m_context, m_hasOwnPropertyFunction);
     JSValueUnprotect(m_context, m_getOwnPropertyNamesFunction);
@@ -171 +177 @@
 }
 
+inline bool QScriptOriginalGlobalObject::isDate(JSValueRef value) const
+{
+    return isType(value, m_dateConstructor, m_datePrototype);
+}
+
 inline bool QScriptOriginalGlobalObject::isArray(JSValueRef value) const
 {

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -322 +322 @@
 {
     return d_ptr->isArray();
+}
+
+/*!
+    Returns true if this QScriptValue is an object of the Date class;
+    otherwise returns false.
+
+    \sa QScriptEngine::newDate()
+*/
+bool QScriptValue::isDate() const
+{
+    return d_ptr->isDate();
 }
 
@@ -486 +497 @@
 {
     return QScriptValuePrivate::get(d_ptr->toObject());
+}
+
+/*!
+    Returns a QDateTime representation of this value, in local time.
+    If this QScriptValue is not a date, or the value of the date is
+    NaN (Not-a-Number), an invalid QDateTime is returned.
+
+    \sa isDate()
+*/
+QDateTime QScriptValue::toDateTime() const
+{
+    return d_ptr->toDateTime();
 }
 

trunk/JavaScriptCore/qt/api/qscriptvalue.h

@@ -27 +27 @@
 class QScriptEngine;
 class QScriptValuePrivate;
+class QDateTime;
 
 class QScriptValue;
@@ -113 +114 @@
     bool isError() const;
     bool isArray() const;
+    bool isDate() const;
 
     QString toString() const;
@@ -123 +125 @@
     quint16 toUInt16() const;
     QScriptValue toObject() const;
+    QDateTime toDateTime() const;
 
     QScriptValue call(const QScriptValue& thisObject = QScriptValue(),

trunk/JavaScriptCore/qt/api/qscriptvalue_p.h

@@ -27 +27 @@
 #include <JavaScriptCore/JSRetainPtr.h>
 #include <JSObjectRefPrivate.h>
+#include <QtCore/qdatetime.h>
 #include <QtCore/qmath.h>
 #include <QtCore/qnumeric.h>
@@ -103 +104 @@
     inline bool isFunction();
     inline bool isArray();
+    inline bool isDate();
 
     inline QString toString() const;
@@ -114 +116 @@
     inline QScriptValuePrivate* toObject(QScriptEnginePrivate* engine);
     inline QScriptValuePrivate* toObject();
+    inline QDateTime toDateTime();
     inline QScriptValuePrivate* prototype();
     inline void setPrototype(QScriptValuePrivate* prototype);
@@ -463 +466 @@
 }
 
+bool QScriptValuePrivate::isDate()
+{
+    switch (m_state) {
+    case JSValue:
+        if (refinedJSValue() != JSObject)
+            return false;
+        // Fall-through.
+    case JSObject:
+        return m_engine->isDate(*this);
+    default:
+        return false;
+    }
+}
+
 QString QScriptValuePrivate::toString() const
 {
@@ -661 +678 @@
     // Without an engine there is not much we can do.
     return new QScriptValuePrivate;
+}
+
+QDateTime QScriptValuePrivate::toDateTime()
+{
+    if (!isDate())
+        return QDateTime();
+
+    JSValueRef exception = 0;
+    qsreal t = JSValueToNumber(*m_engine, *this, &exception);
+
+    if (exception) {
+        m_engine->setException(exception, QScriptEnginePrivate::NotNullException);
+        return QDateTime();
+    }
+
+    QDateTime result;
+    result.setMSecsSinceEpoch(qint64(t));
+    return result;
 }
 

trunk/JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp

@@ -22 +22 @@
 #include "qscriptsyntaxcheckresult.h"
 #include "qscriptvalue.h"
+#include <QtCore/qnumeric.h>
 #include <QtTest/qtest.h>
 
@@ -51 +52 @@
     void newArray();
     void uncaughtException();
+    void newDate();
 };
 
@@ -682 +684 @@
 }
 
+void tst_QScriptEngine::newDate()
+{
+    QScriptEngine eng;
+    {
+        QScriptValue date = eng.newDate(0);
+        QCOMPARE(date.isValid(), true);
+        QCOMPARE(date.isDate(), true);
+        QCOMPARE(date.isObject(), true);
+        QVERIFY(!date.isFunction());
+        // prototype should be Date.prototype
+        QCOMPARE(date.prototype().isValid(), true);
+        QCOMPARE(date.prototype().isDate(), true);
+        QCOMPARE(date.prototype().strictlyEquals(eng.evaluate("Date.prototype")), true);
+    }
+    {
+        QDateTime dt = QDateTime(QDate(1, 2, 3), QTime(4, 5, 6, 7), Qt::LocalTime);
+        QScriptValue date = eng.newDate(dt);
+        QCOMPARE(date.isValid(), true);
+        QCOMPARE(date.isDate(), true);
+        QCOMPARE(date.isObject(), true);
+        // prototype should be Date.prototype
+        QCOMPARE(date.prototype().isValid(), true);
+        QCOMPARE(date.prototype().isDate(), true);
+        QCOMPARE(date.prototype().strictlyEquals(eng.evaluate("Date.prototype")), true);
+
+        QCOMPARE(date.toDateTime(), dt);
+    }
+    {
+        QDateTime dt = QDateTime(QDate(1, 2, 3), QTime(4, 5, 6, 7), Qt::UTC);
+        QScriptValue date = eng.newDate(dt);
+        // toDateTime() result should be in local time
+        QCOMPARE(date.toDateTime(), dt.toLocalTime());
+    }
+    // Date.parse() should return NaN when it fails
+    {
+        QScriptValue ret = eng.evaluate("Date.parse()");
+        QVERIFY(ret.isNumber());
+        QVERIFY(qIsNaN(ret.toNumber()));
+    }
+    // Date.parse() should be able to parse the output of Date().toString()
+    {
+        QScriptValue ret = eng.evaluate("var x = new Date(); var s = x.toString(); s == new Date(Date.parse(s)).toString()");
+        QVERIFY(ret.isBoolean());
+        QCOMPARE(ret.toBoolean(), true);
+    }
+}
+
 QTEST_MAIN(tst_QScriptEngine)
 #include "tst_qscriptengine.moc"