Changeset 11719 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 21, 2005, 4:55:34 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Darin.

Removed evil hack for determining if a type is an integer, replaced
with template metaprogramming.

• JavaScriptCore.xcodeproj/project.pbxproj: Set tab size to 2 for testkjs.cpp
• kjs/testkjs.cpp: (main): Inserted asserts to test IsInteger. FIXME: Move these to KXMLCore unit tests directory when we create one.
• kxmlcore/HashTraits.h: (KXMLCore::): Added IsInteger class for querying types.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (1 diff)
• kjs/testkjs.cpp (modified) (3 diffs)
• kxmlcore/HashTraits.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-12-21  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Darin.
+
+        Removed evil hack for determining if a type is an integer, replaced
+        with template metaprogramming.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Set tab size to 2 for
+        testkjs.cpp
+        * kjs/testkjs.cpp:
+        (main): Inserted asserts to test IsInteger. FIXME: Move these to
+        KXMLCore unit tests directory when we create one.
+        * kxmlcore/HashTraits.h:
+        (KXMLCore::): Added IsInteger class for querying types.
+
 2005-12-20  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -278 +278 @@
 
 /* Begin PBXFileReference section */
-                45E12D8806A49B0F00E9DF84 /* testkjs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = testkjs.cpp; sourceTree = "<group>"; };
+                45E12D8806A49B0F00E9DF84 /* testkjs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = testkjs.cpp; sourceTree = "<group>"; };
                 5114F47B05E4426200D1BBBD /* runtime_root.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_root.cpp; path = bindings/runtime_root.cpp; sourceTree = "<group>"; };
                 5114F47C05E4426200D1BBBD /* runtime_root.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = runtime_root.h; path = bindings/runtime_root.h; sourceTree = "<group>"; };

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -27 +27 @@
 #include <string.h>
 
+#include "HashTraits.h"
 #include "value.h"
 #include "object.h"
@@ -35 +36 @@
 
 using namespace KJS;
+using namespace KXMLCore;
 
 class TestFunctionImp : public JSObject {
@@ -106 +108 @@
   {
     JSLock lock;
-
+    
+    // Unit tests for KXMLCore::IsInteger. Don't have a better place for them now.
+    // FIXME: move these once we create a unit test directory for KXMLCore.
+    assert(IsInteger<bool>::value);
+    assert(IsInteger<char>::value);
+    assert(IsInteger<signed char>::value);
+    assert(IsInteger<unsigned char>::value);
+    assert(IsInteger<short>::value);
+    assert(IsInteger<unsigned short>::value);
+    assert(IsInteger<int>::value);
+    assert(IsInteger<unsigned int>::value);
+    assert(IsInteger<long>::value);
+    assert(IsInteger<unsigned long>::value);
+    assert(IsInteger<long long>::value);
+    assert(IsInteger<unsigned long long>::value);
+
+    assert(!IsInteger<char *>::value);
+    assert(!IsInteger<const char *>::value);
+    assert(!IsInteger<volatile char *>::value);
+    assert(!IsInteger<double>::value);
+    assert(!IsInteger<float>::value);
+    assert(!IsInteger<GlobalImp>::value);
+    
     JSObject *global(new GlobalImp());
 

trunk/JavaScriptCore/kxmlcore/HashTraits.h

@@ -25 +25 @@
 
 #include <utility>
-#ifndef WIN32
-#include <bits/cpp_type_traits.h>
-#endif
 
 namespace KXMLCore {
 
     using std::pair;
- 
-    // FIXME: stop using this evil hack, use something supported or else specialize
-    // for all numerit cypes by hand
+    
+    template <typename T> struct IsInteger           { static const bool value = false; };
+    template <> struct IsInteger<bool>               { static const bool value = true; };
+    template <> struct IsInteger<char>               { static const bool value = true; };
+    template <> struct IsInteger<signed char>        { static const bool value = true; };
+    template <> struct IsInteger<unsigned char>      { static const bool value = true; };
+    template <> struct IsInteger<short>              { static const bool value = true; };
+    template <> struct IsInteger<unsigned short>     { static const bool value = true; };
+    template <> struct IsInteger<int>                { static const bool value = true; };
+    template <> struct IsInteger<unsigned int>       { static const bool value = true; };
+    template <> struct IsInteger<long>               { static const bool value = true; };
+    template <> struct IsInteger<unsigned long>      { static const bool value = true; };
+    template <> struct IsInteger<long long>          { static const bool value = true; };
+    template <> struct IsInteger<unsigned long long> { static const bool value = true; };
+        
     template<typename T>
     struct HashTraits {
         typedef T traitType;
-#ifdef __GLIBCXX__ // gcc 3.4 and greater:
-        static const bool emptyValueIsZero = std::__is_integer<T>::__value;
-#else
-        static const bool emptyValueIsZero = std::__is_integer<T>::_M_type;
-#endif
+        static const bool emptyValueIsZero = IsInteger<T>::value;
         
         static traitType emptyValue() {