Changeset 10457 in webkit

Timestamp:

Sep 3, 2005, 11:21:54 PM (20 years ago)

Author:

darin

Message:

Reviewed, tweaked and landed by Darin.

• another try at some of the Windows compilation fixes should fix these bugs: 4546, 4831, 4834, 4643, 4830, 4832, 4833, 4835

• kjs/collector.cpp: Add missing <setjmp.h> include.
• kjs/date_object.cpp: Fix broken copysign macro.
• kjs/dtoa.cpp: Move macro definitions down after all header includes.
• kjs/fast_malloc.cpp: Add missing <assert.h> and <stddef.h> includes.
• kjs/function.cpp: Remove broken isxdigit definition.
• kjs/grammar.y: Add a missing semicolon (and remove an excess one).
• kjs/identifier.cpp: Turn off AVOID_STATIC_CONSTRUCTORS because the placement new syntax doesn't seem to work in Visual C++ (I'm surprised to hear that, by the way).
• kjs/value.h: Made ValueImp's destructor virtual because otherwise pointers to ValueImp on the stack aren't right for garbage collection on Windows (don't think it works that way with gcc's virtual table scheme, but it's a harmless change).

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (1 diff)
• kjs/date_object.cpp (modified) (1 diff)
• kjs/dtoa.cpp (modified) (2 diffs)
• kjs/fast_malloc.cpp (modified) (1 diff)
• kjs/function.cpp (modified) (1 diff)
• kjs/grammar.y (modified) (2 diffs)
• kjs/identifier.cpp (modified) (1 diff)
• kjs/value.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-09-03  Krzysztof Kowalczyk  <[email protected]>
+
+        Reviewed, tweaked and landed by Darin.
+
+        - another try at some of the Windows compilation fixes
+          should fix these bugs: 4546, 4831, 4834, 4643, 4830, 4832, 4833, 4835
+
+        * kjs/collector.cpp: Add missing <setjmp.h> include.
+        * kjs/date_object.cpp: Fix broken copysign macro.
+        * kjs/dtoa.cpp: Move macro definitions down after all header includes.
+        * kjs/fast_malloc.cpp: Add missing <assert.h> and <stddef.h> includes.
+        * kjs/function.cpp: Remove broken isxdigit definition.
+        * kjs/grammar.y: Add a missing semicolon (and remove an excess one).
+        * kjs/identifier.cpp: Turn off AVOID_STATIC_CONSTRUCTORS because the placement new syntax
+        doesn't seem to work in Visual C++ (I'm surprised to hear that, by the way).
+        * kjs/value.h: Made ValueImp's destructor virtual because otherwise pointers to ValueImp
+        on the stack aren't right for garbage collection on Windows (don't think it works that
+        way with gcc's virtual table scheme, but it's a harmless change).
+
 2005-09-03  Krzysztof Kowalczyk  <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -27 +27 @@
 #include "value.h"
 
+#include <setjmp.h>
 #include <algorithm>
 

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -62 +62 @@
 #include <float.h>
 #define isfinite(x) _finite(x)
-#define copysign(x) _copysign(x)
+#define copysign(x, y) _copysign(x, y)
 #endif
 

trunk/JavaScriptCore/kjs/dtoa.cpp

@@ -178 +178 @@
 #define INFNAN_CHECK
 #include "dtoa.h"
-#undef strtod /* do not remove: needed for WIN32 */
-#define strtod kjs_strtod
-#define dtoa kjs_dtoa
-#define freedtoa kjs_freedtoa
 
 
@@ -269 +265 @@
 #include "math.h"
 #endif
+
+#define strtod kjs_strtod
+#define dtoa kjs_dtoa
+#define freedtoa kjs_freedtoa
 
 #ifdef __cplusplus

trunk/JavaScriptCore/kjs/fast_malloc.cpp

@@ -226 +226 @@
 
 #include "fast_malloc.h"
+
+#include <assert.h>
+#include <stddef.h>
 
 #define MALLOC_FAILURE_ACTION abort()

trunk/JavaScriptCore/kjs/function.cpp

@@ -42 +42 @@
 
 #include <unicode/uchar.h>
-
-#if WIN32
-// Define a locale-independent isxdigit.
-#undef isxdigit
-inline bool isxdigit(int c) { return _isctype(c, _HEX); }
-#endif
 
 using namespace KXMLCore;

trunk/JavaScriptCore/kjs/grammar.y

@@ -166 +166 @@
 %type <pnode> PropertyName
 
-%type <ident> ParenthesizedIdent;
+%type <ident> ParenthesizedIdent
 %type <np>    MemberBracketExpr CallBracketExpr ParenthesizedBracketExpr
 %type <ni>    MemberDotExpr CallDotExpr ParenthesizedDotExpr
@@ -189 +189 @@
 ParenthesizedIdent:
     IDENT
-  | '(' ParenthesizedIdent ')' { $$ = $2 }
+  | '(' ParenthesizedIdent ')' { $$ = $2; }
 ;
 

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -26 +26 @@
 // runs at init time.
 
+#if !WIN32 // Visual C++ can't handle placement new, it seems.
 #define AVOID_STATIC_CONSTRUCTORS 1
+#endif
 
 #if AVOID_STATIC_CONSTRUCTORS

trunk/JavaScriptCore/kjs/value.h

@@ -72 +72 @@
 private:
     ValueImp();
-    ~ValueImp();
+    virtual ~ValueImp();
 
 public: