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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1083763003: refactor emitMemberName to be used more consistently (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 8 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
« lib/runtime/dart/_internal.js ('K') | « lib/runtime/dart/convert.js ('k') | lib/runtime/dart_runtime.js » ('j') | lib/runtime/dart_runtime.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/core.js
diff --git a/lib/runtime/dart/core.js b/lib/runtime/dart/core.js
index 573c2b2cb0f034498ff7c400314b9ede2001887c..959d32fa7fa62fe76ed7e47cbae01ef3951bb4f8 100644
--- a/lib/runtime/dart/core.js
+++ b/lib/runtime/dart/core.js
@@ -204,7 +204,7 @@ var core;
throw new ArgumentError(isUtc);
}
['=='](other) {
- if (!dart.notNull(dart.is(other, DateTime)))
+ if (!dart.is(other, DateTime))
return false;
return dart.equals(this.millisecondsSinceEpoch, dart.dload(other, 'millisecondsSinceEpoch')) && dart.equals(this.isUtc, dart.dload(other, 'isUtc'));
}
@@ -485,7 +485,7 @@ var core;
['=='](other) {
if (!dart.is(other, Duration))
return false;
- return dart.equals(this[_duration], dart.dload(other, '_duration'));
+ return dart.equals(this[_duration], dart.dload(other, _duration));
}
get hashCode() {
return this[_duration].hashCode;
@@ -528,7 +528,7 @@ var core;
abs() {
return new Duration[_microseconds](this[_duration].abs());
}
- ['-']() {
+ ['unary-']() {
return new Duration[_microseconds](-dart.notNull(this[_duration]));
}
}
@@ -556,7 +556,7 @@ var core;
Error() {
}
static safeToString(object) {
- if (dart.notNull(dart.is(object, num)) || dart.notNull(typeof object == 'boolean') || dart.notNull(null == object)) {
+ if (dart.is(object, num) || typeof object == 'boolean' || dart.notNull(null == object)) {
return object.toString();
}
if (typeof object == 'string') {
@@ -749,7 +749,7 @@ var core;
dart.assert(this[_hasValue]);
let target = Error.safeToString(this.indexable);
let explanation = `index should be less than ${this.length}`;
- if (dart.dbinary(this.invalidValue, '<', 0)) {
+ if (dart.dsend(this.invalidValue, '<', 0)) {
explanation = "index must not be negative";
}
return `RangeError: ${this.message} (${target}[${this.invalidValue}]): ${explanation}`;
@@ -776,6 +776,8 @@ var core;
let _arguments = dart.JsSymbol('_arguments');
let _namedArguments = dart.JsSymbol('_namedArguments');
let _existingArgumentNames = dart.JsSymbol('_existingArgumentNames');
+ let $length = dart.JsSymbol('$length');
+ let $get = dart.JsSymbol('$get');
class NoSuchMethodError extends Error {
NoSuchMethodError(receiver, memberName, positionalArguments, namedArguments, existingArgumentNames) {
if (existingArgumentNames === void 0)
@@ -960,7 +962,7 @@ var core;
let lineStart = 0;
let lastWasCR = null;
for (let i = 0; dart.notNull(i) < dart.notNull(offset); i = dart.notNull(i) + 1) {
- let char = dart.as(dart.dinvoke(this.source, 'codeUnitAt', i), int);
+ let char = dart.as(dart.dsend(this.source, 'codeUnitAt', i), int);
if (char == 10) {
if (lineStart != i || !dart.notNull(lastWasCR)) {
lineNum = dart.notNull(lineNum) + 1;
@@ -980,7 +982,7 @@ var core;
}
let lineEnd = dart.as(dart.dload(this.source, 'length'), int);
for (let i = offset; i['<'](dart.dload(this.source, 'length')); i = dart.notNull(i) + 1) {
- let char = dart.as(dart.dinvoke(this.source, 'codeUnitAt', i), int);
+ let char = dart.as(dart.dsend(this.source, 'codeUnitAt', i), int);
if (char == 10 || char == 13) {
lineEnd = i;
break;
@@ -1005,7 +1007,7 @@ var core;
prefix = postfix = "...";
}
}
- let slice = dart.as(dart.dinvoke(this.source, 'substring', start, end), String);
+ let slice = dart.as(dart.dsend(this.source, 'substring', start, end), String);
let markOffset = dart.notNull(offset) - dart.notNull(start) + dart.notNull(prefix.length);
return `${report}${prefix}${slice}${postfix}\n${String['*'](" ", markOffset)}^\n`;
}
@@ -1132,7 +1134,6 @@ var core;
let _generator = dart.JsSymbol('_generator');
let _id = dart.JsSymbol('_id');
let $iterator = dart.JsSymbol('$iterator');
- let $length = dart.JsSymbol('$length');
let $skip = dart.JsSymbol('$skip');
let $take = dart.JsSymbol('$take');
let _GeneratorIterable$ = dart.generic(function(E) {
@@ -1221,6 +1222,7 @@ var core;
return Iterator;
});
let Iterator = Iterator$();
+ let $set = dart.JsSymbol('$set');
let List$ = dart.generic(function(E) {
class List extends Object {
List(length) {
@@ -1402,11 +1404,13 @@ var core;
Stopwatch[_frequency] = _js_helper.Primitives.timerFrequency;
}
static [_now]() {
- return dart.as(dart.dinvoke(_js_helper.Primitives, 'timerTicks'), int);
+ return dart.as(dart.dsend(_js_helper.Primitives, 'timerTicks'), int);
}
}
Stopwatch._frequency = null;
let _stringFromIterable = dart.JsSymbol('_stringFromIterable');
+ let $sublist = dart.JsSymbol('$sublist');
+ let $add = dart.JsSymbol('$add');
class String extends Object {
fromCharCodes(charCodes, start, end) {
if (start === void 0)
@@ -1560,7 +1564,7 @@ var core;
if (this[_position] == this[_nextPosition])
return null;
if (dart.notNull(this[_position]) + 1 == this[_nextPosition])
- return this.string.get(this[_position]);
+ return String.get(this.string, this[_position]);
return this.string.substring(this[_position], this[_nextPosition]);
}
moveNext() {
@@ -1747,6 +1751,12 @@ var core;
let _SPACE = dart.JsSymbol('_SPACE');
let _PLUS = dart.JsSymbol('_PLUS');
let _hexCharPairToByte = dart.JsSymbol('_hexCharPairToByte');
+ let $forEach = dart.JsSymbol('$forEach');
+ let $map = dart.JsSymbol('$map');
+ let $toList = dart.JsSymbol('$toList');
+ let $isEmpty = dart.JsSymbol('$isEmpty');
+ let $removeLast = dart.JsSymbol('$removeLast');
+ let $fold = dart.JsSymbol('$fold');
class Uri extends Object {
get authority() {
if (!dart.notNull(this.hasAuthority))
@@ -1790,7 +1800,7 @@ var core;
static parse(uri) {
// Function isRegName: (int) → bool
function isRegName(ch) {
- return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dbinary(Uri[_regNameTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dsend(Uri[_regNameTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
let EOI = -1;
let scheme = "";
@@ -2060,7 +2070,7 @@ var core;
}
static [_checkNonWindowsPathReservedCharacters](segments, argumentError) {
segments[exports.$forEach](dart.as(segment => {
- if (dart.dinvoke(segment, 'contains', "/")) {
+ if (dart.dsend(segment, 'contains', "/")) {
if (argumentError) {
throw new ArgumentError(`Illegal path character ${segment}`);
} else {
@@ -2073,7 +2083,7 @@ var core;
if (firstSegment === void 0)
firstSegment = 0;
segments[exports.$skip](firstSegment)[exports.$forEach](dart.as(segment => {
- if (dart.dinvoke(segment, 'contains', new RegExp('["*/:<>?\\\\|]'))) {
+ if (dart.dsend(segment, 'contains', new RegExp('["*/:<>?\\\\|]'))) {
if (argumentError) {
throw new ArgumentError("Illegal character in path");
} else {
@@ -2114,7 +2124,7 @@ var core;
path = path.replaceAll("/", "\\");
}
let sep = "\\";
- if (dart.notNull(path.length) > 1 && dart.notNull(path.get(1) == ":")) {
+ if (dart.notNull(path.length) > 1 && dart.notNull(String.get(path, 1) == ":")) {
Uri[_checkWindowsDriveLetter](path.codeUnitAt(0), true);
if (path.length == 2 || path.codeUnitAt(2) != Uri[_BACKSLASH]) {
throw new ArgumentError("Windows paths with drive letter must be absolute");
@@ -2123,8 +2133,8 @@ var core;
Uri[_checkWindowsPathReservedCharacters](pathSegments, true, 1);
return new Uri({scheme: "file", pathSegments: pathSegments});
}
- if (dart.notNull(path.length) > 0 && dart.notNull(path.get(0) == sep)) {
- if (dart.notNull(path.length) > 1 && dart.notNull(path.get(1) == sep)) {
+ if (dart.notNull(path.length) > 0 && dart.notNull(String.get(path, 0) == sep)) {
+ if (dart.notNull(path.length) > 1 && dart.notNull(String.get(path, 1) == sep)) {
let pathStart = path.indexOf("\\", 2);
let hostPart = pathStart == -1 ? path.substring(2) : path.substring(2, pathStart);
let pathPart = pathStart == -1 ? "" : path.substring(dart.notNull(pathStart) + 1);
@@ -2242,7 +2252,7 @@ var core;
return Uri[_normalizeRegName](host, start, end);
}
static [_isRegNameChar](char) {
- return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri[_regNameTable][exports.$get](dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
+ return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dsend(Uri[_regNameTable][exports.$get](dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
}
static [_normalizeRegName](host, start, end) {
let buffer = null;
@@ -2359,7 +2369,7 @@ var core;
if (dart.dload(result, 'isEmpty')) {
if (isFile)
return "/";
- } else if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash)) && dart.notNull(!dart.equals(dart.dinvoke(result, 'codeUnitAt', 0), Uri[_SLASH]))) {
+ } else if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash)) && dart.notNull(!dart.equals(dart.dsend(result, 'codeUnitAt', 0), Uri[_SLASH]))) {
return `/${result}`;
}
return dart.as(result, String);
@@ -2380,7 +2390,7 @@ var core;
}
first = false;
result.write(Uri.encodeQueryComponent(dart.as(key, String)));
- if (dart.notNull(value != null) && dart.notNull(dart.dunary('!', dart.dload(value, 'isEmpty')))) {
+ if (dart.notNull(value != null) && dart.notNull(dart.dsend(dart.dload(value, 'isEmpty'), '!'))) {
result.write("=");
result.write(Uri.encodeQueryComponent(dart.as(value, String)));
}
@@ -2431,24 +2441,24 @@ var core;
return null;
}
static [_isUnreservedChar](ch) {
- return dart.notNull(ch) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri[_unreservedTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ return dart.notNull(ch) < 127 && dart.notNull(!dart.equals(dart.dsend(Uri[_unreservedTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
static [_escapeChar](char) {
- dart.assert(dart.dbinary(char, '<=', 1114111));
+ dart.assert(dart.dsend(char, '<=', 1114111));
let hexDigits = "0123456789ABCDEF";
let codeUnits = null;
- if (dart.dbinary(char, '<', 128)) {
+ if (dart.dsend(char, '<', 128)) {
codeUnits = new List(3);
codeUnits[exports.$set](0, Uri[_PERCENT]);
- codeUnits[exports.$set](1, hexDigits.codeUnitAt(dart.as(dart.dbinary(char, '>>', 4), int)));
- codeUnits[exports.$set](2, hexDigits.codeUnitAt(dart.as(dart.dbinary(char, '&', 15), int)));
+ codeUnits[exports.$set](1, hexDigits.codeUnitAt(dart.as(dart.dsend(char, '>>', 4), int)));
+ codeUnits[exports.$set](2, hexDigits.codeUnitAt(dart.as(dart.dsend(char, '&', 15), int)));
} else {
let flag = 192;
let encodedBytes = 2;
- if (dart.dbinary(char, '>', 2047)) {
+ if (dart.dsend(char, '>', 2047)) {
flag = 224;
encodedBytes = 3;
- if (dart.dbinary(char, '>', 65535)) {
+ if (dart.dsend(char, '>', 65535)) {
encodedBytes = 4;
flag = 240;
}
@@ -2456,7 +2466,7 @@ var core;
codeUnits = new List(3 * dart.notNull(encodedBytes));
let index = 0;
while ((encodedBytes = dart.notNull(encodedBytes) - 1) >= 0) {
- let byte = dart.as(dart.dbinary(dart.dbinary(dart.dbinary(char, '>>', 6 * dart.notNull(encodedBytes)), '&', 63), '|', flag), int);
+ let byte = dart.as(dart.dsend(dart.dsend(dart.dsend(char, '>>', 6 * dart.notNull(encodedBytes)), '&', 63), '|', flag), int);
codeUnits[exports.$set](index, Uri[_PERCENT]);
codeUnits[exports.$set](dart.notNull(index) + 1, hexDigits.codeUnitAt(dart.notNull(byte) >> 4));
codeUnits[exports.$set](dart.notNull(index) + 2, hexDigits.codeUnitAt(dart.notNull(byte) & 15));
@@ -2521,10 +2531,10 @@ var core;
return buffer.toString();
}
static [_isSchemeCharacter](ch) {
- return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dbinary(Uri[_schemeTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dsend(Uri[_schemeTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
static [_isGeneralDelimiter](ch) {
- return dart.notNull(ch) <= dart.notNull(Uri[_RIGHT_BRACKET]) && dart.notNull(!dart.equals(dart.dbinary(Uri[_genDelimitersTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
+ return dart.notNull(ch) <= dart.notNull(Uri[_RIGHT_BRACKET]) && dart.notNull(!dart.equals(dart.dsend(Uri[_genDelimitersTable][exports.$get](dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
}
get isAbsolute() {
return dart.notNull(this.scheme != "") && dart.notNull(this.fragment == "");
@@ -2751,7 +2761,7 @@ var core;
get hashCode() {
// Function combine: (dynamic, dynamic) → int
function combine(part, current) {
- return dart.as(dart.dbinary(dart.dbinary(dart.dbinary(current, '*', 31), '+', part.hashCode), '&', 1073741823), int);
+ return dart.as(dart.dsend(dart.dsend(dart.dsend(current, '*', 31), '+', part.hashCode), '&', 1073741823), int);
}
return combine(this.scheme, combine(this.userInfo, combine(this.host, combine(this.port, combine(this.path, combine(this.query, combine(this.fragment, 1)))))));
}
@@ -2784,14 +2794,14 @@ var core;
static splitQueryString(query, opts) {
let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
return dart.as(query.split("&")[exports.$fold](dart.map(), dart.as((map, element) => {
- let index = dart.as(dart.dinvoke(element, 'indexOf', "="), int);
+ let index = dart.as(dart.dsend(element, 'indexOf', "="), int);
if (index == -1) {
if (!dart.equals(element, "")) {
dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(element, String), {encoding: encoding}), "");
}
} else if (index != 0) {
- let key = dart.dinvoke(element, 'substring', 0, index);
- let value = dart.dinvoke(element, 'substring', dart.notNull(index) + 1);
+ let key = dart.dsend(element, 'substring', 0, index);
+ let value = dart.dsend(element, 'substring', dart.notNull(index) + 1);
dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(key, String), {encoding: encoding}), Uri.decodeQueryComponent(dart.as(value, String), {encoding: encoding}));
}
return map;
@@ -2917,8 +2927,8 @@ var core;
// Function byteToHex: (dynamic, dynamic) → dynamic
function byteToHex(byte, buffer) {
let hex = '0123456789ABCDEF';
- dart.dinvoke(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dbinary(byte, '>>', 4), int)));
- dart.dinvoke(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dbinary(byte, '&', 15), int)));
+ dart.dsend(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dsend(byte, '>>', 4), int)));
+ dart.dsend(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dsend(byte, '&', 15), int)));
}
let result = new StringBuffer();
let bytes = encoding.encode(text);
@@ -3081,6 +3091,8 @@ var core;
exports.IndexError = IndexError;
exports.FallThroughError = FallThroughError;
exports.AbstractClassInstantiationError = AbstractClassInstantiationError;
+ exports.$length = $length;
+ exports.$get = $get;
exports.NoSuchMethodError = NoSuchMethodError;
exports.UnsupportedError = UnsupportedError;
exports.UnimplementedError = UnimplementedError;
@@ -3102,13 +3114,13 @@ var core;
exports.Iterable$ = Iterable$;
exports.Iterable = Iterable;
exports.$iterator = $iterator;
- exports.$length = $length;
exports.$skip = $skip;
exports.$take = $take;
exports.BidirectionalIterator$ = BidirectionalIterator$;
exports.BidirectionalIterator = BidirectionalIterator;
exports.Iterator$ = Iterator$;
exports.Iterator = Iterator;
+ exports.$set = $set;
exports.List$ = List$;
exports.List = List;
exports.Map$ = Map$;
@@ -3123,6 +3135,8 @@ var core;
exports.Sink = Sink;
exports.StackTrace = StackTrace;
exports.Stopwatch = Stopwatch;
+ exports.$sublist = $sublist;
+ exports.$add = $add;
exports.String = String;
exports.$last = $last;
exports.RuneIterator = RuneIterator;
@@ -3130,5 +3144,11 @@ var core;
exports.StringSink = StringSink;
exports.Symbol = Symbol;
exports.Type = Type;
+ exports.$forEach = $forEach;
+ exports.$map = $map;
+ exports.$toList = $toList;
+ exports.$isEmpty = $isEmpty;
+ exports.$removeLast = $removeLast;
+ exports.$fold = $fold;
exports.Uri = Uri;
})(core || (core = {}));
« lib/runtime/dart/_internal.js ('K') | « lib/runtime/dart/convert.js ('k') | lib/runtime/dart_runtime.js » ('j') | lib/runtime/dart_runtime.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698