Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(531)

Unified Diff: lib/runtime/dart/_interceptors.js

Issue 1034273003: fix for static methods and names banned in strict mode (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | lib/runtime/dart/_internal.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/_interceptors.js
diff --git a/lib/runtime/dart/_interceptors.js b/lib/runtime/dart/_interceptors.js
index 062285cd427ffabfbe97bae67cc303689ccb0232..af2074b85337fcf3c232e4ed86196ab4775c1185 100644
--- a/lib/runtime/dart/_interceptors.js
+++ b/lib/runtime/dart/_interceptors.js
@@ -44,7 +44,7 @@ var _interceptors;
return dart.as(allocation, JSArray$(E));
}
JSArray$markFixed(allocation) {
- return dart.as(markFixedList(new JSArray.typed(allocation)), JSArray$(E));
+ return dart.as(JSArray.markFixedList(new JSArray.typed(allocation)), JSArray$(E));
}
JSArray$markGrowable(allocation) {
return dart.as(new JSArray.typed(allocation), JSArray$(E));
@@ -372,7 +372,9 @@ var _interceptors;
return JSExtendableArray;
});
let JSExtendableArray = JSExtendableArray$(dart.dynamic);
- let _handleIEtoString$ = Symbol('_handleIEtoString');
+ let _MIN_INT32 = Symbol('_MIN_INT32');
+ let _MAX_INT32 = Symbol('_MAX_INT32');
+ let _handleIEtoString = Symbol('_handleIEtoString');
let _isInt32 = Symbol('_isInt32');
let _tdivFast = Symbol('_tdivFast');
let _tdivSlow = Symbol('_tdivSlow');
@@ -435,7 +437,7 @@ var _interceptors;
return this['>'](0) ? 1 : this['<'](0) ? -1 : this;
}
toInt() {
- if (dart.notNull(this['>='](JSNumber._MIN_INT32)) && dart.notNull(this['<='](JSNumber._MAX_INT32))) {
+ if (dart.notNull(this['>='](JSNumber[_MIN_INT32])) && dart.notNull(this['<='](JSNumber[_MAX_INT32]))) {
return this | 0;
}
if (isFinite(this)) {
@@ -534,9 +536,9 @@ var _interceptors;
if (result.codeUnitAt(dart.notNull(result.length) - 1) !== rightParenCode) {
return result;
}
- return _handleIEtoString(result);
+ return JSNumber[_handleIEtoString](result);
}
- static [_handleIEtoString$](result) {
+ static [_handleIEtoString](result) {
let match = /^([\da-z]+)(?:\.([\da-z]+))?\(e\+(\d+)\)$/.exec(result);
if (match === null) {
throw new core.UnsupportedError(`Unexpected toString result: ${result}`);
@@ -687,11 +689,11 @@ var _interceptors;
}
JSNumber._MIN_INT32 = -2147483648;
JSNumber._MAX_INT32 = 2147483647;
- let _bitCount$ = Symbol('_bitCount');
- let _shru$ = Symbol('_shru');
- let _shrs$ = Symbol('_shrs');
- let _ors$ = Symbol('_ors');
- let _spread$ = Symbol('_spread');
+ let _bitCount = Symbol('_bitCount');
+ let _spread = Symbol('_spread');
+ let _shru = Symbol('_shru');
+ let _shrs = Symbol('_shrs');
+ let _ors = Symbol('_ors');
class JSInt extends JSNumber {
JSInt() {
super.JSNumber();
@@ -713,33 +715,33 @@ var _interceptors;
let nonneg = this['<'](0) ? dart.notNull(this['unary-']()) - 1 : this;
if (dart.notNull(nonneg) >= 4294967296) {
nonneg = (dart.notNull(nonneg) / 4294967296).truncate();
- return dart.notNull(_bitCount(_spread(nonneg))) + 32;
+ return dart.notNull(JSInt[_bitCount](JSInt[_spread](nonneg))) + 32;
}
- return _bitCount(_spread(nonneg));
+ return JSInt[_bitCount](JSInt[_spread](nonneg));
}
- static [_bitCount$](i) {
- i = dart.as(dart.dbinary(_shru(i, 0), '-', dart.dbinary(_shru(i, 1), '&', 1431655765)), core.int);
- i = (dart.notNull(i) & 858993459)['+'](dart.dbinary(_shru(i, 2), '&', 858993459));
- i = 252645135 & i['+'](_shru(i, 4));
- i = dart.as(_shru(i, 8), core.int);
- i = dart.as(_shru(i, 16), core.int);
+ static [_bitCount](i) {
+ i = dart.as(dart.dbinary(JSInt[_shru](i, 0), '-', dart.dbinary(JSInt[_shru](i, 1), '&', 1431655765)), core.int);
+ i = (dart.notNull(i) & 858993459)['+'](dart.dbinary(JSInt[_shru](i, 2), '&', 858993459));
+ i = 252645135 & i['+'](JSInt[_shru](i, 4));
+ i = dart.as(JSInt[_shru](i, 8), core.int);
+ i = dart.as(JSInt[_shru](i, 16), core.int);
return dart.notNull(i) & 63;
}
- static [_shru$](value, shift) {
+ static [_shru](value, shift) {
return value >>> shift;
}
- static [_shrs$](value, shift) {
+ static [_shrs](value, shift) {
return value >> shift;
}
- static [_ors$](a, b) {
+ static [_ors](a, b) {
return a | b;
}
- static [_spread$](i) {
- i = dart.as(_ors(i, dart.as(_shrs(i, 1), core.int)), core.int);
- i = dart.as(_ors(i, dart.as(_shrs(i, 2), core.int)), core.int);
- i = dart.as(_ors(i, dart.as(_shrs(i, 4), core.int)), core.int);
- i = dart.as(_ors(i, dart.as(_shrs(i, 8), core.int)), core.int);
- i = dart.as(_shru(dart.as(_ors(i, dart.as(_shrs(i, 16), core.int)), core.int), 0), core.int);
+ static [_spread](i) {
+ i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 1), core.int)), core.int);
+ i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 2), core.int)), core.int);
+ i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 4), core.int)), core.int);
+ i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 8), core.int)), core.int);
+ i = dart.as(JSInt[_shru](dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 16), core.int)), core.int), 0), core.int);
return i;
}
get runtimeType() {
@@ -764,9 +766,9 @@ var _interceptors;
class JSUInt31 extends JSUInt32 {
}
let _defaultSplit = Symbol('_defaultSplit');
- let _isWhitespace$ = Symbol('_isWhitespace');
- let _skipLeadingWhitespace$ = Symbol('_skipLeadingWhitespace');
- let _skipTrailingWhitespace$ = Symbol('_skipTrailingWhitespace');
+ let _isWhitespace = Symbol('_isWhitespace');
+ let _skipLeadingWhitespace = Symbol('_skipLeadingWhitespace');
+ let _skipTrailingWhitespace = Symbol('_skipTrailingWhitespace');
class JSString extends Interceptor {
JSString() {
super.Interceptor();
@@ -908,7 +910,7 @@ var _interceptors;
toUpperCase() {
return this.toUpperCase();
}
- static [_isWhitespace$](codeUnit) {
+ static [_isWhitespace](codeUnit) {
if (dart.notNull(codeUnit) < 256) {
switch (codeUnit) {
case 9:
@@ -949,24 +951,24 @@ var _interceptors;
return false;
}
}
- static [_skipLeadingWhitespace$](string, index) {
+ static [_skipLeadingWhitespace](string, index) {
let SPACE = 32;
let CARRIAGE_RETURN = 13;
while (dart.notNull(index) < dart.notNull(string.length)) {
let codeUnit = string.codeUnitAt(index);
- if (codeUnit !== SPACE && codeUnit !== CARRIAGE_RETURN && !dart.notNull(_isWhitespace(codeUnit))) {
+ if (codeUnit !== SPACE && codeUnit !== CARRIAGE_RETURN && !dart.notNull(JSString[_isWhitespace](codeUnit))) {
break;
}
index = dart.notNull(index) + 1;
}
return index;
}
- static [_skipTrailingWhitespace$](string, index) {
+ static [_skipTrailingWhitespace](string, index) {
let SPACE = 32;
let CARRIAGE_RETURN = 13;
while (dart.notNull(index) > 0) {
let codeUnit = string.codeUnitAt(dart.notNull(index) - 1);
- if (codeUnit !== SPACE && codeUnit !== CARRIAGE_RETURN && !dart.notNull(_isWhitespace(codeUnit))) {
+ if (codeUnit !== SPACE && codeUnit !== CARRIAGE_RETURN && !dart.notNull(JSString[_isWhitespace](codeUnit))) {
break;
}
index = dart.notNull(index) - 1;
@@ -981,14 +983,14 @@ var _interceptors;
let firstCode = result.codeUnitAt(0);
let startIndex = 0;
if (firstCode === NEL) {
- startIndex = _skipLeadingWhitespace(result, 1);
+ startIndex = JSString[_skipLeadingWhitespace](result, 1);
if (startIndex === result.length)
return "";
}
let endIndex = result.length;
let lastCode = result.codeUnitAt(dart.notNull(endIndex) - 1);
if (lastCode === NEL) {
- endIndex = _skipTrailingWhitespace(result, dart.notNull(endIndex) - 1);
+ endIndex = JSString[_skipTrailingWhitespace](result, dart.notNull(endIndex) - 1);
}
if (startIndex === 0 && endIndex === result.length)
return result;
@@ -1004,11 +1006,11 @@ var _interceptors;
return result;
let firstCode = result.codeUnitAt(0);
if (firstCode === NEL) {
- startIndex = _skipLeadingWhitespace(result, 1);
+ startIndex = JSString[_skipLeadingWhitespace](result, 1);
}
} else {
result = this;
- startIndex = _skipLeadingWhitespace(this, 0);
+ startIndex = JSString[_skipLeadingWhitespace](this, 0);
}
if (startIndex === 0)
return result;
@@ -1027,11 +1029,11 @@ var _interceptors;
return result;
let lastCode = result.codeUnitAt(dart.notNull(endIndex) - 1);
if (lastCode === NEL) {
- endIndex = _skipTrailingWhitespace(result, dart.notNull(endIndex) - 1);
+ endIndex = JSString[_skipTrailingWhitespace](result, dart.notNull(endIndex) - 1);
}
} else {
result = this;
- endIndex = _skipTrailingWhitespace(this, this.length);
+ endIndex = JSString[_skipTrailingWhitespace](this, this.length);
}
if (endIndex === result.length)
return result;
« no previous file with comments | « no previous file | lib/runtime/dart/_internal.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698