Changeset 13089 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp

Timestamp:

Mar 2, 2006, 1:12:06 AM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• Set up new prototype macros and avoid using #if without defined() in JSC

Added new PLATFORM macros and related, to make sure #if's all check if relevant macros
are defined, and to separate core OS-level dependencies from operating environment
dependencies so you can, e.g., build KDE on Mac or Windows.

• kxmlcore/Platform.h: Added.

• deploy them everywhere in JavaScriptCore

• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/jni/jni_utility.cpp: (KJS::Bindings::convertValueToJValue):
• bindings/objc/WebScriptObject.mm:
• bindings/objc/objc_instance.mm: (ObjcInstance::end):
• bindings/softlinking.h:
• bindings/testbindings.mm: (main):
• kjs/JSLock.cpp:
• kjs/collector.cpp: (KJS::Collector::markCurrentThreadConservatively): (KJS::Collector::markOtherThreadConservatively): (KJS::Collector::markStackObjectsConservatively):
• kjs/config.h:
• kjs/date_object.cpp: (gmtoffset): (KJS::formatTime): (KJS::DateProtoFunc::callAsFunction): (KJS::DateObjectImp::construct): (KJS::makeTime):
• kjs/dtoa.cpp:
• kjs/fpconst.cpp: (KJS::sizeof): (KJS::):
• kjs/grammar.y:
• kjs/identifier.cpp:
• kjs/internal.cpp:
• kjs/interpreter.cpp: (KJS::Interpreter::evaluate): (KJS::Interpreter::createLanguageInstanceForValue):
• kjs/interpreter.h:
• kjs/lookup.cpp:
• kjs/lookup.h:
• kjs/math_object.cpp:
• kjs/object.cpp:
• kjs/object.h:
• kjs/operations.cpp: (KJS::isNaN): (KJS::isInf): (KJS::isPosInf): (KJS::isNegInf):
• kjs/operations.h:
• kjs/regexp.cpp: (KJS::RegExp::RegExp): (KJS::RegExp::~RegExp): (KJS::RegExp::match):
• kjs/regexp.h:
• kjs/testkjs.cpp: (StopWatch::start): (StopWatch::stop): (StopWatch::getElapsedMS):
• kjs/ustring.cpp:
• kjs/ustring.h:
• kxmlcore/AlwaysInline.h:
• kxmlcore/Assertions.cpp:
• kxmlcore/Assertions.h:
• kxmlcore/FastMalloc.cpp: (KXMLCore::):
• kxmlcore/FastMalloc.h:
• kxmlcore/FastMallocInternal.h:
• kxmlcore/HashTable.h:
• kxmlcore/TCPageMap.h:
• kxmlcore/TCSpinLock.h: (TCMalloc_SpinLock::Lock): (TCMalloc_SpinLock::Unlock): (TCMalloc_SlowLock):
• kxmlcore/TCSystemAlloc.cpp: (TCMalloc_SystemAlloc):
• os-win32/stdint.h:

JavaScriptGlue:

Not reviewed, but I noticed these trivial extra changes were needed to avoid
breaking the build with my reviewed patch for:

​http://bugzilla.opendarwin.org/show_bug.cgi?id=7387

Add config.h, includes of it, and Platform.h forwarding header.

• JSBase.cpp:
• JSObject.cpp:
• JSRun.cpp:
• JSUtils.cpp:
• JSValueWrapper.cpp:
• JavaScriptGlue.cpp:
• UserObjectImp.cpp:
• config.h: Added.
• kxmlcore/Platform.h: Added.

WebCore:

Reviewed by Darin.

• WebCore updates for "Set up new prototype macros and avoid using #if without defined() in JSC" ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7387

Add Platform.h

• ForwardingHeaders/kxmlcore/Platform.h: Added.
• bridge/mac/WebCoreFrameNamespaces.m:
• bridge/mac/WebCoreViewFactory.m:
• bridge/mac/WebDashboardRegion.m:
• config.h:
• platform/Logging.cpp:
• platform/mac/ScrollViewMac.mm: (WebCore::ScrollView::addChild):
• platform/mac/WebCoreCookieAdapter.m:
• platform/mac/WebCoreGraphicsBridge.m:
• platform/mac/WebCoreHistory.m:
• platform/mac/WebCoreImageRendererFactory.m:
• platform/mac/WebCoreKeyGenerator.m:
• platform/mac/WebCoreView.m:

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (11 diffs)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -23 +23 @@
 #include "date_object.h"
 
-#if HAVE_ERRNO_H
+#if HAVE(ERRNO_H)
 #include <errno.h>
 #endif
 
-#if HAVE_SYS_PARAM_H
+#if HAVE(SYS_PARAM_H)
 #include <sys/param.h>
 #endif
 
-#if HAVE_SYS_TIME_H
+#if HAVE(SYS_TIME_H)
 #include <sys/time.h>
 #endif
 
-#if HAVE_SYS_TIMEB_H
+#if HAVE(SYS_TIMEB_H)
 #include <sys/timeb.h>
 #endif
@@ -52 +52 @@
 #include "operations.h"
 
-#if __APPLE__
+#if PLATFORM(MAC)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
-#if WIN32
+#if PLATFORM(WIN_OS)
 #define copysign(x, y) _copysign(x, y)
 #define isfinite(x) _finite(x)
@@ -65 +65 @@
 inline int gmtoffset(const tm& t)
 {
-#if WIN32
+#if PLATFORM(WIN_OS)
     // Time is supposed to be in the current timezone.
     // FIXME: Use undocumented _dstbias?
@@ -142 +142 @@
 static void millisecondsToTM(double milli, bool utc, tm *t);
 
-#if __APPLE__
+#if PLATFORM(MAC)
 
 static CFDateFormatterStyle styleFromArgString(const UString& string, CFDateFormatterStyle defaultStyle)
@@ -207 +207 @@
 }
 
-#endif // __APPLE__
+#endif // PLATFORM(MAC)
 
 static UString formatDate(const tm &t)
@@ -231 +231 @@
     char buffer[100];
     if (utc) {
-#if !WIN32
+        // FIXME: why not on windows?
+#if !PLATFORM(WIN_OS)
         ASSERT(t.tm_gmtoff == 0);
 #endif
@@ -554 +555 @@
   JSValue *result = 0;
   UString s;
-#if !__APPLE__
+#if !PLATFORM(DARWIN)
   const int bufsize=100;
   char timebuffer[bufsize];
@@ -610 +611 @@
     return jsString(formatDateUTCVariant(t) + " " + formatTime(t, utc));
     break;
-#if __APPLE__
+#if PLATFORM(MAC)
   case ToLocaleString:
     return jsString(formatLocaleDate(exec, secs, true, true, args));
@@ -735 +736 @@
 
   if (numArgs == 0) { // new Date() ECMA 15.9.3.3
-#if !WIN32
+#if PLATFORM(WIN_OS)
+#if COMPILER(BORLAND)
+    struct timeb timebuffer;
+    ftime(&timebuffer);
+#else
+    struct _timeb timebuffer;
+    _ftime(&timebuffer);
+#endif
+    double utc = timebuffer.time * msPerSecond + timebuffer.millitm;
+#else
     struct timeval tv;
     gettimeofday(&tv, 0);
     double utc = floor(tv.tv_sec * msPerSecond + tv.tv_usec / 1000);
-#else
-#  if __BORLANDC__
-    struct timeb timebuffer;
-    ftime(&timebuffer);
-#  else
-    struct _timeb timebuffer;
-    _ftime(&timebuffer);
-#  endif
-    double utc = timebuffer.time * msPerSecond + timebuffer.millitm;
 #endif
     value = utc;
@@ -855 +856 @@
 // obsolete time zones not listed here equivalent to "-0000".
 static const struct KnownZone {
-#if !WIN32
+#if !PLATFORM(WIN_OS)
     const
 #endif
@@ -878 +879 @@
     if (utc) {
         time_t zero = 0;
-#if !WIN32
+#if PLATFORM(WIN_OS)
+        // FIXME: not thread safe
+        (void)localtime(&zero);
+#if COMPILER(BORLAND) || COMPILER(CYGWIN)
+        utcOffset = - _timezone;
+#else
+        utcOffset = - timezone;
+#endif
+        t->tm_isdst = 0;
+#else
         tm t3;
         localtime_r(&zero, &t3);
         utcOffset = t3.tm_gmtoff;
         t->tm_isdst = t3.tm_isdst;
-#else
-        // FIXME: not thread safe
-        (void)localtime(&zero);
-#  if __BORLANDC__ || __CYGWIN__
-        utcOffset = - _timezone;
-#  else
-        utcOffset = - timezone;
-#  endif
-        t->tm_isdst = 0;
 #endif
     } else {