/*
* Copyright (C) 1999-2002 Harri Porten (porten@kde.org)
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
* Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
* Copyright (C) 2007 Maks Orlovich
*
#include "JSGlobalObjectFunctions.h"
#include "CallFrame.h"
-#include "GlobalEvalFunction.h"
#include "Interpreter.h"
#include "JSGlobalObject.h"
#include "JSString.h"
#include "LiteralParser.h"
#include "Nodes.h"
#include "Parser.h"
-#include "StringBuilder.h"
-#include "StringExtras.h"
-#include "dtoa.h"
+#include "UStringBuilder.h"
+#include <wtf/dtoa.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <wtf/ASCIICType.h>
#include <wtf/Assertions.h>
#include <wtf/MathExtras.h>
+#include <wtf/StringExtras.h>
#include <wtf/unicode/UTF8.h>
using namespace WTF;
namespace JSC {
-static JSValue encode(ExecState* exec, const ArgList& args, const char* doNotEscape)
+static JSValue encode(ExecState* exec, const char* doNotEscape)
{
- UString str = args.at(0).toString(exec);
- CString cstr = str.UTF8String(true);
+ CString cstr = exec->argument(0).toString(exec)->value(exec).utf8(true);
if (!cstr.data())
- return throwError(exec, URIError, "String contained an illegal UTF-16 sequence.");
+ return throwError(exec, createURIError(exec, "String contained an illegal UTF-16 sequence."));
JSStringBuilder builder;
const char* p = cstr.data();
return builder.build(exec);
}
-static JSValue decode(ExecState* exec, const ArgList& args, const char* doNotUnescape, bool strict)
+template <typename CharType>
+ALWAYS_INLINE
+static JSValue decode(ExecState* exec, const CharType* characters, int length, const char* doNotUnescape, bool strict)
{
JSStringBuilder builder;
- UString str = args.at(0).toString(exec);
int k = 0;
- int len = str.size();
- const UChar* d = str.data();
UChar u = 0;
- while (k < len) {
- const UChar* p = d + k;
- UChar c = *p;
+ while (k < length) {
+ const CharType* p = characters + k;
+ CharType c = *p;
if (c == '%') {
int charLen = 0;
- if (k <= len - 3 && isASCIIHexDigit(p[1]) && isASCIIHexDigit(p[2])) {
- const char b0 = Lexer::convertHex(p[1], p[2]);
+ if (k <= length - 3 && isASCIIHexDigit(p[1]) && isASCIIHexDigit(p[2])) {
+ const char b0 = Lexer<CharType>::convertHex(p[1], p[2]);
const int sequenceLen = UTF8SequenceLength(b0);
- if (sequenceLen != 0 && k <= len - sequenceLen * 3) {
+ if (sequenceLen && k <= length - sequenceLen * 3) {
charLen = sequenceLen * 3;
char sequence[5];
sequence[0] = b0;
for (int i = 1; i < sequenceLen; ++i) {
- const UChar* q = p + i * 3;
+ const CharType* q = p + i * 3;
if (q[0] == '%' && isASCIIHexDigit(q[1]) && isASCIIHexDigit(q[2]))
- sequence[i] = Lexer::convertHex(q[1], q[2]);
+ sequence[i] = Lexer<CharType>::convertHex(q[1], q[2]);
else {
charLen = 0;
break;
}
if (charLen == 0) {
if (strict)
- return throwError(exec, URIError);
+ return throwError(exec, createURIError(exec, "URI error"));
// The only case where we don't use "strict" mode is the "unescape" function.
// For that, it's good to support the wonky "%u" syntax for compatibility with WinIE.
- if (k <= len - 6 && p[1] == 'u'
+ if (k <= length - 6 && p[1] == 'u'
&& isASCIIHexDigit(p[2]) && isASCIIHexDigit(p[3])
&& isASCIIHexDigit(p[4]) && isASCIIHexDigit(p[5])) {
charLen = 6;
- u = Lexer::convertUnicode(p[2], p[3], p[4], p[5]);
+ u = Lexer<UChar>::convertUnicode(p[2], p[3], p[4], p[5]);
}
}
if (charLen && (u == 0 || u >= 128 || !strchr(doNotUnescape, u))) {
- c = u;
- k += charLen - 1;
+ if (u < 256)
+ builder.append(static_cast<LChar>(u));
+ else
+ builder.append(u);
+ k += charLen;
+ continue;
}
}
k++;
return builder.build(exec);
}
+static JSValue decode(ExecState* exec, const char* doNotUnescape, bool strict)
+{
+ JSStringBuilder builder;
+ UString str = exec->argument(0).toString(exec)->value(exec);
+
+ if (str.is8Bit())
+ return decode(exec, str.characters8(), str.length(), doNotUnescape, strict);
+ return decode(exec, str.characters16(), str.length(), doNotUnescape, strict);
+}
+
bool isStrWhiteSpace(UChar c)
{
switch (c) {
+ // ECMA-262-5th 7.2 & 7.3
case 0x0009:
case 0x000A:
case 0x000B:
case 0x00A0:
case 0x2028:
case 0x2029:
+ case 0xFEFF:
return true;
default:
return c > 0xff && isSeparatorSpace(c);
return digit;
}
-double parseIntOverflow(const char* s, int length, int radix)
+double parseIntOverflow(const LChar* s, int length, int radix)
{
double number = 0.0;
double radixMultiplier = 1.0;
- for (const char* p = s + length - 1; p >= s; p--) {
- if (radixMultiplier == Inf) {
+ for (const LChar* p = s + length - 1; p >= s; p--) {
+ if (radixMultiplier == std::numeric_limits<double>::infinity()) {
if (*p != '0') {
- number = Inf;
+ number = std::numeric_limits<double>::infinity();
break;
}
} else {
return number;
}
-static double parseInt(const UString& s, int radix)
+double parseIntOverflow(const UChar* s, int length, int radix)
{
- int length = s.size();
- const UChar* data = s.data();
- int p = 0;
+ double number = 0.0;
+ double radixMultiplier = 1.0;
+
+ for (const UChar* p = s + length - 1; p >= s; p--) {
+ if (radixMultiplier == std::numeric_limits<double>::infinity()) {
+ if (*p != '0') {
+ number = std::numeric_limits<double>::infinity();
+ break;
+ }
+ } else {
+ int digit = parseDigit(*p, radix);
+ number += digit * radixMultiplier;
+ }
+
+ radixMultiplier *= radix;
+ }
+ return number;
+}
+
+// ES5.1 15.1.2.2
+template <typename CharType>
+ALWAYS_INLINE
+static double parseInt(const UString& s, const CharType* data, int radix)
+{
+ // 1. Let inputString be ToString(string).
+ // 2. Let S be a newly created substring of inputString consisting of the first character that is not a
+ // StrWhiteSpaceChar and all characters following that character. (In other words, remove leading white
+ // space.) If inputString does not contain any such characters, let S be the empty string.
+ int length = s.length();
+ int p = 0;
while (p < length && isStrWhiteSpace(data[p]))
++p;
+ // 3. Let sign be 1.
+ // 4. If S is not empty and the first character of S is a minus sign -, let sign be -1.
+ // 5. If S is not empty and the first character of S is a plus sign + or a minus sign -, then remove the first character from S.
double sign = 1;
if (p < length) {
if (data[p] == '+')
}
}
+ // 6. Let R = ToInt32(radix).
+ // 7. Let stripPrefix be true.
+ // 8. If R != 0,then
+ // b. If R != 16, let stripPrefix be false.
+ // 9. Else, R == 0
+ // a. LetR = 10.
+ // 10. If stripPrefix is true, then
+ // a. If the length of S is at least 2 and the first two characters of S are either ―0x or ―0X,
+ // then remove the first two characters from S and let R = 16.
+ // 11. If S contains any character that is not a radix-R digit, then let Z be the substring of S
+ // consisting of all characters before the first such character; otherwise, let Z be S.
if ((radix == 0 || radix == 16) && length - p >= 2 && data[p] == '0' && (data[p + 1] == 'x' || data[p + 1] == 'X')) {
radix = 16;
p += 2;
- } else if (radix == 0) {
- if (p < length && data[p] == '0')
- radix = 8;
- else
- radix = 10;
- }
+ } else if (radix == 0)
+ radix = 10;
+ // 8.a If R < 2 or R > 36, then return NaN.
if (radix < 2 || radix > 36)
- return NaN;
-
+ return std::numeric_limits<double>::quiet_NaN();
+
+ // 13. Let mathInt be the mathematical integer value that is represented by Z in radix-R notation, using the letters
+ // A-Z and a-z for digits with values 10 through 35. (However, if R is 10 and Z contains more than 20 significant
+ // digits, every significant digit after the 20th may be replaced by a 0 digit, at the option of the implementation;
+ // and if R is not 2, 4, 8, 10, 16, or 32, then mathInt may be an implementation-dependent approximation to the
+ // mathematical integer value that is represented by Z in radix-R notation.)
+ // 14. Let number be the Number value for mathInt.
int firstDigitPosition = p;
bool sawDigit = false;
double number = 0;
++p;
}
+ // 12. If Z is empty, return NaN.
+ if (!sawDigit)
+ return std::numeric_limits<double>::quiet_NaN();
+
+ // Alternate code path for certain large numbers.
if (number >= mantissaOverflowLowerBound) {
- // FIXME: It is incorrect to use UString::ascii() here because it's not thread-safe.
- if (radix == 10)
- number = WTF::strtod(s.substr(firstDigitPosition, p - firstDigitPosition).ascii(), 0);
- else if (radix == 2 || radix == 4 || radix == 8 || radix == 16 || radix == 32)
- number = parseIntOverflow(s.substr(firstDigitPosition, p - firstDigitPosition).ascii(), p - firstDigitPosition, radix);
+ if (radix == 10) {
+ size_t parsedLength;
+ number = parseDouble(s.characters() + firstDigitPosition, p - firstDigitPosition, parsedLength);
+ } else if (radix == 2 || radix == 4 || radix == 8 || radix == 16 || radix == 32)
+ number = parseIntOverflow(s.substringSharingImpl(firstDigitPosition, p - firstDigitPosition).utf8().data(), p - firstDigitPosition, radix);
}
- if (!sawDigit)
- return NaN;
-
+ // 15. Return sign x number.
return sign * number;
}
+static double parseInt(const UString& s, int radix)
+{
+ if (s.is8Bit())
+ return parseInt(s, s.characters8(), radix);
+ return parseInt(s, s.characters16(), radix);
+}
+
+static const int SizeOfInfinity = 8;
+
+template <typename CharType>
+static bool isInfinity(const CharType* data, const CharType* end)
+{
+ return (end - data) >= SizeOfInfinity
+ && data[0] == 'I'
+ && data[1] == 'n'
+ && data[2] == 'f'
+ && data[3] == 'i'
+ && data[4] == 'n'
+ && data[5] == 'i'
+ && data[6] == 't'
+ && data[7] == 'y';
+}
+
+// See ecma-262 9.3.1
+template <typename CharType>
+static double jsHexIntegerLiteral(const CharType*& data, const CharType* end)
+{
+ // Hex number.
+ data += 2;
+ const CharType* firstDigitPosition = data;
+ double number = 0;
+ while (true) {
+ number = number * 16 + toASCIIHexValue(*data);
+ ++data;
+ if (data == end)
+ break;
+ if (!isASCIIHexDigit(*data))
+ break;
+ }
+ if (number >= mantissaOverflowLowerBound)
+ number = parseIntOverflow(firstDigitPosition, data - firstDigitPosition, 16);
+
+ return number;
+}
+
+// See ecma-262 9.3.1
+template <typename CharType>
+static double jsStrDecimalLiteral(const CharType*& data, const CharType* end)
+{
+ ASSERT(data < end);
+
+ size_t parsedLength;
+ double number = parseDouble(data, end - data, parsedLength);
+ if (parsedLength) {
+ data += parsedLength;
+ return number;
+ }
+
+ // Check for [+-]?Infinity
+ switch (*data) {
+ case 'I':
+ if (isInfinity(data, end)) {
+ data += SizeOfInfinity;
+ return std::numeric_limits<double>::infinity();
+ }
+ break;
+
+ case '+':
+ if (isInfinity(data + 1, end)) {
+ data += SizeOfInfinity + 1;
+ return std::numeric_limits<double>::infinity();
+ }
+ break;
+
+ case '-':
+ if (isInfinity(data + 1, end)) {
+ data += SizeOfInfinity + 1;
+ return -std::numeric_limits<double>::infinity();
+ }
+ break;
+ }
+
+ // Not a number.
+ return std::numeric_limits<double>::quiet_NaN();
+}
+
+template <typename CharType>
+static double toDouble(const CharType* characters, unsigned size)
+{
+ const CharType* endCharacters = characters + size;
+
+ // Skip leading white space.
+ for (; characters < endCharacters; ++characters) {
+ if (!isStrWhiteSpace(*characters))
+ break;
+ }
+
+ // Empty string.
+ if (characters == endCharacters)
+ return 0.0;
+
+ double number;
+ if (characters[0] == '0' && characters + 2 < endCharacters && (characters[1] | 0x20) == 'x' && isASCIIHexDigit(characters[2]))
+ number = jsHexIntegerLiteral(characters, endCharacters);
+ else
+ number = jsStrDecimalLiteral(characters, endCharacters);
+
+ // Allow trailing white space.
+ for (; characters < endCharacters; ++characters) {
+ if (!isStrWhiteSpace(*characters))
+ break;
+ }
+ if (characters != endCharacters)
+ return std::numeric_limits<double>::quiet_NaN();
+
+ return number;
+}
+
+// See ecma-262 9.3.1
+double jsToNumber(const UString& s)
+{
+ unsigned size = s.length();
+
+ if (size == 1) {
+ UChar c = s[0];
+ if (isASCIIDigit(c))
+ return c - '0';
+ if (isStrWhiteSpace(c))
+ return 0;
+ return std::numeric_limits<double>::quiet_NaN();
+ }
+
+ if (s.is8Bit())
+ return toDouble(s.characters8(), size);
+ return toDouble(s.characters16(), size);
+}
+
static double parseFloat(const UString& s)
{
- // Check for 0x prefix here, because toDouble allows it, but we must treat it as 0.
- // Need to skip any whitespace and then one + or - sign.
- int length = s.size();
- const UChar* data = s.data();
- int p = 0;
- while (p < length && isStrWhiteSpace(data[p]))
- ++p;
+ unsigned size = s.length();
- if (p < length && (data[p] == '+' || data[p] == '-'))
- ++p;
+ if (size == 1) {
+ UChar c = s[0];
+ if (isASCIIDigit(c))
+ return c - '0';
+ return std::numeric_limits<double>::quiet_NaN();
+ }
+
+ if (s.is8Bit()) {
+ const LChar* data = s.characters8();
+ const LChar* end = data + size;
+
+ // Skip leading white space.
+ for (; data < end; ++data) {
+ if (!isStrWhiteSpace(*data))
+ break;
+ }
+
+ // Empty string.
+ if (data == end)
+ return std::numeric_limits<double>::quiet_NaN();
+
+ return jsStrDecimalLiteral(data, end);
+ }
+
+ const UChar* data = s.characters16();
+ const UChar* end = data + size;
+
+ // Skip leading white space.
+ for (; data < end; ++data) {
+ if (!isStrWhiteSpace(*data))
+ break;
+ }
- if (length - p >= 2 && data[p] == '0' && (data[p + 1] == 'x' || data[p + 1] == 'X'))
- return 0;
+ // Empty string.
+ if (data == end)
+ return std::numeric_limits<double>::quiet_NaN();
- // FIXME: UString::toDouble will ignore leading ASCII spaces, but we need to ignore
- // other StrWhiteSpaceChar values as well.
- return s.toDouble(true /*tolerant*/, false /* NaN for empty string */);
+ return jsStrDecimalLiteral(data, end);
}
-JSValue JSC_HOST_CALL globalFuncEval(ExecState* exec, JSObject* function, JSValue thisValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncEval(ExecState* exec)
{
- JSObject* thisObject = thisValue.toThisObject(exec);
+ JSObject* thisObject = exec->hostThisValue().toThisObject(exec);
JSObject* unwrappedObject = thisObject->unwrappedObject();
- if (!unwrappedObject->isGlobalObject() || static_cast<JSGlobalObject*>(unwrappedObject)->evalFunction() != function)
- return throwError(exec, EvalError, "The \"this\" value passed to eval must be the global object from which eval originated");
+ if (!unwrappedObject->isGlobalObject() || jsCast<JSGlobalObject*>(unwrappedObject)->evalFunction() != exec->callee())
+ return throwVMError(exec, createEvalError(exec, "The \"this\" value passed to eval must be the global object from which eval originated"));
- JSValue x = args.at(0);
+ JSValue x = exec->argument(0);
if (!x.isString())
- return x;
-
- UString s = x.toString(exec);
-
- LiteralParser preparser(exec, s, LiteralParser::NonStrictJSON);
- if (JSValue parsedObject = preparser.tryLiteralParse())
- return parsedObject;
+ return JSValue::encode(x);
+
+ UString s = x.toString(exec)->value(exec);
+
+ if (s.is8Bit()) {
+ LiteralParser<LChar> preparser(exec, s.characters8(), s.length(), NonStrictJSON);
+ if (JSValue parsedObject = preparser.tryLiteralParse())
+ return JSValue::encode(parsedObject);
+ } else {
+ LiteralParser<UChar> preparser(exec, s.characters16(), s.length(), NonStrictJSON);
+ if (JSValue parsedObject = preparser.tryLiteralParse())
+ return JSValue::encode(parsedObject);
+ }
- RefPtr<EvalExecutable> eval = EvalExecutable::create(exec, makeSource(s));
- JSObject* error = eval->compile(exec, static_cast<JSGlobalObject*>(unwrappedObject)->globalScopeChain().node());
+ EvalExecutable* eval = EvalExecutable::create(exec, makeSource(s), false);
+ JSObject* error = eval->compile(exec, jsCast<JSGlobalObject*>(unwrappedObject)->globalScopeChain());
if (error)
- return throwError(exec, error);
+ return throwVMError(exec, error);
- return exec->interpreter()->execute(eval.get(), exec, thisObject, static_cast<JSGlobalObject*>(unwrappedObject)->globalScopeChain().node(), exec->exceptionSlot());
+ return JSValue::encode(exec->interpreter()->execute(eval, exec, thisObject, jsCast<JSGlobalObject*>(unwrappedObject)->globalScopeChain()));
}
-JSValue JSC_HOST_CALL globalFuncParseInt(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncParseInt(ExecState* exec)
{
- JSValue value = args.at(0);
- int32_t radix = args.at(1).toInt32(exec);
-
- if (radix != 0 && radix != 10)
- return jsNumber(exec, parseInt(value.toString(exec), radix));
-
- if (value.isInt32())
- return value;
-
- if (value.isDouble()) {
- double d = value.asDouble();
- if (isfinite(d))
- return jsNumber(exec, (d > 0) ? floor(d) : ceil(d));
- if (isnan(d) || isinf(d))
- return jsNaN(exec);
- return jsNumber(exec, 0);
+ JSValue value = exec->argument(0);
+ JSValue radixValue = exec->argument(1);
+
+ // Optimized handling for numbers:
+ // If the argument is 0 or a number in range 10^-6 <= n < INT_MAX+1, then parseInt
+ // results in a truncation to integer. In the case of -0, this is converted to 0.
+ //
+ // This is also a truncation for values in the range INT_MAX+1 <= n < 10^21,
+ // however these values cannot be trivially truncated to int since 10^21 exceeds
+ // even the int64_t range. Negative numbers are a little trickier, the case for
+ // values in the range -10^21 < n <= -1 are similar to those for integer, but
+ // values in the range -1 < n <= -10^-6 need to truncate to -0, not 0.
+ static const double tenToTheMinus6 = 0.000001;
+ static const double intMaxPlusOne = 2147483648.0;
+ if (value.isNumber()) {
+ double n = value.asNumber();
+ if (((n < intMaxPlusOne && n >= tenToTheMinus6) || !n) && radixValue.isUndefinedOrNull())
+ return JSValue::encode(jsNumber(static_cast<int32_t>(n)));
}
- return jsNumber(exec, parseInt(value.toString(exec), radix));
+ // If ToString throws, we shouldn't call ToInt32.
+ UString s = value.toString(exec)->value(exec);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+
+ return JSValue::encode(jsNumber(parseInt(s, radixValue.toInt32(exec))));
}
-JSValue JSC_HOST_CALL globalFuncParseFloat(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncParseFloat(ExecState* exec)
{
- return jsNumber(exec, parseFloat(args.at(0).toString(exec)));
+ return JSValue::encode(jsNumber(parseFloat(exec->argument(0).toString(exec)->value(exec))));
}
-JSValue JSC_HOST_CALL globalFuncIsNaN(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncIsNaN(ExecState* exec)
{
- return jsBoolean(isnan(args.at(0).toNumber(exec)));
+ return JSValue::encode(jsBoolean(isnan(exec->argument(0).toNumber(exec))));
}
-JSValue JSC_HOST_CALL globalFuncIsFinite(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncIsFinite(ExecState* exec)
{
- double n = args.at(0).toNumber(exec);
- return jsBoolean(!isnan(n) && !isinf(n));
+ double n = exec->argument(0).toNumber(exec);
+ return JSValue::encode(jsBoolean(isfinite(n)));
}
-JSValue JSC_HOST_CALL globalFuncDecodeURI(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncDecodeURI(ExecState* exec)
{
static const char do_not_unescape_when_decoding_URI[] =
"#$&+,/:;=?@";
- return decode(exec, args, do_not_unescape_when_decoding_URI, true);
+ return JSValue::encode(decode(exec, do_not_unescape_when_decoding_URI, true));
}
-JSValue JSC_HOST_CALL globalFuncDecodeURIComponent(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncDecodeURIComponent(ExecState* exec)
{
- return decode(exec, args, "", true);
+ return JSValue::encode(decode(exec, "", true));
}
-JSValue JSC_HOST_CALL globalFuncEncodeURI(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncEncodeURI(ExecState* exec)
{
static const char do_not_escape_when_encoding_URI[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"
"!#$&'()*+,-./:;=?@_~";
- return encode(exec, args, do_not_escape_when_encoding_URI);
+ return JSValue::encode(encode(exec, do_not_escape_when_encoding_URI));
}
-JSValue JSC_HOST_CALL globalFuncEncodeURIComponent(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncEncodeURIComponent(ExecState* exec)
{
static const char do_not_escape_when_encoding_URI_component[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"
"!'()*-._~";
- return encode(exec, args, do_not_escape_when_encoding_URI_component);
+ return JSValue::encode(encode(exec, do_not_escape_when_encoding_URI_component));
}
-JSValue JSC_HOST_CALL globalFuncEscape(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncEscape(ExecState* exec)
{
static const char do_not_escape[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"*+-./@_";
JSStringBuilder builder;
- UString str = args.at(0).toString(exec);
- const UChar* c = str.data();
- for (unsigned k = 0; k < str.size(); k++, c++) {
+ UString str = exec->argument(0).toString(exec)->value(exec);
+ if (str.is8Bit()) {
+ const LChar* c = str.characters8();
+ for (unsigned k = 0; k < str.length(); k++, c++) {
+ int u = c[0];
+ if (u && strchr(do_not_escape, static_cast<char>(u)))
+ builder.append(c, 1);
+ else {
+ char tmp[4];
+ snprintf(tmp, sizeof(tmp), "%%%02X", u);
+ builder.append(tmp);
+ }
+ }
+
+ return JSValue::encode(builder.build(exec));
+ }
+
+ const UChar* c = str.characters16();
+ for (unsigned k = 0; k < str.length(); k++, c++) {
int u = c[0];
if (u > 255) {
char tmp[7];
}
}
- return builder.build(exec);
+ return JSValue::encode(builder.build(exec));
}
-JSValue JSC_HOST_CALL globalFuncUnescape(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncUnescape(ExecState* exec)
{
- StringBuilder builder;
- UString str = args.at(0).toString(exec);
+ UStringBuilder builder;
+ UString str = exec->argument(0).toString(exec)->value(exec);
int k = 0;
- int len = str.size();
- while (k < len) {
- const UChar* c = str.data() + k;
- UChar u;
- if (c[0] == '%' && k <= len - 6 && c[1] == 'u') {
- if (isASCIIHexDigit(c[2]) && isASCIIHexDigit(c[3]) && isASCIIHexDigit(c[4]) && isASCIIHexDigit(c[5])) {
- u = Lexer::convertUnicode(c[2], c[3], c[4], c[5]);
- c = &u;
- k += 5;
+ int len = str.length();
+
+ if (str.is8Bit()) {
+ const LChar* characters = str.characters8();
+ LChar convertedLChar;
+ while (k < len) {
+ const LChar* c = characters + k;
+ if (c[0] == '%' && k <= len - 6 && c[1] == 'u') {
+ if (isASCIIHexDigit(c[2]) && isASCIIHexDigit(c[3]) && isASCIIHexDigit(c[4]) && isASCIIHexDigit(c[5])) {
+ builder.append(Lexer<UChar>::convertUnicode(c[2], c[3], c[4], c[5]));
+ k += 6;
+ continue;
+ }
+ } else if (c[0] == '%' && k <= len - 3 && isASCIIHexDigit(c[1]) && isASCIIHexDigit(c[2])) {
+ convertedLChar = LChar(Lexer<LChar>::convertHex(c[1], c[2]));
+ c = &convertedLChar;
+ k += 2;
+ }
+ builder.append(*c);
+ k++;
+ }
+ } else {
+ const UChar* characters = str.characters16();
+
+ while (k < len) {
+ const UChar* c = characters + k;
+ UChar convertedUChar;
+ if (c[0] == '%' && k <= len - 6 && c[1] == 'u') {
+ if (isASCIIHexDigit(c[2]) && isASCIIHexDigit(c[3]) && isASCIIHexDigit(c[4]) && isASCIIHexDigit(c[5])) {
+ convertedUChar = Lexer<UChar>::convertUnicode(c[2], c[3], c[4], c[5]);
+ c = &convertedUChar;
+ k += 5;
+ }
+ } else if (c[0] == '%' && k <= len - 3 && isASCIIHexDigit(c[1]) && isASCIIHexDigit(c[2])) {
+ convertedUChar = UChar(Lexer<UChar>::convertHex(c[1], c[2]));
+ c = &convertedUChar;
+ k += 2;
}
- } else if (c[0] == '%' && k <= len - 3 && isASCIIHexDigit(c[1]) && isASCIIHexDigit(c[2])) {
- u = UChar(Lexer::convertHex(c[1], c[2]));
- c = &u;
- k += 2;
+ k++;
+ builder.append(*c);
}
- k++;
- builder.append(*c);
}
- return jsString(exec, builder.build());
+ return JSValue::encode(jsString(exec, builder.toUString()));
+}
+
+EncodedJSValue JSC_HOST_CALL globalFuncThrowTypeError(ExecState* exec)
+{
+ return throwVMTypeError(exec);
+}
+
+EncodedJSValue JSC_HOST_CALL globalFuncProtoGetter(ExecState* exec)
+{
+ if (!exec->thisValue().isObject())
+ return JSValue::encode(exec->thisValue().synthesizePrototype(exec));
+
+ JSObject* thisObject = asObject(exec->thisValue());
+ if (!thisObject->allowsAccessFrom(exec->trueCallerFrame()))
+ return JSValue::encode(jsUndefined());
+
+ return JSValue::encode(thisObject->prototype());
}
-#ifndef NDEBUG
-JSValue JSC_HOST_CALL globalFuncJSCPrint(ExecState* exec, JSObject*, JSValue, const ArgList& args)
+EncodedJSValue JSC_HOST_CALL globalFuncProtoSetter(ExecState* exec)
{
- CString string = args.at(0).toString(exec).UTF8String();
- puts(string.data());
- return jsUndefined();
+ JSValue value = exec->argument(0);
+
+ // Setting __proto__ of a primitive should have no effect.
+ if (!exec->thisValue().isObject())
+ return JSValue::encode(jsUndefined());
+
+ JSObject* thisObject = asObject(exec->thisValue());
+ if (!thisObject->allowsAccessFrom(exec->trueCallerFrame()))
+ return JSValue::encode(jsUndefined());
+
+ // Setting __proto__ to a non-object, non-null value is silently ignored to match Mozilla.
+ if (!value.isObject() && !value.isNull())
+ return JSValue::encode(jsUndefined());
+
+ if (!thisObject->isExtensible())
+ return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
+
+ if (!thisObject->setPrototypeWithCycleCheck(exec->globalData(), value))
+ throwError(exec, createError(exec, "cyclic __proto__ value"));
+ return JSValue::encode(jsUndefined());
}
-#endif
} // namespace JSC
projects / apple / javascriptcore.git / blobdiff