JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / runtime / Identifier.h

diff --git a/runtime/Identifier.h b/runtime/Identifier.h
index 14960876b6f58d867b9a5e38275ced06c2ace6e5..50a253fd36e6423fa0f9b2499f52638b06fb9942 100644 (file)
--- a/runtime/Identifier.h
+++ b/runtime/Identifier.h
@@ -1,5 +1,5 @@
 /*
 /*

- *  Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ *  Copyright (C) 2003, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.

  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public


@@ -21,11 +21,11 @@
 #ifndef Identifier_h
 #define Identifier_h
 
 #ifndef Identifier_h
 #define Identifier_h
 

-#include "JSGlobalData.h"
+#include "VM.h"

 #include <wtf/ThreadSpecific.h>
 #include <wtf/ThreadSpecific.h>

-#include "UString.h"

 #include <wtf/WTFThreadData.h>
 #include <wtf/text/CString.h>
 #include <wtf/WTFThreadData.h>
 #include <wtf/text/CString.h>

+#include <wtf/text/WTFString.h>

 
 namespace JSC {
 
 
 namespace JSC {
 


@@ -35,37 +35,46 @@ namespace JSC {
         friend class Structure;
     public:
         Identifier() { }
         friend class Structure;
     public:
         Identifier() { }

+        enum EmptyIdentifierFlag { EmptyIdentifier };
+        Identifier(EmptyIdentifierFlag) : m_string(StringImpl::empty()) { ASSERT(m_string.impl()->isAtomic()); }

 
 

-        Identifier(ExecState* exec, const char* s) : m_string(add(exec, s)) { } // Only to be used with string literals.
-        Identifier(ExecState* exec, StringImpl* rep) : m_string(add(exec, rep)) { } 
-        Identifier(ExecState* exec, const UString& s) : m_string(add(exec, s.impl())) { }
+        // Only to be used with string literals.
+        template<unsigned charactersCount>
+        Identifier(ExecState* exec, const char (&characters)[charactersCount]) : m_string(add(exec, characters)) { ASSERT(m_string.impl()->isAtomic()); }
+        template<unsigned charactersCount>
+        Identifier(VM* vm, const char (&characters)[charactersCount]) : m_string(add(vm, characters)) { ASSERT(m_string.impl()->isAtomic()); }

 
 

-        Identifier(JSGlobalData* globalData, const char* s) : m_string(add(globalData, s)) { } // Only to be used with string literals.
-        Identifier(JSGlobalData* globalData, const LChar* s, int length) : m_string(add(globalData, s, length)) { }
-        Identifier(JSGlobalData* globalData, const UChar* s, int length) : m_string(add(globalData, s, length)) { }
-        Identifier(JSGlobalData* globalData, StringImpl* rep) : m_string(add(globalData, rep)) { } 
-        Identifier(JSGlobalData* globalData, const UString& s) : m_string(add(globalData, s.impl())) { }
+        Identifier(ExecState* exec, StringImpl* rep) : m_string(add(exec, rep)) { ASSERT(m_string.impl()->isAtomic()); }
+        Identifier(ExecState* exec, const String& s) : m_string(add(exec, s.impl())) { ASSERT(m_string.impl()->isAtomic()); }

 
 

-        const UString& ustring() const { return m_string; }
+        Identifier(VM* vm, const LChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtomic()); }
+        Identifier(VM* vm, const UChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtomic()); }
+        Identifier(VM* vm, StringImpl* rep) : m_string(add(vm, rep)) { ASSERT(m_string.impl()->isAtomic()); }
+        Identifier(VM* vm, const String& s) : m_string(add(vm, s.impl())) { ASSERT(m_string.impl()->isAtomic()); }
+
+        const String& string() const { return m_string; }

         StringImpl* impl() const { return m_string.impl(); }
         
         StringImpl* impl() const { return m_string.impl(); }
         

-        const UChar* characters() const { return m_string.characters(); }

         int length() const { return m_string.length(); }
         
         CString ascii() const { return m_string.ascii(); }
         int length() const { return m_string.length(); }
         
         CString ascii() const { return m_string.ascii(); }

+        CString utf8() const { return m_string.utf8(); }
+        
+        static Identifier from(const PrivateName& name)
+        {
+            Identifier result;
+            result.m_string = name.uid();
+            return result;
+        }

 
 

-        static Identifier createLCharFromUChar(JSGlobalData* globalData, const UChar* s, int length) { return Identifier(globalData, add8(globalData, s, length)); }
+        static Identifier createLCharFromUChar(VM* vm, const UChar* s, int length) { return Identifier(vm, add8(vm, s, length)); }

 
         JS_EXPORT_PRIVATE static Identifier from(ExecState* exec, unsigned y);
         JS_EXPORT_PRIVATE static Identifier from(ExecState* exec, int y);
         static Identifier from(ExecState* exec, double y);
 
         JS_EXPORT_PRIVATE static Identifier from(ExecState* exec, unsigned y);
         JS_EXPORT_PRIVATE static Identifier from(ExecState* exec, int y);
         static Identifier from(ExecState* exec, double y);

-        static Identifier from(JSGlobalData*, unsigned y);
-        static Identifier from(JSGlobalData*, int y);
-        static Identifier from(JSGlobalData*, double y);
-
-        JS_EXPORT_PRIVATE static uint32_t toUInt32(const UString&, bool& ok);
-        uint32_t toUInt32(bool& ok) const { return toUInt32(m_string, ok); }
-        unsigned toArrayIndex(bool& ok) const;
+        static Identifier from(VM*, unsigned y);
+        static Identifier from(VM*, int y);
+        static Identifier from(VM*, double y);

 
         bool isNull() const { return m_string.isNull(); }
         bool isEmpty() const { return m_string.isEmpty(); }
 
         bool isNull() const { return m_string.isNull(); }
         bool isEmpty() const { return m_string.isEmpty(); }


@@ -84,11 +93,12 @@ namespace JSC {
         static bool equal(const StringImpl*, const UChar*, unsigned length);
         static bool equal(const StringImpl* a, const StringImpl* b) { return ::equal(a, b); }
 
         static bool equal(const StringImpl*, const UChar*, unsigned length);
         static bool equal(const StringImpl* a, const StringImpl* b) { return ::equal(a, b); }
 

-        JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> add(ExecState*, const char*); // Only to be used with string literals.
-        static PassRefPtr<StringImpl> add(JSGlobalData*, const char*); // Only to be used with string literals.
+        // Only to be used with string literals.
+        JS_EXPORT_PRIVATE static PassRef<StringImpl> add(VM*, const char*);
+        JS_EXPORT_PRIVATE static PassRef<StringImpl> add(ExecState*, const char*);

 
     private:
 
     private:

-        UString m_string;
+        String m_string;

 
         template <typename CharType>
         ALWAYS_INLINE static uint32_t toUInt32FromCharacters(const CharType* characters, unsigned length, bool& ok);
 
         template <typename CharType>
         ALWAYS_INLINE static uint32_t toUInt32FromCharacters(const CharType* characters, unsigned length, bool& ok);


@@ -96,34 +106,15 @@ namespace JSC {
         static bool equal(const Identifier& a, const Identifier& b) { return a.m_string.impl() == b.m_string.impl(); }
         static bool equal(const Identifier& a, const LChar* b) { return equal(a.m_string.impl(), b); }
 
         static bool equal(const Identifier& a, const Identifier& b) { return a.m_string.impl() == b.m_string.impl(); }
         static bool equal(const Identifier& a, const LChar* b) { return equal(a.m_string.impl(), b); }
 

-        template <typename T> static PassRefPtr<StringImpl> add(JSGlobalData*, const T*, int length);
-        static PassRefPtr<StringImpl> add8(JSGlobalData*, const UChar*, int length);
+        template <typename T> static PassRef<StringImpl> add(VM*, const T*, int length);
+        static PassRef<StringImpl> add8(VM*, const UChar*, int length);

         template <typename T> ALWAYS_INLINE static bool canUseSingleCharacterString(T);
 
         template <typename T> ALWAYS_INLINE static bool canUseSingleCharacterString(T);
 

-        static PassRefPtr<StringImpl> add(ExecState* exec, StringImpl* r)
-        {
-#ifndef NDEBUG
-            checkCurrentIdentifierTable(exec);
-#endif
-            if (r->isIdentifier())
-                return r;
-            return addSlowCase(exec, r);
-        }
-        static PassRefPtr<StringImpl> add(JSGlobalData* globalData, StringImpl* r)
-        {
-#ifndef NDEBUG
-            checkCurrentIdentifierTable(globalData);
-#endif
-            if (r->isIdentifier())
-                return r;
-            return addSlowCase(globalData, r);
-        }
-
-        JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> addSlowCase(ExecState*, StringImpl* r);
-        JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> addSlowCase(JSGlobalData*, StringImpl* r);
+        static PassRef<StringImpl> add(ExecState*, StringImpl*);
+        static PassRef<StringImpl> add(VM*, StringImpl*);

 
 

-        JS_EXPORT_PRIVATE static void checkCurrentIdentifierTable(ExecState*);
-        JS_EXPORT_PRIVATE static void checkCurrentIdentifierTable(JSGlobalData*);
+        JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(ExecState*);
+        JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(VM*);

     };
 
     template <> ALWAYS_INLINE bool Identifier::canUseSingleCharacterString(LChar)
     };
 
     template <> ALWAYS_INLINE bool Identifier::canUseSingleCharacterString(LChar)


@@ -138,51 +129,17 @@ namespace JSC {
     }
 
     template <typename T>
     }
 
     template <typename T>

-    struct CharBuffer {
-        const T* s;
-        unsigned int length;
-    };
-    
-    template <typename T>
-    struct IdentifierCharBufferTranslator {
-        static unsigned hash(const CharBuffer<T>& buf)
-        {
-            return StringHasher::computeHash<T>(buf.s, buf.length);
-        }
-        
-        static bool equal(StringImpl* str, const CharBuffer<T>& buf)
-        {
-            return Identifier::equal(str, buf.s, buf.length);
-        }
-
-        static void translate(StringImpl*& location, const CharBuffer<T>& buf, unsigned hash)
-        {
-            T* d;
-            StringImpl* r = StringImpl::createUninitialized(buf.length, d).leakRef();
-            for (unsigned i = 0; i != buf.length; i++)
-                d[i] = buf.s[i];
-            r->setHash(hash);
-            location = r; 
-        }
-    };
-
-    template <typename T>
-    PassRefPtr<StringImpl> Identifier::add(JSGlobalData* globalData, const T* s, int length)
+    PassRef<StringImpl> Identifier::add(VM* vm, const T* s, int length)

     {
         if (length == 1) {
             T c = s[0];
             if (canUseSingleCharacterString(c))
     {
         if (length == 1) {
             T c = s[0];
             if (canUseSingleCharacterString(c))

-                return add(globalData, globalData->smallStrings.singleCharacterStringRep(c));
+                return *vm->smallStrings.singleCharacterStringRep(c);

         }
         }

-        

         if (!length)
         if (!length)

-            return StringImpl::empty();
-        CharBuffer<T> buf = {s, length}; 
-        HashSet<StringImpl*>::AddResult addResult = globalData->identifierTable->add<CharBuffer<T>, IdentifierCharBufferTranslator<T> >(buf);
+            return *StringImpl::empty();

         
         

-        // If the string is newly-translated, then we need to adopt it.
-        // The boolean in the pair tells us if that is so.
-        return addResult.isNewEntry ? adoptRef(*addResult.iterator) : *addResult.iterator;
+        return *AtomicString::add(s, length);

     }
 
     inline bool operator==(const Identifier& a, const Identifier& b)
     }
 
     inline bool operator==(const Identifier& a, const Identifier& b)


@@ -230,10 +187,7 @@ namespace JSC {
         return WTF::equal(r, s, length);
     }
     
         return WTF::equal(r, s, length);
     }
     

-    IdentifierTable* createIdentifierTable();
-    void deleteIdentifierTable(IdentifierTable*);
-
-    struct IdentifierRepHash : PtrHash<RefPtr<StringImpl> > {
+    struct IdentifierRepHash : PtrHash<RefPtr<StringImpl>> {

         static unsigned hash(const RefPtr<StringImpl>& key) { return key->existingHash(); }
         static unsigned hash(StringImpl* key) { return key->existingHash(); }
     };
         static unsigned hash(const RefPtr<StringImpl>& key) { return key->existingHash(); }
         static unsigned hash(StringImpl* key) { return key->existingHash(); }
     };


@@ -243,16 +197,15 @@ namespace JSC {
         static const bool emptyValueIsZero = false;
     };
 
         static const bool emptyValueIsZero = false;
     };
 

-    typedef HashMap<RefPtr<StringImpl>, int, IdentifierRepHash, HashTraits<RefPtr<StringImpl> >, IdentifierMapIndexHashTraits> IdentifierMap;
-
-    template<typename U, typename V>
-    HashSet<StringImpl*>::AddResult IdentifierTable::add(U value)
-    {
-        HashSet<StringImpl*>::AddResult result = m_table.add<U, V>(value);
-        (*result.iterator)->setIsIdentifier(true);
-        return result;
-    }
+    typedef HashMap<RefPtr<StringImpl>, int, IdentifierRepHash, HashTraits<RefPtr<StringImpl>>, IdentifierMapIndexHashTraits> IdentifierMap;
+    typedef HashMap<StringImpl*, int, IdentifierRepHash, HashTraits<StringImpl*>, IdentifierMapIndexHashTraits> BorrowedIdentifierMap;

 
 } // namespace JSC
 
 
 } // namespace JSC
 

+namespace WTF {
+
+template <> struct VectorTraits<JSC::Identifier> : SimpleClassVectorTraits { };
+
+} // namespace WTF
+

 #endif // Identifier_h
 #endif // Identifier_h