Changeset 10456 in webkit for trunk/JavaScriptCore/kjs/operations.cpp

Timestamp:

Sep 3, 2005, 6:18:13 PM (20 years ago)

Author:

darin

Message:

Reviewed, tweaked and landed by Darin.

• some Windows compilation fixes, hoping to fix the problems reported in these bugs: 4627, 4629, 4630, 4631, 4632, 4633, 4634, 4635, 4636, 4637, 4639, 4640, 4641, 4644, 4645

• kjs/collector.cpp: Include <windows.h> on WIN32. Put thread-related code inside KJS_MULTIPLE_THREADS #if directives. (KJS::Collector::markCurrentThreadConservatively): Use NT_TIB to find the stack base on Win32.

• kjs/config.h: Define HAVE_SYS_TIMEB_H for Win32.

• kjs/date_object.cpp: Add include of <limits.h>. Add definitions of strncasecmp, isfinite, and copysign for Win32. (KJS::KRFCDate_parseDate): Move "errno = 0" line down closer to the first call to strol -- I believe that on Win32 there's some other call before that setting errno.

• kjs/date_object.h: Remove unneeded include of <sys/time.h>.

• kjs/dtoa.cpp: Add an undef of strtod, needed on Win32.

• kjs/fast_malloc.cpp: Put #if !WIN32 around some customization that's not appropriate on Win32. (KJS::region_list_append): Add a missing cast so this Win32-specific function compiles in C++. (KJS::sbrk): Change parameter type to match the declaration.

• kjs/function.cpp: (isxdigit): Define a locale-independent isxdigit on Win32.

• kjs/function.h: Remove unneeded friend class Function for FunctionImp.

• kjs/identifier.cpp: Took out the APPLE_CHANGES from around the AVOID_STATIC_CONSTRUCTORS define. We ultimately intend to phase out APPLE_CHANGES entirely. Also fix the non-AVOID_STATIC_CONSTRUCTORS code path.

• kjs/internal.cpp: Remove uneeded include of <strings.h>, which was confused with <string.h>! Add a Win32 implementation of copysign. Put the threads code inside KJS_MULTIPLE_THREADS.

• kjs/internal.h: Define a KJS_MULTIPLE_THREADS macro on non-Win32 only. Later we can make this specific to Mac OS X if we like.

• kjs/interpreter_map.cpp: Add missing include of <stdlib.h>.

• kjs/list.cpp: (KJS::ListImp::markValues): Use std::min instead of MIN. (KJS::List::copy): Ditto. (KJS::List::copyTail): Ditto.

• kjs/math_object.cpp: (signbit): Add a Win32 implementation of signbit.

• kjs/nodes.cpp: (Node::finalCheck): Use unsigned instead of uint. Put the use of always_inline inside GNUC.

• kjs/number_object.cpp: (NumberProtoFuncImp::callAsFunction): Use "10.0" instead of "10" inside all the calls to pow to avoid ambiguity caused by overloading of pow on Win32, seen when passing an int rather than a double or float.

• kjs/operations.cpp: (KJS::isInf): Add Win32 implementation. (KJS::isPosInf): Add Win32 implementation. (KJS::isNegInf): Add Win32 implementation.

• kjs/regexp.cpp: Use unsigned instead of uint.
• kjs/regexp.h: Ditto.
• kjs/regexp_object.cpp: Ditto.
• kjs/regexp_object.h: Ditto.

File:

• trunk/JavaScriptCore/kjs/operations.cpp (modified) (13 diffs)

trunk/JavaScriptCore/kjs/operations.cpp

@@ -21 +21 @@
  */
 
-#ifdef HAVE_CONFIG_H
+#include "operations.h"
+
 #include "config.h"
-#endif
 
 #include <stdio.h>
@@ -40 +40 @@
 #endif
 
-#include "operations.h"
 #include "object.h"
 
-using namespace KJS;
+namespace KJS {
 
 #if !APPLE_CHANGES
 
-bool KJS::isNaN(double d)
+bool isNaN(double d)
 {
 #ifdef HAVE_FUNC_ISNAN
@@ -58 +57 @@
 }
 
-bool KJS::isInf(double d)
-{
-#if defined(HAVE_FUNC_ISINF)
+bool isInf(double d)
+{
+#if WIN32
+  int fpClass = _fpclass(d);
+  return _FPCLASS_PINF == fpClass || _FPCLASS_NINF == fpClass;
+#elif defined(HAVE_FUNC_ISINF)
   return isinf(d);
 #elif HAVE_FUNC_FINITE
@@ -71 +73 @@
 }
 
-bool KJS::isPosInf(double d)
-{
-#if APPLE_CHANGES
-  return isinf(d) && d > 0;
-#else
-#if defined(HAVE_FUNC_ISINF)
+bool isPosInf(double d)
+{
+#if WIN32
+  return _FPCLASS_PINF == _fpclass(d);
+#elif defined(HAVE_FUNC_ISINF)
   return (isinf(d) == 1);
 #elif HAVE_FUNC_FINITE
@@ -85 +86 @@
   return false;
 #endif
-#endif
-}
-
-bool KJS::isNegInf(double d)
-{
-#if APPLE_CHANGES
-  return isinf(d) && d < 0;
-#else
-#if defined(HAVE_FUNC_ISINF)
+}
+
+bool isNegInf(double d)
+{
+#if WIN32
+  return _FPCLASS_PINF == _fpclass(d);
+#elif defined(HAVE_FUNC_ISINF)
   return (isinf(d) == -1);
 #elif HAVE_FUNC_FINITE
@@ -102 +101 @@
   return false;
 #endif
-#endif
 }
 
@@ -108 +106 @@
 
 // ECMA 11.9.3
-bool KJS::equal(ExecState *exec, ValueImp *v1, ValueImp *v2)
+bool equal(ExecState *exec, ValueImp *v1, ValueImp *v2)
 {
     Type t1 = v1->type();
@@ -162 +160 @@
 }
 
-bool KJS::strictEqual(ExecState *exec, ValueImp *v1, ValueImp *v2)
+bool strictEqual(ExecState *exec, ValueImp *v1, ValueImp *v2)
 {
   Type t1 = v1->type();
@@ -194 +192 @@
 }
 
-int KJS::relation(ExecState *exec, ValueImp *v1, ValueImp *v2)
+int relation(ExecState *exec, ValueImp *v1, ValueImp *v2)
 {
   ValueImp *p1 = v1->toPrimitive(exec,NumberType);
@@ -211 +209 @@
 }
 
-int KJS::maxInt(int d1, int d2)
+int maxInt(int d1, int d2)
 {
   return (d1 > d2) ? d1 : d2;
 }
 
-int KJS::minInt(int d1, int d2)
+int minInt(int d1, int d2)
 {
   return (d1 < d2) ? d1 : d2;
@@ -222 +220 @@
 
 // ECMA 11.6
-ValueImp *KJS::add(ExecState *exec, ValueImp *v1, ValueImp *v2, char oper)
+ValueImp *add(ExecState *exec, ValueImp *v1, ValueImp *v2, char oper)
 {
   // exception for the Date exception in defaultValue()
@@ -247 +245 @@
 
 // ECMA 11.5
-ValueImp *KJS::mult(ExecState *exec, ValueImp *v1, ValueImp *v2, char oper)
+ValueImp *mult(ExecState *exec, ValueImp *v1, ValueImp *v2, char oper)
 {
   bool n1KnownToBeInteger;
@@ -270 +268 @@
   return jsNumber(result, resultKnownToBeInteger);
 }
+
+}