Skip to content

Commit a6ca53e

Browse files
jacob314jacob314
committed
fix list literal initialization call fix typeof calls for primitive JS types add dart/collection.js to defaultRuntimeFiles list Enclose switch statement case blocks with braces to insure a block scope matching dart semantics
BUG= [email protected] Review URL: https://codereview.chromium.org/1042003002
1 parent c700972 commit a6ca53e

21 files changed

+326
-194
lines changed

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

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var _interceptors;
2626
super.Interceptor();
2727
}
2828
JSArray$fixed(length) {
29-
if (dart.notNull(!(typeof length == number)) || dart.notNull(length) < 0) {
29+
if (dart.notNull(!(typeof length == 'number')) || dart.notNull(length) < 0) {
3030
throw new core.ArgumentError(`Length must be a non-negative integer: ${length}`);
3131
}
3232
return new JSArray.markFixed(new Array(length));
@@ -35,7 +35,7 @@ var _interceptors;
3535
return new JSArray.markGrowable([]);
3636
}
3737
JSArray$growable(length) {
38-
if (dart.notNull(!(typeof length == number)) || dart.notNull(length) < 0) {
38+
if (dart.notNull(!(typeof length == 'number')) || dart.notNull(length) < 0) {
3939
throw new core.ArgumentError(`Length must be a non-negative integer: ${length}`);
4040
}
4141
return new JSArray.markGrowable(new Array(length));
@@ -68,7 +68,7 @@ var _interceptors;
6868
this.push(value);
6969
}
7070
removeAt(index) {
71-
if (!(typeof index == number))
71+
if (!(typeof index == 'number'))
7272
throw new core.ArgumentError(index);
7373
if (dart.notNull(index) < 0 || dart.notNull(index) >= dart.notNull(this.length)) {
7474
throw new core.RangeError.value(index);
@@ -77,7 +77,7 @@ var _interceptors;
7777
return dart.as(this.splice(index, 1)[0], E);
7878
}
7979
insert(index, value) {
80-
if (!(typeof index == number))
80+
if (!(typeof index == 'number'))
8181
throw new core.ArgumentError(index);
8282
if (dart.notNull(index) < 0 || dart.notNull(index) > dart.notNull(this.length)) {
8383
throw new core.RangeError.value(index);
@@ -186,22 +186,22 @@ var _interceptors;
186186
if (end === void 0)
187187
end = null;
188188
_js_helper.checkNull(start);
189-
if (!(typeof start == number))
189+
if (!(typeof start == 'number'))
190190
throw new core.ArgumentError(start);
191191
if (dart.notNull(start) < 0 || dart.notNull(start) > dart.notNull(this.length)) {
192192
throw new core.RangeError.range(start, 0, this.length);
193193
}
194194
if (end === null) {
195195
end = this.length;
196196
} else {
197-
if (!(typeof end == number))
197+
if (!(typeof end == 'number'))
198198
throw new core.ArgumentError(end);
199199
if (dart.notNull(end) < dart.notNull(start) || dart.notNull(end) > dart.notNull(this.length)) {
200200
throw new core.RangeError.range(end, start, this.length);
201201
}
202202
}
203203
if (start === end)
204-
return new List.from([]);
204+
return new core.List$(E).from([]);
205205
return new JSArray.markGrowable(this.slice(start, end));
206206
}
207207
getRange(start, end) {
@@ -319,23 +319,23 @@ var _interceptors;
319319
return dart.as(this.length, core.int);
320320
}
321321
set length(newLength) {
322-
if (!(typeof newLength == number))
322+
if (!(typeof newLength == 'number'))
323323
throw new core.ArgumentError(newLength);
324324
if (dart.notNull(newLength) < 0)
325325
throw new core.RangeError.value(newLength);
326326
this.checkGrowable('set length');
327327
this.length = newLength;
328328
}
329329
get(index) {
330-
if (!(typeof index == number))
330+
if (!(typeof index == 'number'))
331331
throw new core.ArgumentError(index);
332332
if (dart.notNull(index) >= dart.notNull(this.length) || dart.notNull(index) < 0)
333333
throw new core.RangeError.value(index);
334334
return dart.as(this[index], E);
335335
}
336336
set(index, value) {
337337
this.checkMutable('indexed set');
338-
if (!(typeof index == number))
338+
if (!(typeof index == 'number'))
339339
throw new core.ArgumentError(index);
340340
if (dart.notNull(index) >= dart.notNull(this.length) || dart.notNull(index) < 0)
341341
throw new core.RangeError.value(index);
@@ -772,7 +772,7 @@ var _interceptors;
772772
super.Interceptor();
773773
}
774774
codeUnitAt(index) {
775-
if (!(typeof index == number))
775+
if (!(typeof index == 'number'))
776776
throw new core.ArgumentError(index);
777777
if (dart.notNull(index) < 0)
778778
throw new core.RangeError.value(index);
@@ -806,7 +806,7 @@ var _interceptors;
806806
return new _js_helper.StringMatch(start, string, this);
807807
}
808808
['+'](other) {
809-
if (!(typeof other == string))
809+
if (!(typeof other == 'string'))
810810
throw new core.ArgumentError(other);
811811
return this + other;
812812
}
@@ -841,7 +841,7 @@ var _interceptors;
841841
}
842842
split(pattern) {
843843
_js_helper.checkNull(pattern);
844-
if (typeof pattern == string) {
844+
if (typeof pattern == 'string') {
845845
return dart.as(this.split(pattern), core.List$(core.String));
846846
} else if (dart.notNull(dart.is(pattern, _js_helper.JSSyntaxRegExp)) && _js_helper.regExpCaptureCount(pattern) === 0) {
847847
let re = _js_helper.regExpGetNative(pattern);
@@ -851,7 +851,7 @@ var _interceptors;
851851
}
852852
}
853853
[_defaultSplit](pattern) {
854-
let result = new List.from([]);
854+
let result = new core.List$(core.String).from([]);
855855
let start = 0;
856856
let length = 1;
857857
for (let match of pattern.allMatches(this)) {
@@ -877,7 +877,7 @@ var _interceptors;
877877
if (dart.notNull(index) < 0 || dart.notNull(index) > dart.notNull(this.length)) {
878878
throw new core.RangeError.range(index, 0, this.length);
879879
}
880-
if (typeof pattern == string) {
880+
if (typeof pattern == 'string') {
881881
let other = pattern;
882882
let otherLength = other.length;
883883
let endIndex = dart.notNull(index) + dart.notNull(otherLength);
@@ -919,9 +919,13 @@ var _interceptors;
919919
case 32:
920920
case 133:
921921
case 160:
922+
{
922923
return true;
924+
}
923925
default:
926+
{
924927
return false;
928+
}
925929
}
926930
}
927931
switch (codeUnit) {
@@ -944,9 +948,13 @@ var _interceptors;
944948
case 8287:
945949
case 12288:
946950
case 65279:
951+
{
947952
return true;
953+
}
948954
default:
955+
{
949956
return false;
957+
}
950958
}
951959
}
952960
static [_skipLeadingWhitespace$](string, index) {
@@ -1085,12 +1093,12 @@ var _interceptors;
10851093
if (start === void 0)
10861094
start = 0;
10871095
_js_helper.checkNull(pattern);
1088-
if (!(typeof start == number))
1096+
if (!(typeof start == 'number'))
10891097
throw new core.ArgumentError(start);
10901098
if (dart.notNull(start) < 0 || dart.notNull(start) > dart.notNull(this.length)) {
10911099
throw new core.RangeError.range(start, 0, this.length);
10921100
}
1093-
if (typeof pattern == string) {
1101+
if (typeof pattern == 'string') {
10941102
return this.indexOf(pattern, start);
10951103
}
10961104
if (dart.is(pattern, _js_helper.JSSyntaxRegExp)) {
@@ -1110,12 +1118,12 @@ var _interceptors;
11101118
_js_helper.checkNull(pattern);
11111119
if (start === null) {
11121120
start = this.length;
1113-
} else if (!(typeof start == number)) {
1121+
} else if (!(typeof start == 'number')) {
11141122
throw new core.ArgumentError(start);
11151123
} else if (dart.notNull(start) < 0 || dart.notNull(start) > dart.notNull(this.length)) {
11161124
throw new core.RangeError.range(start, 0, this.length);
11171125
}
1118-
if (typeof pattern == string) {
1126+
if (typeof pattern == 'string') {
11191127
let other = pattern;
11201128
if (dart.notNull(start) + dart.notNull(other.length) > dart.notNull(this.length)) {
11211129
start = dart.notNull(this.length) - dart.notNull(other.length);
@@ -1144,7 +1152,7 @@ var _interceptors;
11441152
return !dart.notNull(this.isEmpty);
11451153
}
11461154
compareTo(other) {
1147-
if (!(typeof other == string))
1155+
if (!(typeof other == 'string'))
11481156
throw new core.ArgumentError(other);
11491157
return dart.equals(this, other) ? 0 : this < other ? -1 : 1;
11501158
}
@@ -1169,7 +1177,7 @@ var _interceptors;
11691177
return this.length;
11701178
}
11711179
get(index) {
1172-
if (!(typeof index == number))
1180+
if (!(typeof index == 'number'))
11731181
throw new core.ArgumentError(index);
11741182
if (dart.notNull(index) >= dart.notNull(this.length) || dart.notNull(index) < 0)
11751183
throw new core.RangeError.value(index);

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ var _internal;
524524
let TakeIterable$ = dart.generic(function(E) {
525525
class TakeIterable extends collection.IterableBase$(E) {
526526
TakeIterable(iterable, takeCount) {
527-
if (dart.notNull(!(typeof takeCount == number)) || dart.notNull(takeCount) < 0) {
527+
if (dart.notNull(!(typeof takeCount == 'number')) || dart.notNull(takeCount) < 0) {
528528
throw new core.ArgumentError(takeCount);
529529
}
530530
if (dart.is(iterable, EfficientLength)) {
@@ -567,7 +567,7 @@ var _internal;
567567
this[_iterator] = iterator$;
568568
this[_remaining] = remaining;
569569
super.Iterator();
570-
dart.assert(dart.notNull(typeof this[_remaining] == number) && dart.notNull(this[_remaining]) >= 0);
570+
dart.assert(dart.notNull(typeof this[_remaining] == 'number') && dart.notNull(this[_remaining]) >= 0);
571571
}
572572
moveNext() {
573573
this[_remaining] = dart.notNull(this[_remaining]) - 1;
@@ -640,13 +640,13 @@ var _internal;
640640
this[_iterable] = iterable$;
641641
this[_skipCount] = skipCount$;
642642
super.IterableBase();
643-
if (!(typeof this[_skipCount] == number)) {
643+
if (!(typeof this[_skipCount] == 'number')) {
644644
throw new core.ArgumentError.value(this[_skipCount], "count is not an integer");
645645
}
646646
core.RangeError.checkNotNegative(this[_skipCount], "count");
647647
}
648648
skip(count) {
649-
if (!(typeof this[_skipCount] == number)) {
649+
if (!(typeof this[_skipCount] == 'number')) {
650650
throw new core.ArgumentError.value(this[_skipCount], "count is not an integer");
651651
}
652652
core.RangeError.checkNotNegative(this[_skipCount], "count");
@@ -681,7 +681,7 @@ var _internal;
681681
this[_iterator] = iterator$;
682682
this[_skipCount] = skipCount$;
683683
super.Iterator();
684-
dart.assert(dart.notNull(typeof this[_skipCount] == number) && dart.notNull(this[_skipCount]) >= 0);
684+
dart.assert(dart.notNull(typeof this[_skipCount] == 'number') && dart.notNull(this[_skipCount]) >= 0);
685685
}
686686
moveNext() {
687687
for (let i = 0; dart.notNull(i) < dart.notNull(this[_skipCount]); i = dart.notNull(i) + 1)
@@ -823,7 +823,7 @@ var _internal;
823823
}
824824
toList(opts) {
825825
let growable = opts && 'growable' in opts ? opts.growable : true;
826-
return growable ? new List.from([]) : new core.List(0);
826+
return growable ? new core.List$(E).from([]) : new core.List(0);
827827
}
828828
toSet() {
829829
return new core.Set();
@@ -898,7 +898,7 @@ var _internal;
898898
return initialValue;
899899
}
900900
static removeWhereList(list, test) {
901-
let retained = new List.from([]);
901+
let retained = new core.List.from([]);
902902
let length = list.length;
903903
for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
904904
let element = list.get(i);
@@ -997,7 +997,7 @@ var _internal;
997997
throw IterableElementError.noElement();
998998
}
999999
static elementAt(iterable, index) {
1000-
if (!(typeof index == number))
1000+
if (!(typeof index == 'number'))
10011001
throw new core.ArgumentError.notNull("index");
10021002
core.RangeError.checkNotNegative(index, "index");
10031003
let elementIndex = 0;
@@ -1390,7 +1390,7 @@ var _internal;
13901390
return this[_values].contains(value);
13911391
}
13921392
containsKey(key) {
1393-
return dart.notNull(typeof key == number) && dart.notNull(key) >= 0 && dart.notNull(key) < dart.notNull(this.length);
1393+
return dart.notNull(typeof key == 'number') && dart.notNull(key) >= 0 && dart.notNull(key) < dart.notNull(this.length);
13941394
}
13951395
forEach(f) {
13961396
let length = this[_values].length;
@@ -1816,7 +1816,7 @@ var _internal;
18161816
return new core.RegExp(`^(?:${Symbol.operatorRE}$|${Symbol.identifierRE}(?:=?$|[.](?!$)))+?$`);
18171817
}
18181818
});
1819-
let POWERS_OF_TEN = /* Unimplemented const */new List.from([1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 10000000.0, 100000000.0, 1000000000.0, 10000000000.0, 100000000000.0, 1000000000000.0, 10000000000000.0, 100000000000000.0, 1000000000000000.0, 10000000000000000.0, 100000000000000000.0, 1000000000000000000.0, 10000000000000000000.0, 100000000000000000000.0, 1e+21, 1e+22]);
1819+
let POWERS_OF_TEN = /* Unimplemented const */new core.List.from([1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 10000000.0, 100000000.0, 1000000000.0, 10000000000.0, 100000000000.0, 1000000000000.0, 10000000000000.0, 100000000000000.0, 1000000000000000.0, 10000000000000000.0, 100000000000000000.0, 1000000000000000000.0, 10000000000000000000.0, 100000000000000000000.0, 1e+21, 1e+22]);
18201820
// Exports:
18211821
exports.EfficientLength = EfficientLength;
18221822
exports.ListIterable = ListIterable;

0 commit comments

Comments
 (0)