X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/b80e619319b1def83d1e8b4f84042b661be1be7f..14957cd040308e3eeec43d26bae5d76da13fcd85:/runtime/Identifier.cpp diff --git a/runtime/Identifier.cpp b/runtime/Identifier.cpp index f2642a9..b07341c 100644 --- a/runtime/Identifier.cpp +++ b/runtime/Identifier.cpp @@ -22,7 +22,9 @@ #include "Identifier.h" #include "CallFrame.h" +#include "JSObject.h" #include "NumericStrings.h" +#include "ScopeChain.h" #include // for placement new #include // for strlen #include @@ -65,7 +67,7 @@ void deleteIdentifierTable(IdentifierTable* table) delete table; } -bool Identifier::equal(const UString::Rep* r, const char* s) +bool Identifier::equal(const StringImpl* r, const char* s) { int length = r->length(); const UChar* d = r->characters(); @@ -75,33 +77,22 @@ bool Identifier::equal(const UString::Rep* r, const char* s) return s[length] == 0; } -bool Identifier::equal(const UString::Rep* r, const UChar* s, unsigned length) -{ - if (r->length() != length) - return false; - const UChar* d = r->characters(); - for (unsigned i = 0; i != length; ++i) - if (d[i] != s[i]) - return false; - return true; -} - struct IdentifierCStringTranslator { static unsigned hash(const char* c) { - return UString::Rep::computeHash(c); + return StringHasher::computeHash(c); } - static bool equal(UString::Rep* r, const char* s) + static bool equal(StringImpl* r, const char* s) { return Identifier::equal(r, s); } - static void translate(UString::Rep*& location, const char* c, unsigned hash) + static void translate(StringImpl*& location, const char* c, unsigned hash) { size_t length = strlen(c); UChar* d; - UString::Rep* r = UString::Rep::createUninitialized(length, d).releaseRef(); + StringImpl* r = StringImpl::createUninitialized(length, d).leakRef(); for (size_t i = 0; i != length; i++) d[i] = static_cast(c[i]); // use unsigned char to zero-extend instead of sign-extend r->setHash(hash); @@ -109,12 +100,12 @@ struct IdentifierCStringTranslator { } }; -PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c) +PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c) { if (!c) - return UString::null().rep(); + return 0; if (!c[0]) - return UString::Rep::empty(); + return StringImpl::empty(); if (!c[1]) return add(globalData, globalData->smallStrings.singleCharacterStringRep(static_cast(c[0]))); @@ -125,18 +116,18 @@ PassRefPtr Identifier::add(JSGlobalData* globalData, const char* c if (iter != literalIdentifierTable.end()) return iter->second; - pair::iterator, bool> addResult = identifierTable.add(c); + pair::iterator, bool> addResult = identifierTable.add(c); // If the string is newly-translated, then we need to adopt it. // The boolean in the pair tells us if that is so. - RefPtr addedString = addResult.second ? adoptRef(*addResult.first) : *addResult.first; + RefPtr addedString = addResult.second ? adoptRef(*addResult.first) : *addResult.first; literalIdentifierTable.add(c, addedString.get()); return addedString.release(); } -PassRefPtr Identifier::add(ExecState* exec, const char* c) +PassRefPtr Identifier::add(ExecState* exec, const char* c) { return add(&exec->globalData(), c); } @@ -149,18 +140,18 @@ struct UCharBuffer { struct IdentifierUCharBufferTranslator { static unsigned hash(const UCharBuffer& buf) { - return UString::Rep::computeHash(buf.s, buf.length); + return StringHasher::computeHash(buf.s, buf.length); } - static bool equal(UString::Rep* str, const UCharBuffer& buf) + static bool equal(StringImpl* str, const UCharBuffer& buf) { return Identifier::equal(str, buf.s, buf.length); } - static void translate(UString::Rep*& location, const UCharBuffer& buf, unsigned hash) + static void translate(StringImpl*& location, const UCharBuffer& buf, unsigned hash) { UChar* d; - UString::Rep* r = UString::Rep::createUninitialized(buf.length, d).releaseRef(); + StringImpl* r = StringImpl::createUninitialized(buf.length, d).leakRef(); for (unsigned i = 0; i != buf.length; i++) d[i] = buf.s[i]; r->setHash(hash); @@ -168,29 +159,72 @@ struct IdentifierUCharBufferTranslator { } }; -PassRefPtr Identifier::add(JSGlobalData* globalData, const UChar* s, int length) +uint32_t Identifier::toUInt32(const UString& string, bool& ok) +{ + ok = false; + + unsigned length = string.length(); + const UChar* characters = string.characters(); + + // An empty string is not a number. + if (!length) + return 0; + + // Get the first character, turning it into a digit. + uint32_t value = characters[0] - '0'; + if (value > 9) + return 0; + + // Check for leading zeros. If the first characher is 0, then the + // length of the string must be one - e.g. "042" is not equal to "42". + if (!value && length > 1) + return 0; + + while (--length) { + // Multiply value by 10, checking for overflow out of 32 bits. + if (value > 0xFFFFFFFFU / 10) + return 0; + value *= 10; + + // Get the next character, turning it into a digit. + uint32_t newValue = *(++characters) - '0'; + if (newValue > 9) + return 0; + + // Add in the old value, checking for overflow out of 32 bits. + newValue += value; + if (newValue < value) + return 0; + value = newValue; + } + + ok = true; + return value; +} + +PassRefPtr Identifier::add(JSGlobalData* globalData, const UChar* s, int length) { if (length == 1) { UChar c = s[0]; - if (c <= 0xFF) + if (c <= maxSingleCharacterString) return add(globalData, globalData->smallStrings.singleCharacterStringRep(c)); } if (!length) - return UString::Rep::empty(); + return StringImpl::empty(); UCharBuffer buf = {s, length}; - pair::iterator, bool> addResult = globalData->identifierTable->add(buf); + pair::iterator, bool> addResult = globalData->identifierTable->add(buf); // 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.second ? adoptRef(*addResult.first) : *addResult.first; } -PassRefPtr Identifier::add(ExecState* exec, const UChar* s, int length) +PassRefPtr Identifier::add(ExecState* exec, const UChar* s, int length) { return add(&exec->globalData(), s, length); } -PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, UString::Rep* r) +PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, StringImpl* r) { ASSERT(!r->isIdentifier()); // The empty & null strings are static singletons, and static strings are handled @@ -199,7 +233,7 @@ PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, UStri if (r->length() == 1) { UChar c = r->characters()[0]; - if (c <= 0xFF) + if (c <= maxSingleCharacterString) r = globalData->smallStrings.singleCharacterStringRep(c); if (r->isIdentifier()) return r; @@ -208,7 +242,7 @@ PassRefPtr Identifier::addSlowCase(JSGlobalData* globalData, UStri return *globalData->identifierTable->add(r).first; } -PassRefPtr Identifier::addSlowCase(ExecState* exec, UString::Rep* r) +PassRefPtr Identifier::addSlowCase(ExecState* exec, StringImpl* r) { return addSlowCase(&exec->globalData(), r); } @@ -228,6 +262,21 @@ Identifier Identifier::from(ExecState* exec, double value) return Identifier(exec, exec->globalData().numericStrings.add(value)); } +Identifier Identifier::from(JSGlobalData* globalData, unsigned value) +{ + return Identifier(globalData, globalData->numericStrings.add(value)); +} + +Identifier Identifier::from(JSGlobalData* globalData, int value) +{ + return Identifier(globalData, globalData->numericStrings.add(value)); +} + +Identifier Identifier::from(JSGlobalData* globalData, double value) +{ + return Identifier(globalData, globalData->numericStrings.add(value)); +} + #ifndef NDEBUG void Identifier::checkCurrentIdentifierTable(JSGlobalData* globalData)