JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / DateInstance.cpp

diff --git a/runtime/DateInstance.cpp b/runtime/DateInstance.cpp
index 62791aecb28627f6f7b0668b5f128e18da04f505..d8ca072491b8583dfc81e1295a2d8b392a6447df 100644 (file)
--- a/runtime/DateInstance.cpp
+++ b/runtime/DateInstance.cpp
@@ -22,6 +22,8 @@
 #include "config.h"
 #include "DateInstance.h"
 
 #include "config.h"
 #include "DateInstance.h"
 

+#include "JSGlobalObject.h"
+

 #include <math.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>
 #include <math.h>
 #include <wtf/DateMath.h>
 #include <wtf/MathExtras.h>


@@ -30,89 +32,52 @@ using namespace WTF;
 
 namespace JSC {
 
 
 namespace JSC {
 

-struct DateInstance::Cache {
-    double m_gregorianDateTimeCachedForMS;
-    GregorianDateTime m_cachedGregorianDateTime;
-    double m_gregorianDateTimeUTCCachedForMS;
-    GregorianDateTime m_cachedGregorianDateTimeUTC;
-};
-
-const ClassInfo DateInstance::info = {"Date", 0, 0, 0};
+const ClassInfo DateInstance::s_info = {"Date", &JSWrapperObject::s_info, 0, 0};

 
 

-DateInstance::DateInstance(PassRefPtr<Structure> structure)
-    : JSWrapperObject(structure)
-    , m_cache(0)
+DateInstance::DateInstance(ExecState* exec, Structure* structure)
+    : JSWrapperObject(exec->globalData(), structure)

 {
 {

+    ASSERT(inherits(&s_info));
+    setInternalValue(exec->globalData(), jsNaN());

 }
 
 }
 

-DateInstance::~DateInstance()
+DateInstance::DateInstance(ExecState* exec, Structure* structure, double time)
+    : JSWrapperObject(exec->globalData(), structure)

 {
 {

-    delete m_cache;
+    ASSERT(inherits(&s_info));
+    setInternalValue(exec->globalData(), jsNumber(timeClip(time)));

 }
 
 }
 

-void DateInstance::msToGregorianDateTime(double milli, bool outputIsUTC, GregorianDateTime& t) const
-{
-    if (!m_cache) {
-        m_cache = new Cache;
-        m_cache->m_gregorianDateTimeCachedForMS = NaN;
-        m_cache->m_gregorianDateTimeUTCCachedForMS = NaN;
-    }
-
-    if (outputIsUTC) {
-        if (m_cache->m_gregorianDateTimeUTCCachedForMS != milli) {
-            WTF::msToGregorianDateTime(milli, true, m_cache->m_cachedGregorianDateTimeUTC);
-            m_cache->m_gregorianDateTimeUTCCachedForMS = milli;
-        }
-        t.copyFrom(m_cache->m_cachedGregorianDateTimeUTC);
-    } else {
-        if (m_cache->m_gregorianDateTimeCachedForMS != milli) {
-            WTF::msToGregorianDateTime(milli, false, m_cache->m_cachedGregorianDateTime);
-            m_cache->m_gregorianDateTimeCachedForMS = milli;
-        }
-        t.copyFrom(m_cache->m_cachedGregorianDateTime);
-    }
-}
-
-bool DateInstance::getTime(GregorianDateTime& t, int& offset) const
+const GregorianDateTime* DateInstance::calculateGregorianDateTime(ExecState* exec) const

 {
     double milli = internalNumber();
     if (isnan(milli))
 {
     double milli = internalNumber();
     if (isnan(milli))

-        return false;
-    
-    msToGregorianDateTime(milli, false, t);
-    offset = gmtoffset(t);
-    return true;
+        return 0;
+
+    if (!m_data)
+        m_data = exec->globalData().dateInstanceCache.add(milli);
+
+    if (m_data->m_gregorianDateTimeCachedForMS != milli) {
+        msToGregorianDateTime(exec, milli, false, m_data->m_cachedGregorianDateTime);
+        m_data->m_gregorianDateTimeCachedForMS = milli;
+    }
+    return &m_data->m_cachedGregorianDateTime;

 }
 
 }
 

-bool DateInstance::getUTCTime(GregorianDateTime& t) const
+const GregorianDateTime* DateInstance::calculateGregorianDateTimeUTC(ExecState* exec) const

 {
     double milli = internalNumber();
     if (isnan(milli))
 {
     double milli = internalNumber();
     if (isnan(milli))

-        return false;
-    
-    msToGregorianDateTime(milli, true, t);
-    return true;
-}
+        return 0;

 
 

-bool DateInstance::getTime(double& milli, int& offset) const
-{
-    milli = internalNumber();
-    if (isnan(milli))
-        return false;
-    
-    GregorianDateTime t;
-    msToGregorianDateTime(milli, false, t);
-    offset = gmtoffset(t);
-    return true;
-}
+    if (!m_data)
+        m_data = exec->globalData().dateInstanceCache.add(milli);

 
 

-bool DateInstance::getUTCTime(double& milli) const
-{
-    milli = internalNumber();
-    if (isnan(milli))
-        return false;
-    
-    return true;
+    if (m_data->m_gregorianDateTimeUTCCachedForMS != milli) {
+        msToGregorianDateTime(exec, milli, true, m_data->m_cachedGregorianDateTimeUTC);
+        m_data->m_gregorianDateTimeUTCCachedForMS = milli;
+    }
+    return &m_data->m_cachedGregorianDateTimeUTC;

 }
 
 } // namespace JSC
 }
 
 } // namespace JSC