Skip to content

V
V8
Commit 72ab4217 authored by yangguo's avatar yangguo Committed by Commit bot
Browse files
Options

Reland "Wrap v8natives.js into a function." 

Review URL: https://codereview.chromium.org/1123703002

Cr-Commit-Position: refs/heads/master@{#28193}
parent 98338442
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 372 deletions
src/api.cc
View file @ 72ab4217
...@@ -3589,7 +3589,7 @@ MaybeLocal<Value> v8::Object::GetOwnPropertyDescriptor(Local<Context> context, ...@@ -3589,7 +3589,7 @@ MaybeLocal<Value> v8::Object::GetOwnPropertyDescriptor(Local<Context> context,
i::Handle<i::Object> args[] = { obj, key_name }; i::Handle<i::Object> args[] = { obj, key_name };
i::Handle<i::Object> result; i::Handle<i::Object> result;
has_pending_exception = has_pending_exception =
!CallV8HeapFunction(isolate, "ObjectGetOwnPropertyDescriptor", !CallV8HeapFunction(isolate, "$objectGetOwnPropertyDescriptor",
isolate->factory()->undefined_value(), isolate->factory()->undefined_value(),
arraysize(args), args).ToHandle(&result); arraysize(args), args).ToHandle(&result);
RETURN_ON_FAILED_EXECUTION(Value); RETURN_ON_FAILED_EXECUTION(Value);
......
src/array-iterator.js
View file @ 72ab4217
...@@ -125,16 +125,16 @@ function ArrayKeys() { ...@@ -125,16 +125,16 @@ function ArrayKeys() {
%FunctionSetPrototype(ArrayIterator, new GlobalObject()); %FunctionSetPrototype(ArrayIterator, new GlobalObject());
%FunctionSetInstanceClassName(ArrayIterator, 'Array Iterator'); %FunctionSetInstanceClassName(ArrayIterator, 'Array Iterator');
InstallFunctions(ArrayIterator.prototype, DONT_ENUM, [ $installFunctions(ArrayIterator.prototype, DONT_ENUM, [
'next', ArrayIteratorNext 'next', ArrayIteratorNext
]); ]);
SetFunctionName(ArrayIteratorIterator, symbolIterator); $setFunctionName(ArrayIteratorIterator, symbolIterator);
%AddNamedProperty(ArrayIterator.prototype, symbolIterator, %AddNamedProperty(ArrayIterator.prototype, symbolIterator,
ArrayIteratorIterator, DONT_ENUM); ArrayIteratorIterator, DONT_ENUM);
%AddNamedProperty(ArrayIterator.prototype, symbolToStringTag, %AddNamedProperty(ArrayIterator.prototype, symbolToStringTag,
"Array Iterator", READ_ONLY | DONT_ENUM); "Array Iterator", READ_ONLY | DONT_ENUM);
InstallFunctions(GlobalArray.prototype, DONT_ENUM, [ $installFunctions(GlobalArray.prototype, DONT_ENUM, [
// No 'values' since it breaks webcompat: http://crbug.com/409858 // No 'values' since it breaks webcompat: http://crbug.com/409858
'entries', ArrayEntries, 'entries', ArrayEntries,
'keys', ArrayKeys 'keys', ArrayKeys
......
src/array.js
View file @ 72ab4217
...@@ -372,7 +372,7 @@ function ArrayToString() { ...@@ -372,7 +372,7 @@ function ArrayToString() {
func = array.join; func = array.join;
} }
if (!IS_SPEC_FUNCTION(func)) { if (!IS_SPEC_FUNCTION(func)) {
return %_CallFunction(array, ObjectToString); return %_CallFunction(array, $objectToString);
} }
return %_CallFunction(array, func); return %_CallFunction(array, func);
} }
...@@ -447,7 +447,7 @@ function ArrayPop() { ...@@ -447,7 +447,7 @@ function ArrayPop() {
n--; n--;
var value = array[n]; var value = array[n];
Delete(array, ToName(n), true); $delete(array, ToName(n), true);
array.length = n; array.length = n;
return value; return value;
} }
...@@ -620,7 +620,7 @@ function ArrayShift() { ...@@ -620,7 +620,7 @@ function ArrayShift() {
return; return;
} }
if (ObjectIsSealed(array)) throw MakeTypeError(kArrayFunctionsOnSealed); if ($objectIsSealed(array)) throw MakeTypeError(kArrayFunctionsOnSealed);
if (%IsObserved(array)) if (%IsObserved(array))
return ObservedArrayShift.call(array, len); return ObservedArrayShift.call(array, len);
...@@ -671,7 +671,7 @@ function ArrayUnshift(arg1) { // length == 1 ...@@ -671,7 +671,7 @@ function ArrayUnshift(arg1) { // length == 1
var num_arguments = %_ArgumentsLength(); var num_arguments = %_ArgumentsLength();
if (len > 0 && UseSparseVariant(array, len, IS_ARRAY(array), len) && if (len > 0 && UseSparseVariant(array, len, IS_ARRAY(array), len) &&
!ObjectIsSealed(array)) { !$objectIsSealed(array)) {
SparseMove(array, 0, 0, len, num_arguments); SparseMove(array, 0, 0, len, num_arguments);
} else { } else {
SimpleMove(array, 0, 0, len, num_arguments); SimpleMove(array, 0, 0, len, num_arguments);
...@@ -817,9 +817,9 @@ function ArraySplice(start, delete_count) { ...@@ -817,9 +817,9 @@ function ArraySplice(start, delete_count) {
deleted_elements.length = del_count; deleted_elements.length = del_count;
var num_elements_to_add = num_arguments > 2 ? num_arguments - 2 : 0; var num_elements_to_add = num_arguments > 2 ? num_arguments - 2 : 0;
if (del_count != num_elements_to_add && ObjectIsSealed(array)) { if (del_count != num_elements_to_add && $objectIsSealed(array)) {
throw MakeTypeError(kArrayFunctionsOnSealed); throw MakeTypeError(kArrayFunctionsOnSealed);
} else if (del_count > 0 && ObjectIsFrozen(array)) { } else if (del_count > 0 && $objectIsFrozen(array)) {
throw MakeTypeError(kArrayFunctionsOnFrozen); throw MakeTypeError(kArrayFunctionsOnFrozen);
} }
...@@ -1523,7 +1523,7 @@ var unscopables = { ...@@ -1523,7 +1523,7 @@ var unscopables = {
DONT_ENUM | READ_ONLY); DONT_ENUM | READ_ONLY);
// Set up non-enumerable functions on the Array object. // Set up non-enumerable functions on the Array object.
InstallFunctions(GlobalArray, DONT_ENUM, [ $installFunctions(GlobalArray, DONT_ENUM, [
"isArray", ArrayIsArray "isArray", ArrayIsArray
]); ]);
...@@ -1544,7 +1544,7 @@ var getFunction = function(name, jsBuiltin, len) { ...@@ -1544,7 +1544,7 @@ var getFunction = function(name, jsBuiltin, len) {
// set their names. // set their names.
// Manipulate the length of some of the functions to meet // Manipulate the length of some of the functions to meet
// expectations set by ECMA-262 or Mozilla. // expectations set by ECMA-262 or Mozilla.
InstallFunctions(GlobalArray.prototype, DONT_ENUM, [ $installFunctions(GlobalArray.prototype, DONT_ENUM, [
"toString", getFunction("toString", ArrayToString), "toString", getFunction("toString", ArrayToString),
"toLocaleString", getFunction("toLocaleString", ArrayToLocaleString), "toLocaleString", getFunction("toLocaleString", ArrayToLocaleString),
"join", getFunction("join", ArrayJoin), "join", getFunction("join", ArrayJoin),
...@@ -1573,7 +1573,7 @@ InstallFunctions(GlobalArray.prototype, DONT_ENUM, [ ...@@ -1573,7 +1573,7 @@ InstallFunctions(GlobalArray.prototype, DONT_ENUM, [
// The internal Array prototype doesn't need to be fancy, since it's never // The internal Array prototype doesn't need to be fancy, since it's never
// exposed to user code. // exposed to user code.
// Adding only the functions that are actually used. // Adding only the functions that are actually used.
SetUpLockedPrototype(InternalArray, GlobalArray(), [ $setUpLockedPrototype(InternalArray, GlobalArray(), [
"concat", getFunction("concat", ArrayConcatJS), "concat", getFunction("concat", ArrayConcatJS),
"indexOf", getFunction("indexOf", ArrayIndexOf), "indexOf", getFunction("indexOf", ArrayIndexOf),
"join", getFunction("join", ArrayJoin), "join", getFunction("join", ArrayJoin),
...@@ -1583,7 +1583,7 @@ SetUpLockedPrototype(InternalArray, GlobalArray(), [ ...@@ -1583,7 +1583,7 @@ SetUpLockedPrototype(InternalArray, GlobalArray(), [
"splice", getFunction("splice", ArraySplice) "splice", getFunction("splice", ArraySplice)
]); ]);
SetUpLockedPrototype(InternalPackedArray, GlobalArray(), [ $setUpLockedPrototype(InternalPackedArray, GlobalArray(), [
"join", getFunction("join", ArrayJoin), "join", getFunction("join", ArrayJoin),
"pop", getFunction("pop", ArrayPop), "pop", getFunction("pop", ArrayPop),
"push", getFunction("push", ArrayPush), "push", getFunction("push", ArrayPush),
......
src/arraybuffer.js
View file @ 72ab4217
...@@ -83,13 +83,13 @@ function ArrayBufferIsViewJS(obj) { ...@@ -83,13 +83,13 @@ function ArrayBufferIsViewJS(obj) {
%AddNamedProperty(GlobalArrayBuffer.prototype, %AddNamedProperty(GlobalArrayBuffer.prototype,
symbolToStringTag, "ArrayBuffer", DONT_ENUM | READ_ONLY); symbolToStringTag, "ArrayBuffer", DONT_ENUM | READ_ONLY);
InstallGetter(GlobalArrayBuffer.prototype, "byteLength", ArrayBufferGetByteLen); $installGetter(GlobalArrayBuffer.prototype, "byteLength", ArrayBufferGetByteLen);
InstallFunctions(GlobalArrayBuffer, DONT_ENUM, [ $installFunctions(GlobalArrayBuffer, DONT_ENUM, [
"isView", ArrayBufferIsViewJS "isView", ArrayBufferIsViewJS
]); ]);
InstallFunctions(GlobalArrayBuffer.prototype, DONT_ENUM, [ $installFunctions(GlobalArrayBuffer.prototype, DONT_ENUM, [
"slice", ArrayBufferSlice "slice", ArrayBufferSlice
]); ]);
......
src/bootstrapper.cc
View file @ 72ab4217
...@@ -1573,9 +1573,9 @@ void Genesis::InstallNativeFunctions() { ...@@ -1573,9 +1573,9 @@ void Genesis::InstallNativeFunctions() {
INSTALL_NATIVE(JSFunction, "ToInt32", to_int32_fun); INSTALL_NATIVE(JSFunction, "ToInt32", to_int32_fun);
INSTALL_NATIVE(JSFunction, "ToLength", to_length_fun); INSTALL_NATIVE(JSFunction, "ToLength", to_length_fun);
INSTALL_NATIVE(JSFunction, "GlobalEval", global_eval_fun); INSTALL_NATIVE(JSFunction, "$globalEval", global_eval_fun);
INSTALL_NATIVE(JSFunction, "$getStackTraceLine", get_stack_trace_line_fun); INSTALL_NATIVE(JSFunction, "$getStackTraceLine", get_stack_trace_line_fun);
INSTALL_NATIVE(JSFunction, "ToCompletePropertyDescriptor", INSTALL_NATIVE(JSFunction, "$toCompletePropertyDescriptor",
to_complete_property_descriptor); to_complete_property_descriptor);
INSTALL_NATIVE(Symbol, "$promiseStatus", promise_status); INSTALL_NATIVE(Symbol, "$promiseStatus", promise_status);
......
src/collection-iterator.js
View file @ 72ab4217
...@@ -76,17 +76,17 @@ function SetValues() { ...@@ -76,17 +76,17 @@ function SetValues() {
%SetCode(SetIterator, SetIteratorConstructor); %SetCode(SetIterator, SetIteratorConstructor);
%FunctionSetPrototype(SetIterator, new GlobalObject()); %FunctionSetPrototype(SetIterator, new GlobalObject());
%FunctionSetInstanceClassName(SetIterator, 'Set Iterator'); %FunctionSetInstanceClassName(SetIterator, 'Set Iterator');
InstallFunctions(SetIterator.prototype, DONT_ENUM, [ $installFunctions(SetIterator.prototype, DONT_ENUM, [
'next', SetIteratorNextJS 'next', SetIteratorNextJS
]); ]);
SetFunctionName(SetIteratorSymbolIterator, symbolIterator); $setFunctionName(SetIteratorSymbolIterator, symbolIterator);
%AddNamedProperty(SetIterator.prototype, symbolIterator, %AddNamedProperty(SetIterator.prototype, symbolIterator,
SetIteratorSymbolIterator, DONT_ENUM); SetIteratorSymbolIterator, DONT_ENUM);
%AddNamedProperty(SetIterator.prototype, symbolToStringTag, %AddNamedProperty(SetIterator.prototype, symbolToStringTag,
"Set Iterator", READ_ONLY | DONT_ENUM); "Set Iterator", READ_ONLY | DONT_ENUM);
InstallFunctions(GlobalSet.prototype, DONT_ENUM, [ $installFunctions(GlobalSet.prototype, DONT_ENUM, [
'entries', SetEntries, 'entries', SetEntries,
'keys', SetValues, 'keys', SetValues,
'values', SetValues 'values', SetValues
...@@ -166,18 +166,18 @@ function MapValues() { ...@@ -166,18 +166,18 @@ function MapValues() {
%SetCode(MapIterator, MapIteratorConstructor); %SetCode(MapIterator, MapIteratorConstructor);
%FunctionSetPrototype(MapIterator, new GlobalObject()); %FunctionSetPrototype(MapIterator, new GlobalObject());
%FunctionSetInstanceClassName(MapIterator, 'Map Iterator'); %FunctionSetInstanceClassName(MapIterator, 'Map Iterator');
InstallFunctions(MapIterator.prototype, DONT_ENUM, [ $installFunctions(MapIterator.prototype, DONT_ENUM, [
'next', MapIteratorNextJS 'next', MapIteratorNextJS
]); ]);
SetFunctionName(MapIteratorSymbolIterator, symbolIterator); $setFunctionName(MapIteratorSymbolIterator, symbolIterator);
%AddNamedProperty(MapIterator.prototype, symbolIterator, %AddNamedProperty(MapIterator.prototype, symbolIterator,
MapIteratorSymbolIterator, DONT_ENUM); MapIteratorSymbolIterator, DONT_ENUM);
%AddNamedProperty(MapIterator.prototype, symbolToStringTag, %AddNamedProperty(MapIterator.prototype, symbolToStringTag,
"Map Iterator", READ_ONLY | DONT_ENUM); "Map Iterator", READ_ONLY | DONT_ENUM);
InstallFunctions(GlobalMap.prototype, DONT_ENUM, [ $installFunctions(GlobalMap.prototype, DONT_ENUM, [
'entries', MapEntries, 'entries', MapEntries,
'keys', MapKeys, 'keys', MapKeys,
'values', MapValues 'values', MapValues
......
src/collection.js
View file @ 72ab4217
...@@ -22,7 +22,7 @@ function HashToEntry(table, hash, numBuckets) { ...@@ -22,7 +22,7 @@ function HashToEntry(table, hash, numBuckets) {
function SetFindEntry(table, numBuckets, key, hash) { function SetFindEntry(table, numBuckets, key, hash) {
var keyIsNaN = NumberIsNaN(key); var keyIsNaN = $numberIsNaN(key);
for (var entry = HashToEntry(table, hash, numBuckets); for (var entry = HashToEntry(table, hash, numBuckets);
entry !== NOT_FOUND; entry !== NOT_FOUND;
entry = ORDERED_HASH_SET_CHAIN_AT(table, entry, numBuckets)) { entry = ORDERED_HASH_SET_CHAIN_AT(table, entry, numBuckets)) {
...@@ -30,7 +30,7 @@ function SetFindEntry(table, numBuckets, key, hash) { ...@@ -30,7 +30,7 @@ function SetFindEntry(table, numBuckets, key, hash) {
if (key === candidate) { if (key === candidate) {
return entry; return entry;
} }
if (keyIsNaN && NumberIsNaN(candidate)) { if (keyIsNaN && $numberIsNaN(candidate)) {
return entry; return entry;
} }
} }
...@@ -40,7 +40,7 @@ function SetFindEntry(table, numBuckets, key, hash) { ...@@ -40,7 +40,7 @@ function SetFindEntry(table, numBuckets, key, hash) {
function MapFindEntry(table, numBuckets, key, hash) { function MapFindEntry(table, numBuckets, key, hash) {
var keyIsNaN = NumberIsNaN(key); var keyIsNaN = $numberIsNaN(key);
for (var entry = HashToEntry(table, hash, numBuckets); for (var entry = HashToEntry(table, hash, numBuckets);
entry !== NOT_FOUND; entry !== NOT_FOUND;
entry = ORDERED_HASH_MAP_CHAIN_AT(table, entry, numBuckets)) { entry = ORDERED_HASH_MAP_CHAIN_AT(table, entry, numBuckets)) {
...@@ -48,7 +48,7 @@ function MapFindEntry(table, numBuckets, key, hash) { ...@@ -48,7 +48,7 @@ function MapFindEntry(table, numBuckets, key, hash) {
if (key === candidate) { if (key === candidate) {
return entry; return entry;
} }
if (keyIsNaN && NumberIsNaN(candidate)) { if (keyIsNaN && $numberIsNaN(candidate)) {
return entry; return entry;
} }
} }
...@@ -239,8 +239,8 @@ function SetForEach(f, receiver) { ...@@ -239,8 +239,8 @@ function SetForEach(f, receiver) {
%FunctionSetLength(SetForEach, 1); %FunctionSetLength(SetForEach, 1);
// Set up the non-enumerable functions on the Set prototype object. // Set up the non-enumerable functions on the Set prototype object.
InstallGetter(GlobalSet.prototype, "size", SetGetSize); $installGetter(GlobalSet.prototype, "size", SetGetSize);
InstallFunctions(GlobalSet.prototype, DONT_ENUM, [ $installFunctions(GlobalSet.prototype, DONT_ENUM, [
"add", SetAdd, "add", SetAdd,
"has", SetHas, "has", SetHas,
"delete", SetDelete, "delete", SetDelete,
...@@ -427,8 +427,8 @@ function MapForEach(f, receiver) { ...@@ -427,8 +427,8 @@ function MapForEach(f, receiver) {
%FunctionSetLength(MapForEach, 1); %FunctionSetLength(MapForEach, 1);
// Set up the non-enumerable functions on the Map prototype object. // Set up the non-enumerable functions on the Map prototype object.
InstallGetter(GlobalMap.prototype, "size", MapGetSize); $installGetter(GlobalMap.prototype, "size", MapGetSize);
InstallFunctions(GlobalMap.prototype, DONT_ENUM, [ $installFunctions(GlobalMap.prototype, DONT_ENUM, [
"get", MapGet, "get", MapGet,
"set", MapSet, "set", MapSet,
"has", MapHas, "has", MapHas,
......
src/date.js
View file @ 72ab4217
...@@ -760,7 +760,7 @@ function CreateDate(time) { ...@@ -760,7 +760,7 @@ function CreateDate(time) {
%FunctionSetPrototype(GlobalDate, new GlobalDate(NAN)); %FunctionSetPrototype(GlobalDate, new GlobalDate(NAN));
// Set up non-enumerable properties of the Date object itself. // Set up non-enumerable properties of the Date object itself.
InstallFunctions(GlobalDate, DONT_ENUM, [ $installFunctions(GlobalDate, DONT_ENUM, [
"UTC", DateUTC, "UTC", DateUTC,
"parse", DateParse, "parse", DateParse,
"now", DateNow "now", DateNow
...@@ -771,7 +771,7 @@ InstallFunctions(GlobalDate, DONT_ENUM, [ ...@@ -771,7 +771,7 @@ InstallFunctions(GlobalDate, DONT_ENUM, [
// Set up non-enumerable functions of the Date prototype object and // Set up non-enumerable functions of the Date prototype object and
// set their names. // set their names.
InstallFunctions(GlobalDate.prototype, DONT_ENUM, [ $installFunctions(GlobalDate.prototype, DONT_ENUM, [
"toString", DateToString, "toString", DateToString,
"toDateString", DateToDateString, "toDateString", DateToDateString,
"toTimeString", DateToTimeString, "toTimeString", DateToTimeString,
......
src/generator.js
View file @ 72ab4217
...@@ -72,7 +72,7 @@ function GeneratorObjectIterator() { ...@@ -72,7 +72,7 @@ function GeneratorObjectIterator() {
function GeneratorFunctionConstructor(arg1) { // length == 1 function GeneratorFunctionConstructor(arg1) { // length == 1
var source = NewFunctionString(arguments, 'function*'); var source = $newFunctionString(arguments, 'function*');
var global_proxy = %GlobalProxy(global); var global_proxy = %GlobalProxy(global);
// Compile the string in the constructor and not a helper so that errors // Compile the string in the constructor and not a helper so that errors
// appear to come from here. // appear to come from here.
...@@ -90,12 +90,12 @@ function GeneratorFunctionConstructor(arg1) { // length == 1 ...@@ -90,12 +90,12 @@ function GeneratorFunctionConstructor(arg1) { // length == 1
// Set up non-enumerable functions on the generator prototype object. // Set up non-enumerable functions on the generator prototype object.
var GeneratorObjectPrototype = GeneratorFunctionPrototype.prototype; var GeneratorObjectPrototype = GeneratorFunctionPrototype.prototype;
InstallFunctions(GeneratorObjectPrototype, $installFunctions(GeneratorObjectPrototype,
DONT_ENUM, DONT_ENUM,
["next", GeneratorObjectNext, ["next", GeneratorObjectNext,
"throw", GeneratorObjectThrow]); "throw", GeneratorObjectThrow]);
SetFunctionName(GeneratorObjectIterator, symbolIterator); $setFunctionName(GeneratorObjectIterator, symbolIterator);
%AddNamedProperty(GeneratorObjectPrototype, symbolIterator, %AddNamedProperty(GeneratorObjectPrototype, symbolIterator,
GeneratorObjectIterator, DONT_ENUM | DONT_DELETE | READ_ONLY); GeneratorObjectIterator, DONT_ENUM | DONT_DELETE | READ_ONLY);
%AddNamedProperty(GeneratorObjectPrototype, "constructor", %AddNamedProperty(GeneratorObjectPrototype, "constructor",
......
src/harmony-array-includes.js
View file @ 72ab4217
...@@ -52,7 +52,7 @@ function ArrayIncludes(searchElement, fromIndex) { ...@@ -52,7 +52,7 @@ function ArrayIncludes(searchElement, fromIndex) {
%FunctionSetLength(ArrayIncludes, 1); %FunctionSetLength(ArrayIncludes, 1);
// Set up the non-enumerable functions on the Array prototype object. // Set up the non-enumerable functions on the Array prototype object.
InstallFunctions(GlobalArray.prototype, DONT_ENUM, [ $installFunctions(GlobalArray.prototype, DONT_ENUM, [
"includes", ArrayIncludes "includes", ArrayIncludes
]); ]);
......
src/harmony-array.js
View file @ 72ab4217
...@@ -173,7 +173,7 @@ function ArrayFill(value /* [, start [, end ] ] */) { // length == 1 ...@@ -173,7 +173,7 @@ function ArrayFill(value /* [, start [, end ] ] */) { // length == 1
if (end > length) end = length; if (end > length) end = length;
} }
if ((end - i) > 0 && ObjectIsFrozen(array)) { if ((end - i) > 0 && $objectIsFrozen(array)) {
throw MakeTypeError(kArrayFunctionsOnFrozen); throw MakeTypeError(kArrayFunctionsOnFrozen);
} }
...@@ -197,7 +197,7 @@ function ArrayFrom(arrayLike, mapfn, receiver) { ...@@ -197,7 +197,7 @@ function ArrayFrom(arrayLike, mapfn, receiver) {
} }
} }
var iterable = GetMethod(items, symbolIterator); var iterable = $getMethod(items, symbolIterator);
var k; var k;
var result; var result;
var mappedValue; var mappedValue;
...@@ -206,7 +206,7 @@ function ArrayFrom(arrayLike, mapfn, receiver) { ...@@ -206,7 +206,7 @@ function ArrayFrom(arrayLike, mapfn, receiver) {
if (!IS_UNDEFINED(iterable)) { if (!IS_UNDEFINED(iterable)) {
result = %IsConstructor(this) ? new this() : []; result = %IsConstructor(this) ? new this() : [];
var iterator = GetIterator(items, iterable); var iterator = $getIterator(items, iterable);
k = 0; k = 0;
while (true) { while (true) {
...@@ -263,7 +263,7 @@ function ArrayOf() { ...@@ -263,7 +263,7 @@ function ArrayOf() {
// ------------------------------------------------------------------- // -------------------------------------------------------------------
InstallConstants(GlobalSymbol, [ $installConstants(GlobalSymbol, [
// TODO(dslomov, caitp): Move to symbol.js when shipping // TODO(dslomov, caitp): Move to symbol.js when shipping
"isConcatSpreadable", symbolIsConcatSpreadable "isConcatSpreadable", symbolIsConcatSpreadable
]); ]);
...@@ -272,13 +272,13 @@ InstallConstants(GlobalSymbol, [ ...@@ -272,13 +272,13 @@ InstallConstants(GlobalSymbol, [
%FunctionSetLength(ArrayFrom, 1); %FunctionSetLength(ArrayFrom, 1);
// Set up non-enumerable functions on the Array object. // Set up non-enumerable functions on the Array object.
InstallFunctions(GlobalArray, DONT_ENUM, [ $installFunctions(GlobalArray, DONT_ENUM, [
"from", ArrayFrom, "from", ArrayFrom,
"of", ArrayOf "of", ArrayOf
]); ]);
// Set up the non-enumerable functions on the Array prototype object. // Set up the non-enumerable functions on the Array prototype object.
InstallFunctions(GlobalArray.prototype, DONT_ENUM, [ $installFunctions(GlobalArray.prototype, DONT_ENUM, [
"copyWithin", ArrayCopyWithin, "copyWithin", ArrayCopyWithin,
"find", ArrayFind, "find", ArrayFind,
"findIndex", ArrayFindIndex, "findIndex", ArrayFindIndex,
......
src/harmony-reflect.js
View file @ 72ab4217
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
var GlobalReflect = global.Reflect; var GlobalReflect = global.Reflect;
InstallFunctions(GlobalReflect, DONT_ENUM, [ $installFunctions(GlobalReflect, DONT_ENUM, [
"apply", $reflectApply, "apply", $reflectApply,
"construct", $reflectConstruct "construct", $reflectConstruct
]); ]);
......
src/harmony-tostring.js
View file @ 72ab4217
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
var GlobalSymbol = global.Symbol; var GlobalSymbol = global.Symbol;
InstallConstants(GlobalSymbol, [ $installConstants(GlobalSymbol, [
// TODO(dslomov, caitp): Move to symbol.js when shipping // TODO(dslomov, caitp): Move to symbol.js when shipping
"toStringTag", symbolToStringTag "toStringTag", symbolToStringTag
]); ]);
......
src/harmony-typedarray.js
View file @ 72ab4217
...@@ -8,8 +8,6 @@ ...@@ -8,8 +8,6 @@
%CheckIsBootstrapping(); %CheckIsBootstrapping();
// -------------------------------------------------------------------
macro TYPED_ARRAYS(FUNCTION) macro TYPED_ARRAYS(FUNCTION)
// arrayIds below should be synchronized with Runtime_TypedArrayInitialize. // arrayIds below should be synchronized with Runtime_TypedArrayInitialize.
FUNCTION(1, Uint8Array, 1) FUNCTION(1, Uint8Array, 1)
...@@ -23,6 +21,13 @@ FUNCTION(8, Float64Array, 8) ...@@ -23,6 +21,13 @@ FUNCTION(8, Float64Array, 8)
FUNCTION(9, Uint8ClampedArray, 1) FUNCTION(9, Uint8ClampedArray, 1)
endmacro endmacro
macro DECLARE_GLOBALS(INDEX, NAME, SIZE)
var GlobalNAME = global.NAME;
endmacro
TYPED_ARRAYS(DECLARE_GLOBALS)
// -------------------------------------------------------------------
macro TYPED_ARRAY_HARMONY_ADDITIONS(ARRAY_ID, NAME, ELEMENT_SIZE) macro TYPED_ARRAY_HARMONY_ADDITIONS(ARRAY_ID, NAME, ELEMENT_SIZE)
...@@ -74,12 +79,12 @@ TYPED_ARRAYS(TYPED_ARRAY_HARMONY_ADDITIONS) ...@@ -74,12 +79,12 @@ TYPED_ARRAYS(TYPED_ARRAY_HARMONY_ADDITIONS)
macro EXTEND_TYPED_ARRAY(ARRAY_ID, NAME, ELEMENT_SIZE) macro EXTEND_TYPED_ARRAY(ARRAY_ID, NAME, ELEMENT_SIZE)
// Set up non-enumerable functions on the object. // Set up non-enumerable functions on the object.
InstallFunctions(global.NAME, DONT_ENUM | DONT_DELETE | READ_ONLY, [ $installFunctions(GlobalNAME, DONT_ENUM | DONT_DELETE | READ_ONLY, [
"of", NAMEOf "of", NAMEOf
]); ]);
// Set up non-enumerable functions on the prototype object. // Set up non-enumerable functions on the prototype object.
InstallFunctions(global.NAME.prototype, DONT_ENUM, [ $installFunctions(GlobalNAME.prototype, DONT_ENUM, [
"forEach", NAMEForEach "forEach", NAMEForEach
]); ]);
endmacro endmacro
......
src/i18n.js
View file @ 72ab4217
This diff is collapsed.
src/json.js
View file @ 72ab4217
...@@ -25,7 +25,7 @@ function Revive(holder, name, reviver) { ...@@ -25,7 +25,7 @@ function Revive(holder, name, reviver) {
} }
} else { } else {
for (var p in val) { for (var p in val) {
if (%_CallFunction(val, p, ObjectHasOwnProperty)) { if (%_CallFunction(val, p, $objectHasOwnProperty)) {
var newElement = Revive(val, p, reviver); var newElement = Revive(val, p, reviver);
if (IS_UNDEFINED(newElement)) { if (IS_UNDEFINED(newElement)) {
delete val[p]; delete val[p];
...@@ -91,7 +91,7 @@ function SerializeObject(value, replacer, stack, indent, gap) { ...@@ -91,7 +91,7 @@ function SerializeObject(value, replacer, stack, indent, gap) {
if (IS_ARRAY(replacer)) { if (IS_ARRAY(replacer)) {
var length = replacer.length; var length = replacer.length;
for (var i = 0; i < length; i++) { for (var i = 0; i < length; i++) {
if (%_CallFunction(replacer, i, ObjectHasOwnProperty)) { if (%_CallFunction(replacer, i, $objectHasOwnProperty)) {
var p = replacer[i]; var p = replacer[i];
var strP = JSONSerialize(p, value, replacer, stack, indent, gap); var strP = JSONSerialize(p, value, replacer, stack, indent, gap);
if (!IS_UNDEFINED(strP)) { if (!IS_UNDEFINED(strP)) {
...@@ -104,7 +104,7 @@ function SerializeObject(value, replacer, stack, indent, gap) { ...@@ -104,7 +104,7 @@ function SerializeObject(value, replacer, stack, indent, gap) {
} }
} else { } else {
for (var p in value) { for (var p in value) {
if (%_CallFunction(value, p, ObjectHasOwnProperty)) { if (%_CallFunction(value, p, $objectHasOwnProperty)) {
var strP = JSONSerialize(p, value, replacer, stack, indent, gap); var strP = JSONSerialize(p, value, replacer, stack, indent, gap);
if (!IS_UNDEFINED(strP)) { if (!IS_UNDEFINED(strP)) {
var member = %QuoteJSONString(p) + ":"; var member = %QuoteJSONString(p) + ":";
...@@ -224,7 +224,7 @@ function JSONStringify(value, replacer, space) { ...@@ -224,7 +224,7 @@ function JSONStringify(value, replacer, space) {
%AddNamedProperty(GlobalJSON, symbolToStringTag, "JSON", READ_ONLY | DONT_ENUM); %AddNamedProperty(GlobalJSON, symbolToStringTag, "JSON", READ_ONLY | DONT_ENUM);
// Set up non-enumerable properties of the JSON object. // Set up non-enumerable properties of the JSON object.
InstallFunctions(GlobalJSON, DONT_ENUM, [ $installFunctions(GlobalJSON, DONT_ENUM, [
"parse", JSONParse, "parse", JSONParse,
"stringify", JSONStringify "stringify", JSONStringify
]); ]);
......
src/macros.py
View file @ 72ab4217
...@@ -152,7 +152,7 @@ macro TO_STRING_INLINE(arg) = (IS_STRING(%IS_VAR(arg)) ? arg : NonStringToString ...@@ -152,7 +152,7 @@ macro TO_STRING_INLINE(arg) = (IS_STRING(%IS_VAR(arg)) ? arg : NonStringToString
macro TO_NUMBER_INLINE(arg) = (IS_NUMBER(%IS_VAR(arg)) ? arg : NonNumberToNumber(arg)); macro TO_NUMBER_INLINE(arg) = (IS_NUMBER(%IS_VAR(arg)) ? arg : NonNumberToNumber(arg));
macro TO_OBJECT_INLINE(arg) = (IS_SPEC_OBJECT(%IS_VAR(arg)) ? arg : ToObject(arg)); macro TO_OBJECT_INLINE(arg) = (IS_SPEC_OBJECT(%IS_VAR(arg)) ? arg : ToObject(arg));
macro JSON_NUMBER_TO_STRING(arg) = ((%_IsSmi(%IS_VAR(arg)) || arg - arg == 0) ? %_NumberToString(arg) : "null"); macro JSON_NUMBER_TO_STRING(arg) = ((%_IsSmi(%IS_VAR(arg)) || arg - arg == 0) ? %_NumberToString(arg) : "null");
macro HAS_OWN_PROPERTY(obj, index) = (%_CallFunction(obj, index, ObjectHasOwnProperty)); macro HAS_OWN_PROPERTY(arg, index) = (%_CallFunction(arg, index, $objectHasOwnProperty));
macro SHOULD_CREATE_WRAPPER(functionName, receiver) = (!IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(functionName)); macro SHOULD_CREATE_WRAPPER(functionName, receiver) = (!IS_SPEC_OBJECT(receiver) && %IsSloppyModeFunction(functionName));
macro HAS_INDEX(array, index, is_array) = ((is_array && %_HasFastPackedElements(%IS_VAR(array))) ? (index < array.length) : (index in array)); macro HAS_INDEX(array, index, is_array) = ((is_array && %_HasFastPackedElements(%IS_VAR(array))) ? (index < array.length) : (index in array));
......
src/math.js
View file @ 72ab4217
...@@ -294,7 +294,7 @@ var Math = new MathConstructor(); ...@@ -294,7 +294,7 @@ var Math = new MathConstructor();
%AddNamedProperty(Math, symbolToStringTag, "Math", READ_ONLY | DONT_ENUM); %AddNamedProperty(Math, symbolToStringTag, "Math", READ_ONLY | DONT_ENUM);
// Set up math constants. // Set up math constants.
InstallConstants(Math, [ $installConstants(Math, [
// ECMA-262, section 15.8.1.1. // ECMA-262, section 15.8.1.1.
"E", 2.7182818284590452354, "E", 2.7182818284590452354,
// ECMA-262, section 15.8.1.2. // ECMA-262, section 15.8.1.2.
...@@ -311,7 +311,7 @@ InstallConstants(Math, [ ...@@ -311,7 +311,7 @@ InstallConstants(Math, [
// Set up non-enumerable functions of the Math object and // Set up non-enumerable functions of the Math object and
// set their names. // set their names.
InstallFunctions(Math, DONT_ENUM, [ $installFunctions(Math, DONT_ENUM, [
"random", MathRandom, "random", MathRandom,
"abs", MathAbs, "abs", MathAbs,
"acos", MathAcosJS, "acos", MathAcosJS,
......
src/messages.js
View file @ 72ab4217
...@@ -238,6 +238,13 @@ function FormatString(format, args) { ...@@ -238,6 +238,13 @@ function FormatString(format, args) {
} }
function NoSideEffectsObjectToString() {
if (IS_UNDEFINED(this) && !IS_UNDETECTABLE(this)) return "[object Undefined]";
if (IS_NULL(this)) return "[object Null]";
return "[object " + %_ClassOf(TO_OBJECT_INLINE(this)) + "]";
}
function NoSideEffectToString(obj) { function NoSideEffectToString(obj) {
if (IS_STRING(obj)) return obj; if (IS_STRING(obj)) return obj;
if (IS_NUMBER(obj)) return %_NumberToString(obj); if (IS_NUMBER(obj)) return %_NumberToString(obj);
...@@ -245,7 +252,7 @@ function NoSideEffectToString(obj) { ...@@ -245,7 +252,7 @@ function NoSideEffectToString(obj) {
if (IS_UNDEFINED(obj)) return 'undefined'; if (IS_UNDEFINED(obj)) return 'undefined';
if (IS_NULL(obj)) return 'null'; if (IS_NULL(obj)) return 'null';
if (IS_FUNCTION(obj)) { if (IS_FUNCTION(obj)) {
var str = %_CallFunction(obj, FunctionToString); var str = %_CallFunction(obj, obj, $functionSourceString);
if (str.length > 128) { if (str.length > 128) {
str = %_SubString(str, 0, 111) + "...<omitted>..." + str = %_SubString(str, 0, 111) + "...<omitted>..." +
%_SubString(str, str.length - 2, str.length); %_SubString(str, str.length - 2, str.length);
...@@ -254,7 +261,7 @@ function NoSideEffectToString(obj) { ...@@ -254,7 +261,7 @@ function NoSideEffectToString(obj) {
} }
if (IS_SYMBOL(obj)) return %_CallFunction(obj, $symbolToString); if (IS_SYMBOL(obj)) return %_CallFunction(obj, $symbolToString);
if (IS_OBJECT(obj) if (IS_OBJECT(obj)
&& %GetDataProperty(obj, "toString") === ObjectToString) { && %GetDataProperty(obj, "toString") === $objectToString) {
var constructor = %GetDataProperty(obj, "constructor"); var constructor = %GetDataProperty(obj, "constructor");
if (typeof constructor == "function") { if (typeof constructor == "function") {
var constructorName = constructor.name; var constructorName = constructor.name;
...@@ -306,7 +313,7 @@ function ToStringCheckErrorObject(obj) { ...@@ -306,7 +313,7 @@ function ToStringCheckErrorObject(obj) {
function ToDetailString(obj) { function ToDetailString(obj) {
if (obj != null && IS_OBJECT(obj) && obj.toString === ObjectToString) { if (obj != null && IS_OBJECT(obj) && obj.toString === $objectToString) {
var constructor = obj.constructor; var constructor = obj.constructor;
if (typeof constructor == "function") { if (typeof constructor == "function") {
var constructorName = constructor.name; var constructorName = constructor.name;
...@@ -584,7 +591,7 @@ function ScriptNameOrSourceURL() { ...@@ -584,7 +591,7 @@ function ScriptNameOrSourceURL() {
} }
SetUpLockedPrototype(Script, [ $setUpLockedPrototype(Script, [
"source", "source",
"name", "name",
"source_url", "source_url",
...@@ -648,7 +655,7 @@ function SourceLocationSourceText() { ...@@ -648,7 +655,7 @@ function SourceLocationSourceText() {
} }
SetUpLockedPrototype(SourceLocation, $setUpLockedPrototype(SourceLocation,
["script", "position", "line", "column", "start", "end"], ["script", "position", "line", "column", "start", "end"],
["sourceText", SourceLocationSourceText] ["sourceText", SourceLocationSourceText]
); );
...@@ -692,7 +699,7 @@ function SourceSliceSourceText() { ...@@ -692,7 +699,7 @@ function SourceSliceSourceText() {
$stringSubstring); $stringSubstring);
} }
SetUpLockedPrototype(SourceSlice, $setUpLockedPrototype(SourceSlice,
["script", "from_line", "to_line", "from_position", "to_position"], ["script", "from_line", "to_line", "from_position", "to_position"],
["sourceText", SourceSliceSourceText] ["sourceText", SourceSliceSourceText]
); );
...@@ -787,8 +794,8 @@ function CallSiteGetMethodName() { ...@@ -787,8 +794,8 @@ function CallSiteGetMethodName() {
var fun = GET_PRIVATE(this, CallSiteFunctionKey); var fun = GET_PRIVATE(this, CallSiteFunctionKey);
var ownName = fun.name; var ownName = fun.name;
if (ownName && receiver && if (ownName && receiver &&
(%_CallFunction(receiver, ownName, ObjectLookupGetter) === fun || (%_CallFunction(receiver, ownName, $objectLookupGetter) === fun ||
%_CallFunction(receiver, ownName, ObjectLookupSetter) === fun || %_CallFunction(receiver, ownName, $objectLookupSetter) === fun ||
(IS_OBJECT(receiver) && %GetDataProperty(receiver, ownName) === fun))) { (IS_OBJECT(receiver) && %GetDataProperty(receiver, ownName) === fun))) {
// To handle DontEnum properties we guess that the method has // To handle DontEnum properties we guess that the method has
// the same name as the function. // the same name as the function.
...@@ -796,8 +803,8 @@ function CallSiteGetMethodName() { ...@@ -796,8 +803,8 @@ function CallSiteGetMethodName() {
} }
var name = null; var name = null;
for (var prop in receiver) { for (var prop in receiver) {
if (%_CallFunction(receiver, prop, ObjectLookupGetter) === fun || if (%_CallFunction(receiver, prop, $objectLookupGetter) === fun ||
%_CallFunction(receiver, prop, ObjectLookupSetter) === fun || %_CallFunction(receiver, prop, $objectLookupSetter) === fun ||
(IS_OBJECT(receiver) && %GetDataProperty(receiver, prop) === fun)) { (IS_OBJECT(receiver) && %GetDataProperty(receiver, prop) === fun)) {
// If we find more than one match bail out to avoid confusion. // If we find more than one match bail out to avoid confusion.
if (name) { if (name) {
...@@ -914,7 +921,7 @@ function CallSiteToString() { ...@@ -914,7 +921,7 @@ function CallSiteToString() {
return line; return line;
} }
SetUpLockedPrototype(CallSite, ["receiver", "fun", "pos"], [ $setUpLockedPrototype(CallSite, ["receiver", "fun", "pos"], [
"getThis", CallSiteGetThis, "getThis", CallSiteGetThis,
"getTypeName", CallSiteGetTypeName, "getTypeName", CallSiteGetTypeName,
"isToplevel", CallSiteIsToplevel, "isToplevel", CallSiteIsToplevel,
...@@ -1103,9 +1110,9 @@ var StackTraceSetter = function(v) { ...@@ -1103,9 +1110,9 @@ var StackTraceSetter = function(v) {
// when constructing the initial Error prototytpes. // when constructing the initial Error prototytpes.
var captureStackTrace = function captureStackTrace(obj, cons_opt) { var captureStackTrace = function captureStackTrace(obj, cons_opt) {
// Define accessors first, as this may fail and throw. // Define accessors first, as this may fail and throw.
ObjectDefineProperty(obj, 'stack', { get: StackTraceGetter, $objectDefineProperty(obj, 'stack', { get: StackTraceGetter,
set: StackTraceSetter, set: StackTraceSetter,
configurable: true }); configurable: true });
%CollectStackTrace(obj, cons_opt ? cons_opt : captureStackTrace); %CollectStackTrace(obj, cons_opt ? cons_opt : captureStackTrace);
} }
...@@ -1229,7 +1236,8 @@ function ErrorToString() { ...@@ -1229,7 +1236,8 @@ function ErrorToString() {
} }
} }
InstallFunctions(GlobalError.prototype, DONT_ENUM, ['toString', ErrorToString]); $installFunctions(GlobalError.prototype, DONT_ENUM,
['toString', ErrorToString]);
$errorToString = ErrorToString; $errorToString = ErrorToString;
$formatMessage = FormatMessage; $formatMessage = FormatMessage;
......
src/mirror-debugger.js
View file @ 72ab4217
...@@ -1008,7 +1008,7 @@ FunctionMirror.prototype.source = function() { ...@@ -1008,7 +1008,7 @@ FunctionMirror.prototype.source = function() {
// Return source if function is resolved. Otherwise just fall through to // Return source if function is resolved. Otherwise just fall through to
// return undefined. // return undefined.
if (this.resolved()) { if (this.resolved()) {
return builtins.FunctionSourceString(this.value_); return builtins.$functionSourceString(this.value_);
} }
}; };
......
src/object-observe.js
View file @ 72ab4217
...@@ -377,7 +377,7 @@ function ObjectObserve(object, callback, acceptList) { ...@@ -377,7 +377,7 @@ function ObjectObserve(object, callback, acceptList) {
throw MakeTypeError("observe_global_proxy", ["observe"]); throw MakeTypeError("observe_global_proxy", ["observe"]);
if (!IS_SPEC_FUNCTION(callback)) if (!IS_SPEC_FUNCTION(callback))
throw MakeTypeError("observe_non_function", ["observe"]); throw MakeTypeError("observe_non_function", ["observe"]);
if (ObjectIsFrozen(callback)) if ($objectIsFrozen(callback))
throw MakeTypeError("observe_callback_frozen"); throw MakeTypeError("observe_callback_frozen");
var objectObserveFn = %GetObjectContextObjectObserve(object); var objectObserveFn = %GetObjectContextObjectObserve(object);
...@@ -470,7 +470,7 @@ function ObjectInfoEnqueueExternalChangeRecord(objectInfo, changeRecord, type) { ...@@ -470,7 +470,7 @@ function ObjectInfoEnqueueExternalChangeRecord(objectInfo, changeRecord, type) {
%DefineDataPropertyUnchecked( %DefineDataPropertyUnchecked(
newRecord, prop, changeRecord[prop], READ_ONLY + DONT_DELETE); newRecord, prop, changeRecord[prop], READ_ONLY + DONT_DELETE);
} }
ObjectFreezeJS(newRecord); $objectFreeze(newRecord);
ObjectInfoEnqueueInternalChangeRecord(objectInfo, newRecord); ObjectInfoEnqueueInternalChangeRecord(objectInfo, newRecord);
} }
...@@ -522,8 +522,8 @@ function EnqueueSpliceRecord(array, index, removed, addedCount) { ...@@ -522,8 +522,8 @@ function EnqueueSpliceRecord(array, index, removed, addedCount) {
addedCount: addedCount addedCount: addedCount
}; };
ObjectFreezeJS(changeRecord); $objectFreeze(changeRecord);
ObjectFreezeJS(changeRecord.removed); $objectFreeze(changeRecord.removed);
ObjectInfoEnqueueInternalChangeRecord(objectInfo, changeRecord); ObjectInfoEnqueueInternalChangeRecord(objectInfo, changeRecord);
} }
...@@ -547,7 +547,7 @@ function NotifyChange(type, object, name, oldValue) { ...@@ -547,7 +547,7 @@ function NotifyChange(type, object, name, oldValue) {
}; };
} }
ObjectFreezeJS(changeRecord); $objectFreeze(changeRecord);
ObjectInfoEnqueueInternalChangeRecord(objectInfo, changeRecord); ObjectInfoEnqueueInternalChangeRecord(objectInfo, changeRecord);
} }
...@@ -604,7 +604,7 @@ function ObjectGetNotifier(object) { ...@@ -604,7 +604,7 @@ function ObjectGetNotifier(object) {
if (%IsJSGlobalProxy(object)) if (%IsJSGlobalProxy(object))
throw MakeTypeError("observe_global_proxy", ["getNotifier"]); throw MakeTypeError("observe_global_proxy", ["getNotifier"]);
if (ObjectIsFrozen(object)) return null; if ($objectIsFrozen(object)) return null;
if (!%ObjectWasCreatedInCurrentOrigin(object)) return null; if (!%ObjectWasCreatedInCurrentOrigin(object)) return null;
...@@ -662,17 +662,17 @@ function ObserveMicrotaskRunner() { ...@@ -662,17 +662,17 @@ function ObserveMicrotaskRunner() {
// ------------------------------------------------------------------- // -------------------------------------------------------------------
InstallFunctions(GlobalObject, DONT_ENUM, [ $installFunctions(GlobalObject, DONT_ENUM, [
"deliverChangeRecords", ObjectDeliverChangeRecords, "deliverChangeRecords", ObjectDeliverChangeRecords,
"getNotifier", ObjectGetNotifier, "getNotifier", ObjectGetNotifier,
"observe", ObjectObserve, "observe", ObjectObserve,
"unobserve", ObjectUnobserve "unobserve", ObjectUnobserve
]); ]);
InstallFunctions(GlobalArray, DONT_ENUM, [ $installFunctions(GlobalArray, DONT_ENUM, [
"observe", ArrayObserve, "observe", ArrayObserve,
"unobserve", ArrayUnobserve "unobserve", ArrayUnobserve
]); ]);
InstallFunctions(notifierPrototype, DONT_ENUM, [ $installFunctions(notifierPrototype, DONT_ENUM, [
"notify", ObjectNotifierNotify, "notify", ObjectNotifierNotify,
"performChange", ObjectNotifierPerformChange "performChange", ObjectNotifierPerformChange
]); ]);
......
src/promise.js
View file @ 72ab4217
...@@ -366,7 +366,7 @@ function PromiseHasUserDefinedRejectHandler() { ...@@ -366,7 +366,7 @@ function PromiseHasUserDefinedRejectHandler() {
%AddNamedProperty(GlobalPromise.prototype, symbolToStringTag, "Promise", %AddNamedProperty(GlobalPromise.prototype, symbolToStringTag, "Promise",
DONT_ENUM | READ_ONLY); DONT_ENUM | READ_ONLY);
InstallFunctions(GlobalPromise, DONT_ENUM, [ $installFunctions(GlobalPromise, DONT_ENUM, [
"defer", PromiseDeferred, "defer", PromiseDeferred,
"accept", PromiseResolved, "accept", PromiseResolved,
"reject", PromiseRejected, "reject", PromiseRejected,
...@@ -375,7 +375,7 @@ InstallFunctions(GlobalPromise, DONT_ENUM, [ ...@@ -375,7 +375,7 @@ InstallFunctions(GlobalPromise, DONT_ENUM, [
"resolve", PromiseCast "resolve", PromiseCast
]); ]);
InstallFunctions(GlobalPromise.prototype, DONT_ENUM, [ $installFunctions(GlobalPromise.prototype, DONT_ENUM, [
"chain", PromiseChain, "chain", PromiseChain,
"then", PromiseThen, "then", PromiseThen,
"catch", PromiseCatch "catch", PromiseCatch
......
src/proxy.js
View file @ 72ab4217
...@@ -176,7 +176,7 @@ function ProxyEnumerate(proxy) { ...@@ -176,7 +176,7 @@ function ProxyEnumerate(proxy) {
if (IS_UNDEFINED(handler.enumerate)) { if (IS_UNDEFINED(handler.enumerate)) {
return %Apply(DerivedEnumerateTrap, handler, [], 0, 0) return %Apply(DerivedEnumerateTrap, handler, [], 0, 0)
} else { } else {
return ToNameArray(handler.enumerate(), "enumerate", false) return $toNameArray(handler.enumerate(), "enumerate", false)
} }
} }
...@@ -186,7 +186,7 @@ var Proxy = new GlobalObject(); ...@@ -186,7 +186,7 @@ var Proxy = new GlobalObject();
%AddNamedProperty(global, "Proxy", Proxy, DONT_ENUM); %AddNamedProperty(global, "Proxy", Proxy, DONT_ENUM);
//Set up non-enumerable properties of the Proxy object. //Set up non-enumerable properties of the Proxy object.
InstallFunctions(Proxy, DONT_ENUM, [ $installFunctions(Proxy, DONT_ENUM, [
"create", ProxyCreate, "create", ProxyCreate,
"createFunction", ProxyCreateFunction "createFunction", ProxyCreateFunction
]) ])
......
src/regexp.js
View file @ 72ab4217
...@@ -363,7 +363,7 @@ function RegExpMakeCaptureGetter(n) { ...@@ -363,7 +363,7 @@ function RegExpMakeCaptureGetter(n) {
GlobalRegExp.prototype, 'constructor', GlobalRegExp, DONT_ENUM); GlobalRegExp.prototype, 'constructor', GlobalRegExp, DONT_ENUM);
%SetCode(GlobalRegExp, RegExpConstructor); %SetCode(GlobalRegExp, RegExpConstructor);
InstallFunctions(GlobalRegExp.prototype, DONT_ENUM, [ $installFunctions(GlobalRegExp.prototype, DONT_ENUM, [
"exec", RegExpExecJS, "exec", RegExpExecJS,
"test", RegExpTest, "test", RegExpTest,
"toString", RegExpToString, "toString", RegExpToString,
......
src/string-iterator.js
View file @ 72ab4217
...@@ -88,16 +88,16 @@ function StringPrototypeIterator() { ...@@ -88,16 +88,16 @@ function StringPrototypeIterator() {
%FunctionSetPrototype(StringIterator, new GlobalObject()); %FunctionSetPrototype(StringIterator, new GlobalObject());
%FunctionSetInstanceClassName(StringIterator, 'String Iterator'); %FunctionSetInstanceClassName(StringIterator, 'String Iterator');
InstallFunctions(StringIterator.prototype, DONT_ENUM, [ $installFunctions(StringIterator.prototype, DONT_ENUM, [
'next', StringIteratorNext 'next', StringIteratorNext
]); ]);
SetFunctionName(StringIteratorIterator, symbolIterator); $setFunctionName(StringIteratorIterator, symbolIterator);
%AddNamedProperty(StringIterator.prototype, symbolIterator, %AddNamedProperty(StringIterator.prototype, symbolIterator,
StringIteratorIterator, DONT_ENUM); StringIteratorIterator, DONT_ENUM);
%AddNamedProperty(StringIterator.prototype, symbolToStringTag, %AddNamedProperty(StringIterator.prototype, symbolToStringTag,
"String Iterator", READ_ONLY | DONT_ENUM); "String Iterator", READ_ONLY | DONT_ENUM);
SetFunctionName(StringPrototypeIterator, symbolIterator); $setFunctionName(StringPrototypeIterator, symbolIterator);
%AddNamedProperty(GlobalString.prototype, symbolIterator, %AddNamedProperty(GlobalString.prototype, symbolIterator,
StringPrototypeIterator, DONT_ENUM); StringPrototypeIterator, DONT_ENUM);
......
src/string.js
View file @ 72ab4217
...@@ -1118,14 +1118,14 @@ function StringRaw(callSite) { ...@@ -1118,14 +1118,14 @@ function StringRaw(callSite) {
GlobalString.prototype, "constructor", GlobalString, DONT_ENUM); GlobalString.prototype, "constructor", GlobalString, DONT_ENUM);
// Set up the non-enumerable functions on the String object. // Set up the non-enumerable functions on the String object.
InstallFunctions(GlobalString, DONT_ENUM, [ $installFunctions(GlobalString, DONT_ENUM, [
"fromCharCode", StringFromCharCode, "fromCharCode", StringFromCharCode,
"fromCodePoint", StringFromCodePoint, "fromCodePoint", StringFromCodePoint,
"raw", StringRaw "raw", StringRaw
]); ]);
// Set up the non-enumerable functions on the String prototype object. // Set up the non-enumerable functions on the String prototype object.
InstallFunctions(GlobalString.prototype, DONT_ENUM, [ $installFunctions(GlobalString.prototype, DONT_ENUM, [
"valueOf", StringValueOf, "valueOf", StringValueOf,
"toString", StringToString, "toString", StringToString,
"charAt", StringCharAtJS, "charAt", StringCharAtJS,
......
src/symbol.js
View file @ 72ab4217
...@@ -73,7 +73,7 @@ function ObjectGetOwnPropertySymbols(obj) { ...@@ -73,7 +73,7 @@ function ObjectGetOwnPropertySymbols(obj) {
// TODO(arv): Proxies use a shared trap for String and Symbol keys. // TODO(arv): Proxies use a shared trap for String and Symbol keys.
return ObjectGetOwnPropertyKeys(obj, PROPERTY_ATTRIBUTES_STRING); return $objectGetOwnPropertyKeys(obj, PROPERTY_ATTRIBUTES_STRING);
} }
//------------------------------------------------------------------- //-------------------------------------------------------------------
...@@ -81,7 +81,7 @@ function ObjectGetOwnPropertySymbols(obj) { ...@@ -81,7 +81,7 @@ function ObjectGetOwnPropertySymbols(obj) {
%SetCode(GlobalSymbol, SymbolConstructor); %SetCode(GlobalSymbol, SymbolConstructor);
%FunctionSetPrototype(GlobalSymbol, new GlobalObject()); %FunctionSetPrototype(GlobalSymbol, new GlobalObject());
InstallConstants(GlobalSymbol, [ $installConstants(GlobalSymbol, [
// TODO(rossberg): expose when implemented. // TODO(rossberg): expose when implemented.
// "hasInstance", symbolHasInstance, // "hasInstance", symbolHasInstance,
// "isConcatSpreadable", symbolIsConcatSpreadable, // "isConcatSpreadable", symbolIsConcatSpreadable,
...@@ -93,7 +93,7 @@ InstallConstants(GlobalSymbol, [ ...@@ -93,7 +93,7 @@ InstallConstants(GlobalSymbol, [
"unscopables", symbolUnscopables "unscopables", symbolUnscopables
]); ]);
InstallFunctions(GlobalSymbol, DONT_ENUM, [ $installFunctions(GlobalSymbol, DONT_ENUM, [
"for", SymbolFor, "for", SymbolFor,
"keyFor", SymbolKeyFor "keyFor", SymbolKeyFor
]); ]);
...@@ -103,12 +103,12 @@ InstallFunctions(GlobalSymbol, DONT_ENUM, [ ...@@ -103,12 +103,12 @@ InstallFunctions(GlobalSymbol, DONT_ENUM, [
%AddNamedProperty( %AddNamedProperty(
GlobalSymbol.prototype, symbolToStringTag, "Symbol", DONT_ENUM | READ_ONLY); GlobalSymbol.prototype, symbolToStringTag, "Symbol", DONT_ENUM | READ_ONLY);
InstallFunctions(GlobalSymbol.prototype, DONT_ENUM, [ $installFunctions(GlobalSymbol.prototype, DONT_ENUM, [
"toString", SymbolToString, "toString", SymbolToString,
"valueOf", SymbolValueOf "valueOf", SymbolValueOf
]); ]);
InstallFunctions(GlobalObject, DONT_ENUM, [ $installFunctions(GlobalObject, DONT_ENUM, [
"getOwnPropertySymbols", ObjectGetOwnPropertySymbols "getOwnPropertySymbols", ObjectGetOwnPropertySymbols
]); ]);
......
src/third_party/fdlibm/fdlibm.js
View file @ 72ab4217
...@@ -1012,7 +1012,7 @@ function MathLog2(x) { ...@@ -1012,7 +1012,7 @@ function MathLog2(x) {
//------------------------------------------------------------------- //-------------------------------------------------------------------
InstallFunctions(GlobalMath, DONT_ENUM, [ $installFunctions(GlobalMath, DONT_ENUM, [
"cos", MathCos, "cos", MathCos,
"sin", MathSin, "sin", MathSin,
"tan", MathTan, "tan", MathTan,
......
src/typedarray.js
View file @ 72ab4217
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
var GlobalArray = global.Array; var GlobalArray = global.Array;
var GlobalArrayBuffer = global.ArrayBuffer; var GlobalArrayBuffer = global.ArrayBuffer;
var GlobalDataView = global.DataView;
var GlobalObject = global.Object;
// --------------- Typed Arrays ---------------------
macro TYPED_ARRAYS(FUNCTION) macro TYPED_ARRAYS(FUNCTION)
// arrayIds below should be synchronized with Runtime_TypedArrayInitialize. // arrayIds below should be synchronized with Runtime_TypedArrayInitialize.
FUNCTION(1, Uint8Array, 1) FUNCTION(1, Uint8Array, 1)
...@@ -25,6 +26,14 @@ FUNCTION(8, Float64Array, 8) ...@@ -25,6 +26,14 @@ FUNCTION(8, Float64Array, 8)
FUNCTION(9, Uint8ClampedArray, 1) FUNCTION(9, Uint8ClampedArray, 1)
endmacro endmacro
macro DECLARE_GLOBALS(INDEX, NAME, SIZE)
var GlobalNAME = global.NAME;
endmacro
TYPED_ARRAYS(DECLARE_GLOBALS)
// --------------- Typed Arrays ---------------------
macro TYPED_ARRAY_CONSTRUCTOR(ARRAY_ID, NAME, ELEMENT_SIZE) macro TYPED_ARRAY_CONSTRUCTOR(ARRAY_ID, NAME, ELEMENT_SIZE)
function NAMEConstructByArrayBuffer(obj, buffer, byteOffset, length) { function NAMEConstructByArrayBuffer(obj, buffer, byteOffset, length) {
if (!IS_UNDEFINED(byteOffset)) { if (!IS_UNDEFINED(byteOffset)) {
...@@ -145,8 +154,6 @@ function NAME_GetLength() { ...@@ -145,8 +154,6 @@ function NAME_GetLength() {
return %_TypedArrayGetLength(this); return %_TypedArrayGetLength(this);
} }
var $NAME = global.NAME;
function NAMESubArray(begin, end) { function NAMESubArray(begin, end) {
if (!(%_ClassOf(this) === 'NAME')) { if (!(%_ClassOf(this) === 'NAME')) {
throw MakeTypeError(kIncompatibleMethodReceiver, "NAME.subarray", this); throw MakeTypeError(kIncompatibleMethodReceiver, "NAME.subarray", this);
...@@ -175,8 +182,8 @@ function NAMESubArray(begin, end) { ...@@ -175,8 +182,8 @@ function NAMESubArray(begin, end) {
var newLength = endInt - beginInt; var newLength = endInt - beginInt;
var beginByteOffset = var beginByteOffset =
%_ArrayBufferViewGetByteOffset(this) + beginInt * ELEMENT_SIZE; %_ArrayBufferViewGetByteOffset(this) + beginInt * ELEMENT_SIZE;
return new $NAME(%TypedArrayGetBuffer(this), return new GlobalNAME(%TypedArrayGetBuffer(this),
beginByteOffset, newLength); beginByteOffset, newLength);
} }
endmacro endmacro
...@@ -297,26 +304,26 @@ function TypedArrayGetToStringTag() { ...@@ -297,26 +304,26 @@ function TypedArrayGetToStringTag() {
// ------------------------------------------------------------------- // -------------------------------------------------------------------
macro SETUP_TYPED_ARRAY(ARRAY_ID, NAME, ELEMENT_SIZE) macro SETUP_TYPED_ARRAY(ARRAY_ID, NAME, ELEMENT_SIZE)
%SetCode(global.NAME, NAMEConstructor); %SetCode(GlobalNAME, NAMEConstructor);
%FunctionSetPrototype(global.NAME, new $Object()); %FunctionSetPrototype(GlobalNAME, new GlobalObject());
%AddNamedProperty(global.NAME, "BYTES_PER_ELEMENT", ELEMENT_SIZE, %AddNamedProperty(GlobalNAME, "BYTES_PER_ELEMENT", ELEMENT_SIZE,
READ_ONLY | DONT_ENUM | DONT_DELETE); READ_ONLY | DONT_ENUM | DONT_DELETE);
%AddNamedProperty(global.NAME.prototype, %AddNamedProperty(GlobalNAME.prototype,
"constructor", global.NAME, DONT_ENUM); "constructor", global.NAME, DONT_ENUM);
%AddNamedProperty(global.NAME.prototype, %AddNamedProperty(GlobalNAME.prototype,
"BYTES_PER_ELEMENT", ELEMENT_SIZE, "BYTES_PER_ELEMENT", ELEMENT_SIZE,
READ_ONLY | DONT_ENUM | DONT_DELETE); READ_ONLY | DONT_ENUM | DONT_DELETE);
InstallGetter(global.NAME.prototype, "buffer", NAME_GetBuffer); $installGetter(GlobalNAME.prototype, "buffer", NAME_GetBuffer);
InstallGetter(global.NAME.prototype, "byteOffset", NAME_GetByteOffset, $installGetter(GlobalNAME.prototype, "byteOffset", NAME_GetByteOffset,
DONT_ENUM | DONT_DELETE); DONT_ENUM | DONT_DELETE);
InstallGetter(global.NAME.prototype, "byteLength", NAME_GetByteLength, $installGetter(GlobalNAME.prototype, "byteLength", NAME_GetByteLength,
DONT_ENUM | DONT_DELETE); DONT_ENUM | DONT_DELETE);
InstallGetter(global.NAME.prototype, "length", NAME_GetLength, $installGetter(GlobalNAME.prototype, "length", NAME_GetLength,
DONT_ENUM | DONT_DELETE); DONT_ENUM | DONT_DELETE);
InstallGetter(global.NAME.prototype, symbolToStringTag, $installGetter(GlobalNAME.prototype, symbolToStringTag,
TypedArrayGetToStringTag); TypedArrayGetToStringTag);
InstallFunctions(global.NAME.prototype, DONT_ENUM, [ $installFunctions(GlobalNAME.prototype, DONT_ENUM, [
"subarray", NAMESubArray, "subarray", NAMESubArray,
"set", TypedArraySet "set", TypedArraySet
]); ]);
...@@ -326,8 +333,6 @@ TYPED_ARRAYS(SETUP_TYPED_ARRAY) ...@@ -326,8 +333,6 @@ TYPED_ARRAYS(SETUP_TYPED_ARRAY)
// --------------------------- DataView ----------------------------- // --------------------------- DataView -----------------------------
var $DataView = global.DataView;
function DataViewConstructor(buffer, byteOffset, byteLength) { // length = 3 function DataViewConstructor(buffer, byteOffset, byteLength) { // length = 3
if (%_IsConstructCall()) { if (%_IsConstructCall()) {
if (!IS_ARRAYBUFFER(buffer)) { if (!IS_ARRAYBUFFER(buffer)) {
...@@ -430,19 +435,20 @@ endmacro ...@@ -430,19 +435,20 @@ endmacro
DATA_VIEW_TYPES(DATA_VIEW_GETTER_SETTER) DATA_VIEW_TYPES(DATA_VIEW_GETTER_SETTER)
// Setup the DataView constructor. // Setup the DataView constructor.
%SetCode($DataView, DataViewConstructor); %SetCode(GlobalDataView, DataViewConstructor);
%FunctionSetPrototype($DataView, new $Object); %FunctionSetPrototype(GlobalDataView, new GlobalObject);
// Set up constructor property on the DataView prototype. // Set up constructor property on the DataView prototype.
%AddNamedProperty($DataView.prototype, "constructor", $DataView, DONT_ENUM); %AddNamedProperty(GlobalDataView.prototype, "constructor", GlobalDataView,
%AddNamedProperty( DONT_ENUM);
$DataView.prototype, symbolToStringTag, "DataView", READ_ONLY|DONT_ENUM); %AddNamedProperty(GlobalDataView.prototype, symbolToStringTag, "DataView",
READ_ONLY|DONT_ENUM);
InstallGetter($DataView.prototype, "buffer", DataViewGetBufferJS); $installGetter(GlobalDataView.prototype, "buffer", DataViewGetBufferJS);
InstallGetter($DataView.prototype, "byteOffset", DataViewGetByteOffset); $installGetter(GlobalDataView.prototype, "byteOffset", DataViewGetByteOffset);
InstallGetter($DataView.prototype, "byteLength", DataViewGetByteLength); $installGetter(GlobalDataView.prototype, "byteLength", DataViewGetByteLength);
InstallFunctions($DataView.prototype, DONT_ENUM, [ $installFunctions(GlobalDataView.prototype, DONT_ENUM, [
"getInt8", DataViewGetInt8JS, "getInt8", DataViewGetInt8JS,
"setInt8", DataViewSetInt8JS, "setInt8", DataViewSetInt8JS,
......
src/uri.js
View file @ 72ab4217
...@@ -356,7 +356,7 @@ function URIEncodeComponent(component) { ...@@ -356,7 +356,7 @@ function URIEncodeComponent(component) {
// Set up non-enumerable URI functions on the global object and set // Set up non-enumerable URI functions on the global object and set
// their names. // their names.
InstallFunctions(global, DONT_ENUM, [ $installFunctions(global, DONT_ENUM, [
"escape", URIEscapeJS, "escape", URIEscapeJS,
"unescape", URIUnescapeJS, "unescape", URIUnescapeJS,
"decodeURI", URIDecode, "decodeURI", URIDecode,
......
src/v8natives.js
View file @ 72ab4217
This diff is collapsed.
src/weak-collection.js
View file @ 72ab4217
...@@ -90,7 +90,7 @@ function WeakMapDelete(key) { ...@@ -90,7 +90,7 @@ function WeakMapDelete(key) {
DONT_ENUM | READ_ONLY); DONT_ENUM | READ_ONLY);
// Set up the non-enumerable functions on the WeakMap prototype object. // Set up the non-enumerable functions on the WeakMap prototype object.
InstallFunctions(GlobalWeakMap.prototype, DONT_ENUM, [ $installFunctions(GlobalWeakMap.prototype, DONT_ENUM, [
"get", WeakMapGet, "get", WeakMapGet,
"set", WeakMapSet, "set", WeakMapSet,
"has", WeakMapHas, "has", WeakMapHas,
...@@ -162,7 +162,7 @@ function WeakSetDelete(value) { ...@@ -162,7 +162,7 @@ function WeakSetDelete(value) {
DONT_ENUM | READ_ONLY); DONT_ENUM | READ_ONLY);
// Set up the non-enumerable functions on the WeakSet prototype object. // Set up the non-enumerable functions on the WeakSet prototype object.
InstallFunctions(GlobalWeakSet.prototype, DONT_ENUM, [ $installFunctions(GlobalWeakSet.prototype, DONT_ENUM, [
"add", WeakSetAdd, "add", WeakSetAdd,
"has", WeakSetHas, "has", WeakSetHas,
"delete", WeakSetDelete "delete", WeakSetDelete
......
test/mjsunit/compiler/jsnatives.js
View file @ 72ab4217
...@@ -29,5 +29,5 @@ ...@@ -29,5 +29,5 @@
// Test call of JS runtime functions. // Test call of JS runtime functions.
var a = %GlobalParseInt("21", 16); var a = %$isNaN(0/0);
assertEquals(33, a); assertEquals(true, a);
tools/jsmin.py
View file @ 72ab4217
...@@ -100,6 +100,12 @@ class JavaScriptMinifier(object): ...@@ -100,6 +100,12 @@ class JavaScriptMinifier(object):
The string that should replace the match in the rewritten program. The string that should replace the match in the rewritten program.
""" """
matched_text = m.group(0) matched_text = m.group(0)
if matched_text.startswith("`") and matched_text.endswith("`"):
return re.sub(r"\$\{([\w$%]+)\}",
lambda m: '${' + self.FindNewName(m.group(1)) + '}',
matched_text)
if matched_text == "{": if matched_text == "{":
self.Push() self.Push()
return matched_text return matched_text
...@@ -152,6 +158,9 @@ class JavaScriptMinifier(object): ...@@ -152,6 +158,9 @@ class JavaScriptMinifier(object):
return self.map[var_name] return self.map[var_name]
if self.nesting == 0: if self.nesting == 0:
return var_name return var_name
# Do not rename arguments object.
if var_name == 'arguments':
return 'arguments'
while True: while True:
identifier_first_char = self.identifier_counter % 52 identifier_first_char = self.identifier_counter % 52
identifier_second_char = self.identifier_counter // 52 identifier_second_char = self.identifier_counter // 52
...@@ -184,6 +193,8 @@ class JavaScriptMinifier(object): ...@@ -184,6 +193,8 @@ class JavaScriptMinifier(object):
return entire_match return entire_match
if re.match(r'".*"$', entire_match): if re.match(r'".*"$', entire_match):
return entire_match return entire_match
if re.match(r"`.*`$", entire_match):
return entire_match
if re.match(r"/.+/$", entire_match): if re.match(r"/.+/$", entire_match):
return entire_match return entire_match
return replacement return replacement
...@@ -227,8 +238,10 @@ class JavaScriptMinifier(object): ...@@ -227,8 +238,10 @@ class JavaScriptMinifier(object):
# This regexp can handle embedded backslash-escaped characters including # This regexp can handle embedded backslash-escaped characters including
# embedded backslash-escaped double quotes. # embedded backslash-escaped double quotes.
double_quoted_string = r'"(?:[^"\\]|\\.)*"' double_quoted_string = r'"(?:[^"\\]|\\.)*"'
# A regexp that matches a literal string surrounded by 'double quotes'. # A regexp that matches a literal string surrounded by 'single quotes'.
single_quoted_string = r"'(?:[^'\\]|\\.)*'" single_quoted_string = r"'(?:[^'\\]|\\.)*'"
# A regexp that matches a template string
template_string = r"`(?:[^'\\]|\\.)*`"
# A regexp that matches a regexp literal surrounded by /slashes/. # A regexp that matches a regexp literal surrounded by /slashes/.
# Don't allow a regexp to have a ) before the first ( since that's a # Don't allow a regexp to have a ) before the first ( since that's a
# syntax error and it's probably just two unrelated slashes. # syntax error and it's probably just two unrelated slashes.
...@@ -238,6 +251,7 @@ class JavaScriptMinifier(object): ...@@ -238,6 +251,7 @@ class JavaScriptMinifier(object):
# Replace multiple spaces with a single space. # Replace multiple spaces with a single space.
line = re.sub("|".join([double_quoted_string, line = re.sub("|".join([double_quoted_string,
single_quoted_string, single_quoted_string,
template_string,
slash_quoted_regexp, slash_quoted_regexp,
"( )+"]), "( )+"]),
self.RemoveSpaces, self.RemoveSpaces,
...@@ -246,6 +260,7 @@ class JavaScriptMinifier(object): ...@@ -246,6 +260,7 @@ class JavaScriptMinifier(object):
# and after the space. % and $ are counted as identifier characters. # and after the space. % and $ are counted as identifier characters.
line = re.sub("|".join([double_quoted_string, line = re.sub("|".join([double_quoted_string,
single_quoted_string, single_quoted_string,
template_string,
slash_quoted_regexp, slash_quoted_regexp,
r"(?<![a-zA-Z_0-9$%]) | (?![a-zA-Z_0-9$%])()"]), r"(?<![a-zA-Z_0-9$%]) | (?![a-zA-Z_0-9$%])()"]),
self.RemoveSpaces, self.RemoveSpaces,
...@@ -269,6 +284,7 @@ class JavaScriptMinifier(object): ...@@ -269,6 +284,7 @@ class JavaScriptMinifier(object):
variable_use_regexp = r"(?<![.\w$%])[\w$%]+" + block_trailing_colon variable_use_regexp = r"(?<![.\w$%])[\w$%]+" + block_trailing_colon
line = re.sub("|".join([double_quoted_string, line = re.sub("|".join([double_quoted_string,
single_quoted_string, single_quoted_string,
template_string,
slash_quoted_regexp, slash_quoted_regexp,
r"\{", # Curly braces. r"\{", # Curly braces.
r"\}", r"\}",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment