source: webkit/trunk/JavaScriptCore/runtime/UStringImpl.cpp@ 54571

Last change on this file since 54571 was 54464, checked in by [email protected], 15 years ago

Change UStringImpl::create to CRASH if the string cannot be allocated,
rather than returning a null string (which will behave like a zero-length
string if used).

Reviewed by Geoff Garen.

Also move createRep function from UString to become new overloaded
UStringImpl::create methods. In doing so, bring their behaviour closer to
being in line with WebCore::StringImpl, in removing the behaviour that they
can be used to produce null UStrings (ASSERT the char* provided is non-null).
This behaviour of converting null C-strings to null UStrings is inefficient
(cmompared to just using UString::null()), incompatible with WebCore::StringImpl's
behaviour, and may generate unexpected behaviour, since in many cases a null
UString can be used like an empty string.

With these changes UStringImpl need not have a concept of null impls, we can
start transitioning this to become an implementation detail of UString, that
internally it chooses to use a null-object rather than an actually zero impl
pointer.

(JSC::Debugger::recompileAllJSFunctions):

  • debugger/DebuggerCallFrame.cpp:

(JSC::DebuggerCallFrame::calculatedFunctionName):

  • parser/Parser.cpp:

(JSC::Parser::parse):

  • profiler/Profile.cpp:

(JSC::Profile::Profile):

  • profiler/ProfileGenerator.cpp:

(JSC::ProfileGenerator::stopProfiling):

  • runtime/Error.cpp:

(JSC::Error::create):
(JSC::throwError):

  • runtime/ExceptionHelpers.cpp:

(JSC::createError):

  • runtime/Identifier.cpp:

(JSC::Identifier::add):

  • runtime/PropertyNameArray.cpp:

(JSC::PropertyNameArray::add):

  • runtime/UString.cpp:

(JSC::initializeUString):
(JSC::UString::UString):
(JSC::UString::operator=):

  • runtime/UString.h:

(JSC::UString::isNull):
(JSC::UString::null):
(JSC::UString::rep):
(JSC::UString::UString):

  • runtime/UStringImpl.cpp:

(JSC::UStringImpl::create):

  • runtime/UStringImpl.h:
File size: 3.7 KB
Line 
1/*
2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include "config.h"
27#include "UStringImpl.h"
28
29#include "Identifier.h"
30#include "UString.h"
31#include <wtf/unicode/UTF8.h>
32
33using namespace WTF::Unicode;
34using namespace std;
35
36namespace JSC {
37
38PassRefPtr<UStringImpl> UStringImpl::create(const char* c)
39{
40 ASSERT(c);
41
42 if (!c[0])
43 return &UStringImpl::empty();
44
45 size_t length = strlen(c);
46 UChar* d;
47 PassRefPtr<UStringImpl> result = UStringImpl::createUninitialized(length, d);
48 for (size_t i = 0; i < length; i++)
49 d[i] = static_cast<unsigned char>(c[i]); // use unsigned char to zero-extend instead of sign-extend
50 return result;
51}
52
53PassRefPtr<UStringImpl> UStringImpl::create(const char* c, int length)
54{
55 ASSERT(c);
56
57 if (!length)
58 return &UStringImpl::empty();
59
60 UChar* d;
61 PassRefPtr<UStringImpl> result = UStringImpl::createUninitialized(length, d);
62 for (int i = 0; i < length; i++)
63 d[i] = static_cast<unsigned char>(c[i]); // use unsigned char to zero-extend instead of sign-extend
64 return result;
65}
66
67PassRefPtr<UStringImpl> UStringImpl::create(const UChar* buffer, int length)
68{
69 UChar* newBuffer;
70 PassRefPtr<UStringImpl> impl = createUninitialized(length, newBuffer);
71 copyChars(newBuffer, buffer, length);
72 return impl;
73}
74
75SharedUChar* UStringImpl::baseSharedBuffer()
76{
77 ASSERT((bufferOwnership() == BufferShared)
78 || ((bufferOwnership() == BufferOwned) && !m_dataBuffer.asPtr<void*>()));
79
80 if (bufferOwnership() != BufferShared)
81 m_dataBuffer = UntypedPtrAndBitfield(SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef(), BufferShared);
82
83 return m_dataBuffer.asPtr<SharedUChar*>();
84}
85
86SharedUChar* UStringImpl::sharedBuffer()
87{
88 if (m_length < s_minLengthToShare)
89 return 0;
90 ASSERT(!isStatic());
91
92 UStringImpl* owner = bufferOwnerString();
93 if (owner->bufferOwnership() == BufferInternal)
94 return 0;
95
96 return owner->baseSharedBuffer();
97}
98
99UStringImpl::~UStringImpl()
100{
101 ASSERT(!isStatic());
102 checkConsistency();
103
104 if (isIdentifier())
105 Identifier::remove(this);
106
107 if (bufferOwnership() != BufferInternal) {
108 if (bufferOwnership() == BufferOwned)
109 fastFree(m_data);
110 else if (bufferOwnership() == BufferSubstring)
111 m_dataBuffer.asPtr<UStringImpl*>()->deref();
112 else {
113 ASSERT(bufferOwnership() == BufferShared);
114 m_dataBuffer.asPtr<SharedUChar*>()->deref();
115 }
116 }
117}
118
119}
Note: See TracBrowser for help on using the repository browser.