Skip to content

Commit 1c119be

Browse files
leafpetersenleafpetersen
committed
Update to latest analyzer
Fixes dart-archive/dev_compiler#393 BUG= [email protected] Review URL: https://codereview.chromium.org/1554683002 .
1 parent 55dedaf commit 1c119be

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1544
-2684
lines changed

‎pkg/dev_compiler/lib/runtime/dart/_interceptors.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
7878
return JSArray$(E).typed(JSArray$().markFixedList(dart.as(allocation, core.List)));
7979
}
8080
static markGrowable(allocation) {
81-
return JSArray$().typed(allocation);
81+
return JSArray$(E).typed(allocation);
8282
}
8383
static markFixedList(list) {
8484
list.fixed$length = Array;
@@ -198,7 +198,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
198198
}
199199
[dartx.reduce](combine) {
200200
dart.as(combine, dart.functionType(E, [E, E]));
201-
return dart.as(_internal.IterableMixinWorkaround.reduce(this, combine), E);
201+
return _internal.IterableMixinWorkaround.reduce(this, combine);
202202
}
203203
[dartx.fold](initialValue, combine) {
204204
dart.as(combine, dart.functionType(dart.dynamic, [dart.dynamic, E]));
@@ -208,17 +208,17 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
208208
dart.as(test, dart.functionType(core.bool, [E]));
209209
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
210210
dart.as(orElse, dart.functionType(E, []));
211-
return dart.as(_internal.IterableMixinWorkaround.firstWhere(this, test, orElse), E);
211+
return _internal.IterableMixinWorkaround.firstWhere(this, test, orElse);
212212
}
213213
[dartx.lastWhere](test, opts) {
214214
dart.as(test, dart.functionType(core.bool, [E]));
215215
let orElse = opts && 'orElse' in opts ? opts.orElse : null;
216216
dart.as(orElse, dart.functionType(E, []));
217-
return dart.as(_internal.IterableMixinWorkaround.lastWhereList(this, test, orElse), E);
217+
return _internal.IterableMixinWorkaround.lastWhereList(this, test, orElse);
218218
}
219219
[dartx.singleWhere](test) {
220220
dart.as(test, dart.functionType(core.bool, [E]));
221-
return dart.as(_internal.IterableMixinWorkaround.singleWhere(this, test), E);
221+
return _internal.IterableMixinWorkaround.singleWhere(this, test);
222222
}
223223
[dartx.elementAt](index) {
224224
return this[dartx.get](index);
@@ -520,8 +520,8 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
520520
return -1;
521521
} else if (this > dart.notNull(b)) {
522522
return 1;
523-
} else if (dart.equals(this, b)) {
524-
if (dart.equals(this, 0)) {
523+
} else if (this == b) {
524+
if (this == 0) {
525525
let bIsNegative = b[dartx.isNegative];
526526
if (this[dartx.isNegative] == bIsNegative) return 0;
527527
if (dart.notNull(this[dartx.isNegative])) return -1;
@@ -538,7 +538,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
538538
}
539539
}
540540
get [dartx.isNegative]() {
541-
return dart.equals(this, 0) ? 1 / this < 0 : this < 0;
541+
return this == 0 ? 1 / this < 0 : this < 0;
542542
}
543543
get [dartx.isNaN]() {
544544
return isNaN(this);
@@ -613,7 +613,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
613613
dart.throw(new core.RangeError(fractionDigits));
614614
}
615615
let result = this.toFixed(fractionDigits);
616-
if (dart.equals(this, 0) && dart.notNull(this[dartx.isNegative])) return `-${result}`;
616+
if (this == 0 && dart.notNull(this[dartx.isNegative])) return `-${result}`;
617617
return result;
618618
}
619619
[dartx.toStringAsExponential](fractionDigits) {
@@ -628,7 +628,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
628628
} else {
629629
result = this.toExponential();
630630
}
631-
if (dart.equals(this, 0) && dart.notNull(this[dartx.isNegative])) return `-${result}`;
631+
if (this == 0 && dart.notNull(this[dartx.isNegative])) return `-${result}`;
632632
return result;
633633
}
634634
[dartx.toStringAsPrecision](precision) {
@@ -637,7 +637,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
637637
dart.throw(new core.RangeError(precision));
638638
}
639639
let result = this.toPrecision(precision);
640-
if (dart.equals(this, 0) && dart.notNull(this[dartx.isNegative])) return `-${result}`;
640+
if (this == 0 && dart.notNull(this[dartx.isNegative])) return `-${result}`;
641641
return result;
642642
}
643643
[dartx.toRadixString](radix) {
@@ -664,7 +664,7 @@ dart_library.library('dart/_interceptors', null, /* Imports */[
664664
return dart.notNull(result) + "0"[dartx['*']](exponent);
665665
}
666666
toString() {
667-
if (dart.equals(this, 0) && 1 / this < 0) {
667+
if (this == 0 && 1 / this < 0) {
668668
return '-0.0';
669669
} else {
670670
return "" + this;

‎pkg/dev_compiler/lib/runtime/dart/_internal.js

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
162162
}
163163
map(f) {
164164
dart.as(f, dart.functionType(dart.dynamic, [E]));
165-
return new MappedListIterable(this, f);
165+
return new (MappedListIterable$(E, dart.dynamic))(this, f);
166166
}
167167
reduce(combine) {
168168
dart.as(combine, dart.functionType(E, [dart.dynamic, E]));
@@ -182,7 +182,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
182182
let value = initialValue;
183183
let length = this.length;
184184
for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
185-
value = dart.dcall(combine, value, this.elementAt(i));
185+
value = combine(value, this.elementAt(i));
186186
if (length != this.length) {
187187
dart.throw(new core.ConcurrentModificationError(this));
188188
}
@@ -1097,20 +1097,20 @@ dart_library.library('dart/_internal', null, /* Imports */[
10971097
static forEach(iterable, f) {
10981098
dart.as(f, dart.functionType(dart.void, [dart.dynamic]));
10991099
for (let e of iterable) {
1100-
dart.dcall(f, e);
1100+
f(e);
11011101
}
11021102
}
11031103
static any(iterable, f) {
11041104
dart.as(f, dart.functionType(core.bool, [dart.dynamic]));
11051105
for (let e of iterable) {
1106-
if (dart.notNull(dart.dcall(f, e))) return true;
1106+
if (dart.notNull(f(e))) return true;
11071107
}
11081108
return false;
11091109
}
11101110
static every(iterable, f) {
11111111
dart.as(f, dart.functionType(core.bool, [dart.dynamic]));
11121112
for (let e of iterable) {
1113-
if (!dart.notNull(dart.dcall(f, e))) return false;
1113+
if (!dart.notNull(f(e))) return false;
11141114
}
11151115
return true;
11161116
}
@@ -1120,24 +1120,24 @@ dart_library.library('dart/_internal', null, /* Imports */[
11201120
if (!dart.notNull(iterator.moveNext())) dart.throw(IterableElementError.noElement());
11211121
let value = iterator.current;
11221122
while (dart.notNull(iterator.moveNext())) {
1123-
value = dart.dcall(combine, value, iterator.current);
1123+
value = combine(value, iterator.current);
11241124
}
11251125
return value;
11261126
}
11271127
static fold(iterable, initialValue, combine) {
11281128
dart.as(combine, dart.functionType(dart.dynamic, [dart.dynamic, dart.dynamic]));
11291129
for (let element of iterable) {
1130-
initialValue = dart.dcall(combine, initialValue, element);
1130+
initialValue = combine(initialValue, element);
11311131
}
11321132
return initialValue;
11331133
}
11341134
static removeWhereList(list, test) {
11351135
dart.as(test, dart.functionType(core.bool, [dart.dynamic]));
1136-
let retained = [];
1136+
let retained = dart.list([], dart.dynamic);
11371137
let length = list[dartx.length];
11381138
for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
11391139
let element = list[dartx.get](i);
1140-
if (!dart.notNull(dart.dcall(test, element))) {
1140+
if (!dart.notNull(test(element))) {
11411141
retained[dartx.add](element);
11421142
}
11431143
if (length != list[dartx.length]) {
@@ -1182,7 +1182,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
11821182
dart.as(test, dart.functionType(core.bool, [dart.dynamic]));
11831183
dart.as(orElse, dart.functionType(dart.dynamic, []));
11841184
for (let element of iterable) {
1185-
if (dart.notNull(dart.dcall(test, element))) return element;
1185+
if (dart.notNull(test(element))) return element;
11861186
}
11871187
if (orElse != null) return orElse();
11881188
dart.throw(IterableElementError.noElement());
@@ -1193,7 +1193,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
11931193
let result = null;
11941194
let foundMatching = false;
11951195
for (let element of iterable) {
1196-
if (dart.notNull(dart.dcall(test, element))) {
1196+
if (dart.notNull(test(element))) {
11971197
result = element;
11981198
foundMatching = true;
11991199
}
@@ -1207,7 +1207,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
12071207
dart.as(orElse, dart.functionType(dart.dynamic, []));
12081208
for (let i = dart.notNull(list[dartx.length]) - 1; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
12091209
let element = list[dartx.get](i);
1210-
if (dart.notNull(dart.dcall(test, element))) return element;
1210+
if (dart.notNull(test(element))) return element;
12111211
}
12121212
if (orElse != null) return orElse();
12131213
dart.throw(IterableElementError.noElement());
@@ -1217,7 +1217,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
12171217
let result = null;
12181218
let foundMatching = false;
12191219
for (let element of iterable) {
1220-
if (dart.notNull(dart.dcall(test, element))) {
1220+
if (dart.notNull(test(element))) {
12211221
if (dart.notNull(foundMatching)) {
12221222
dart.throw(IterableElementError.tooMany());
12231223
}
@@ -1263,8 +1263,9 @@ dart_library.library('dart/_internal', null, /* Imports */[
12631263
return dart.toString(buffer);
12641264
}
12651265
where(iterable, f) {
1266-
dart.as(f, dart.functionType(core.bool, [dart.dynamic]));
1267-
return new (WhereIterable$(T))(dart.as(iterable, core.Iterable$(T)), dart.as(f, __CastType2));
1266+
dart.as(iterable, core.Iterable$(T));
1267+
dart.as(f, dart.functionType(core.bool, [T]));
1268+
return new (WhereIterable$(T))(iterable, f);
12681269
}
12691270
static map(iterable, f) {
12701271
dart.as(f, dart.functionType(dart.dynamic, [dart.dynamic]));
@@ -1283,7 +1284,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
12831284
}
12841285
takeWhile(iterable, test) {
12851286
dart.as(test, dart.functionType(core.bool, [dart.dynamic]));
1286-
return new (TakeWhileIterable$(T))(dart.as(iterable, core.Iterable$(T)), dart.as(test, dart.functionType(core.bool, [T])));
1287+
return new (TakeWhileIterable$(T))(dart.as(iterable, core.Iterable$(T)), dart.as(test, __CastType2));
12871288
}
12881289
skipList(list, n) {
12891290
return new (SubListIterable$(T))(dart.as(list, core.Iterable$(T)), n, null);
@@ -1443,7 +1444,7 @@ dart_library.library('dart/_internal', null, /* Imports */[
14431444
}
14441445
dart.setSignature(IterableMixinWorkaround, {
14451446
methods: () => ({
1446-
where: [core.Iterable$(T), [core.Iterable, dart.functionType(core.bool, [dart.dynamic])]],
1447+
where: [core.Iterable$(T), [core.Iterable$(T), dart.functionType(core.bool, [T])]],
14471448
takeList: [core.Iterable$(T), [core.List, core.int]],
14481449
takeWhile: [core.Iterable$(T), [core.Iterable, dart.functionType(core.bool, [dart.dynamic])]],
14491450
skipList: [core.Iterable$(T), [core.List, core.int]],

‎pkg/dev_compiler/lib/runtime/dart/_isolate_helper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ dart_library.library('dart/_isolate_helper', null, /* Imports */[
959959
{
960960
exports._globalState.currentManagerId = dart.as(dart.dindex(msg, 'id'), core.int);
961961
let functionName = dart.as(dart.dindex(msg, 'functionName'), core.String);
962-
let entryPoint = functionName == null ? exports._globalState.entry : dart.as(IsolateNatives._getJSFunctionFromName(functionName), core.Function);
962+
let entryPoint = dart.as(functionName == null ? exports._globalState.entry : IsolateNatives._getJSFunctionFromName(functionName), core.Function);
963963
let args = dart.dindex(msg, 'args');
964964
let message = _deserializeMessage(dart.dindex(msg, 'msg'));
965965
let isSpawnUri = dart.dindex(msg, 'isSpawnUri');
@@ -1018,7 +1018,7 @@ dart_library.library('dart/_isolate_helper', null, /* Imports */[
10181018
let replyPort = dart.dindex(msg, 'replyPort');
10191019
IsolateNatives.spawn(dart.as(dart.dindex(msg, 'functionName'), core.String), dart.as(dart.dindex(msg, 'uri'), core.String), dart.as(dart.dindex(msg, 'args'), core.List$(core.String)), dart.dindex(msg, 'msg'), false, dart.as(dart.dindex(msg, 'isSpawnUri'), core.bool), dart.as(dart.dindex(msg, 'startPaused'), core.bool)).then(dart.fn(msg => {
10201020
dart.dsend(replyPort, 'send', msg);
1021-
}), {onError: dart.fn(errorMessage => {
1021+
}, dart.dynamic, [core.List]), {onError: dart.fn(errorMessage => {
10221022
dart.dsend(replyPort, 'send', [_SPAWN_FAILED_SIGNAL, errorMessage]);
10231023
}, dart.dynamic, [core.String])});
10241024
}

‎pkg/dev_compiler/lib/runtime/dart/_js_helper.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ dart_library.library('dart/_js_helper', null, /* Imports */[
539539
dart.throw(new core.FormatException(string));
540540
}
541541
static parseInt(source, radix, handleError) {
542-
if (handleError == null) handleError = dart.fn(s => dart.as(Primitives._throwFormatException(dart.as(s, core.String)), core.int), core.int, [dart.dynamic]);
542+
if (handleError == null) handleError = dart.fn(s => dart.as(Primitives._throwFormatException(s), core.int), core.int, [core.String]);
543543
checkString(source);
544544
let match = /^\s*[+-]?((0x[a-f0-9]+)|(\d+)|([a-z0-9]+))\s*$/i.exec(source);
545545
let digitsIndex = 1;
@@ -588,7 +588,7 @@ dart_library.library('dart/_js_helper', null, /* Imports */[
588588
}
589589
static parseDouble(source, handleError) {
590590
checkString(source);
591-
if (handleError == null) handleError = dart.fn(s => dart.as(Primitives._throwFormatException(dart.as(s, core.String)), core.double), core.double, [dart.dynamic]);
591+
if (handleError == null) handleError = dart.fn(s => dart.as(Primitives._throwFormatException(s), core.double), core.double, [core.String]);
592592
if (!/^\s*[+-]?(?:Infinity|NaN|(?:\.\d+|\d+(?:\.\d*)?)(?:[eE][+-]?\d+)?)\s*$/.test(source)) {
593593
return handleError(source);
594594
}
@@ -890,7 +890,7 @@ dart_library.library('dart/_js_helper', null, /* Imports */[
890890
class NullError extends core.Error {
891891
NullError(message, match) {
892892
this[_message] = message;
893-
this[_method] = match == null ? null : dart.as(match.method, core.String);
893+
this[_method] = dart.as(match == null ? null : match.method, core.String);
894894
super.Error();
895895
}
896896
toString() {
@@ -906,8 +906,8 @@ dart_library.library('dart/_js_helper', null, /* Imports */[
906906
class JsNoSuchMethodError extends core.Error {
907907
JsNoSuchMethodError(message, match) {
908908
this[_message] = message;
909-
this[_method] = match == null ? null : dart.as(match.method, core.String);
910-
this[_receiver] = match == null ? null : dart.as(match.receiver, core.String);
909+
this[_method] = dart.as(match == null ? null : match.method, core.String);
910+
this[_receiver] = dart.as(match == null ? null : match.receiver, core.String);
911911
super.Error();
912912
}
913913
toString() {

‎pkg/dev_compiler/lib/runtime/dart/_js_mirrors.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ dart_library.library('dart/_js_mirrors', null, /* Imports */[
8080
let obj = {};
8181
map.forEach(dart.fn((key, value) => {
8282
obj[getName(key)] = value;
83-
}, dart.dynamic, [core.Symbol, dart.dynamic]));
83+
}, dart.void, [core.Symbol, dart.dynamic]));
8484
return obj;
8585
}
8686
}
@@ -129,7 +129,7 @@ dart_library.library('dart/_js_mirrors', null, /* Imports */[
129129
return dart.list([], mirrors.ClassMirror);
130130
} else {
131131
let interfaces = dart.as(dart.dcall(interfaceThunk), core.List$(core.Type));
132-
return interfaces[dartx.map](dart.fn(t => new JsClassMirror._(dart.as(t, core.Type)), JsClassMirror, [dart.dynamic]))[dartx.toList]();
132+
return interfaces[dartx.map](dart.fn(t => new JsClassMirror._(t), JsClassMirror, [core.Type]))[dartx.toList]();
133133
}
134134
}
135135
getField(fieldName) {

0 commit comments

Comments
 (0)