From 32761a6cee1d0dee366b885b7b9c777e67885688 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Sun, 10 Apr 2016 09:28:39 +0000 Subject: webkitgtk-2.4.11 --- Source/JavaScriptCore/parser/SourceCode.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'Source/JavaScriptCore/parser/SourceCode.h') diff --git a/Source/JavaScriptCore/parser/SourceCode.h b/Source/JavaScriptCore/parser/SourceCode.h index 73d6b54a7..cf1a4a3d9 100644 --- a/Source/JavaScriptCore/parser/SourceCode.h +++ b/Source/JavaScriptCore/parser/SourceCode.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -79,16 +79,10 @@ namespace JSC { bool isHashTableDeletedValue() const { return m_provider.isHashTableDeletedValue(); } - unsigned hash() const - { - ASSERT(m_provider); - return m_provider->hash(); - } - - StringView view() const + String toString() const { if (!m_provider) - return StringView(); + return String(); return m_provider->getRange(m_startChar, m_endChar); } @@ -123,9 +117,11 @@ namespace JSC { { return SourceCode(StringSourceProvider::create(source, url, startPosition), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt()); } - + inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn) { + ASSERT(provider()->source()[openBrace] == '{'); + ASSERT(provider()->source()[closeBrace] == '}'); startColumn += 1; // Convert to base 1. return SourceCode(provider(), openBrace, closeBrace + 1, firstLine, startColumn); } -- cgit v1.2.1