Skip to content

Commit dc4b3d5

Browse files
author
John Messerly
committed
fix static members in _emitMemberName
static/top-levels don't need extension method, operator renames, or different slots* for private members (static members are qualified by the static type, so they aren't ambiguous, e.g. Foo._foo and Bar._foo where Foo and Bar are in same/different libraries) [email protected] Review URL: https://codereview.chromium.org/1111863002
1 parent ff2749c commit dc4b3d5

File tree

15 files changed

+995
-1207
lines changed

15 files changed

+995
-1207
lines changed

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

Lines changed: 32 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ var _interceptors;
1818
return JSExtendableArray;
1919
});
2020
let JSExtendableArray = JSExtendableArray$();
21-
let _MIN_INT32 = Symbol('_MIN_INT32');
22-
let _MAX_INT32 = Symbol('_MAX_INT32');
23-
let _handleIEtoString = Symbol('_handleIEtoString');
2421
let _isInt32 = Symbol('_isInt32');
2522
let _tdivFast = Symbol('_tdivFast');
2623
let _tdivSlow = Symbol('_tdivSlow');
@@ -102,7 +99,7 @@ var _interceptors;
10299
return this['>'](0) ? 1 : this['<'](0) ? -1 : this;
103100
}
104101
toInt() {
105-
if (dart.notNull(this['>='](JSNumber[_MIN_INT32])) && dart.notNull(this['<='](JSNumber[_MAX_INT32]))) {
102+
if (dart.notNull(this['>='](JSNumber._MIN_INT32)) && dart.notNull(this['<='](JSNumber._MAX_INT32))) {
106103
return this | 0;
107104
}
108105
if (isFinite(this)) {
@@ -201,9 +198,9 @@ var _interceptors;
201198
if (result.codeUnitAt(dart.notNull(result.length) - 1) != rightParenCode) {
202199
return result;
203200
}
204-
return JSNumber[_handleIEtoString](result);
201+
return JSNumber._handleIEtoString(result);
205202
}
206-
static [_handleIEtoString](result) {
203+
static _handleIEtoString(result) {
207204
let match = /^([\da-z]+)(?:\.([\da-z]+))?\(e\+(\d+)\)$/.exec(result);
208205
if (match == null) {
209206
throw new core.UnsupportedError(`Unexpected toString result: ${result}`);
@@ -355,11 +352,6 @@ var _interceptors;
355352
JSNumber[dart.implements] = () => [core.num];
356353
JSNumber._MIN_INT32 = -2147483648;
357354
JSNumber._MAX_INT32 = 2147483647;
358-
let _bitCount = Symbol('_bitCount');
359-
let _spread = Symbol('_spread');
360-
let _shru = Symbol('_shru');
361-
let _shrs = Symbol('_shrs');
362-
let _ors = Symbol('_ors');
363355
class JSInt extends JSNumber {
364356
JSInt() {
365357
super.JSNumber();
@@ -381,33 +373,33 @@ var _interceptors;
381373
let nonneg = this['<'](0) ? dart.notNull(this['unary-']()) - 1 : this;
382374
if (dart.notNull(nonneg) >= 4294967296) {
383375
nonneg = (dart.notNull(nonneg) / 4294967296).truncate();
384-
return dart.notNull(JSInt[_bitCount](JSInt[_spread](nonneg))) + 32;
376+
return dart.notNull(JSInt._bitCount(JSInt._spread(nonneg))) + 32;
385377
}
386-
return JSInt[_bitCount](JSInt[_spread](nonneg));
387-
}
388-
static [_bitCount](i) {
389-
i = dart.as(dart.dsend(JSInt[_shru](i, 0), '-', dart.dsend(JSInt[_shru](i, 1), '&', 1431655765)), core.int);
390-
i = core.int['+'](dart.notNull(i) & 858993459, dart.dsend(JSInt[_shru](i, 2), '&', 858993459));
391-
i = 252645135 & core.int['+'](i, JSInt[_shru](i, 4));
392-
i = dart.notNull(i) + dart.notNull(dart.as(JSInt[_shru](i, 8), core.int));
393-
i = dart.notNull(i) + dart.notNull(dart.as(JSInt[_shru](i, 16), core.int));
378+
return JSInt._bitCount(JSInt._spread(nonneg));
379+
}
380+
static _bitCount(i) {
381+
i = dart.as(dart.dsend(JSInt._shru(i, 0), '-', dart.dsend(JSInt._shru(i, 1), '&', 1431655765)), core.int);
382+
i = core.int['+'](dart.notNull(i) & 858993459, dart.dsend(JSInt._shru(i, 2), '&', 858993459));
383+
i = 252645135 & core.int['+'](i, JSInt._shru(i, 4));
384+
i = dart.notNull(i) + dart.notNull(dart.as(JSInt._shru(i, 8), core.int));
385+
i = dart.notNull(i) + dart.notNull(dart.as(JSInt._shru(i, 16), core.int));
394386
return dart.notNull(i) & 63;
395387
}
396-
static [_shru](value, shift) {
388+
static _shru(value, shift) {
397389
return value >>> shift;
398390
}
399-
static [_shrs](value, shift) {
391+
static _shrs(value, shift) {
400392
return value >> shift;
401393
}
402-
static [_ors](a, b) {
394+
static _ors(a, b) {
403395
return a | b;
404396
}
405-
static [_spread](i) {
406-
i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 1), core.int)), core.int);
407-
i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 2), core.int)), core.int);
408-
i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 4), core.int)), core.int);
409-
i = dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 8), core.int)), core.int);
410-
i = dart.as(JSInt[_shru](dart.as(JSInt[_ors](i, dart.as(JSInt[_shrs](i, 16), core.int)), core.int), 0), core.int);
397+
static _spread(i) {
398+
i = dart.as(JSInt._ors(i, dart.as(JSInt._shrs(i, 1), core.int)), core.int);
399+
i = dart.as(JSInt._ors(i, dart.as(JSInt._shrs(i, 2), core.int)), core.int);
400+
i = dart.as(JSInt._ors(i, dart.as(JSInt._shrs(i, 4), core.int)), core.int);
401+
i = dart.as(JSInt._ors(i, dart.as(JSInt._shrs(i, 8), core.int)), core.int);
402+
i = dart.as(JSInt._shru(dart.as(JSInt._ors(i, dart.as(JSInt._shrs(i, 16), core.int)), core.int), 0), core.int);
411403
return i;
412404
}
413405
get runtimeType() {
@@ -431,9 +423,6 @@ var _interceptors;
431423
class JSUInt32 extends JSPositiveInt {}
432424
class JSUInt31 extends JSUInt32 {}
433425
let _defaultSplit = Symbol('_defaultSplit');
434-
let _isWhitespace = Symbol('_isWhitespace');
435-
let _skipLeadingWhitespace = Symbol('_skipLeadingWhitespace');
436-
let _skipTrailingWhitespace = Symbol('_skipTrailingWhitespace');
437426
class JSString extends Interceptor {
438427
JSString() {
439428
super.Interceptor();
@@ -575,7 +564,7 @@ var _interceptors;
575564
toUpperCase() {
576565
return this.toUpperCase();
577566
}
578-
static [_isWhitespace](codeUnit) {
567+
static _isWhitespace(codeUnit) {
579568
if (dart.notNull(codeUnit) < 256) {
580569
switch (codeUnit) {
581570
case 9:
@@ -624,24 +613,24 @@ var _interceptors;
624613
}
625614
}
626615
}
627-
static [_skipLeadingWhitespace](string, index) {
616+
static _skipLeadingWhitespace(string, index) {
628617
let SPACE = 32;
629618
let CARRIAGE_RETURN = 13;
630619
while (dart.notNull(index) < dart.notNull(string.length)) {
631620
let codeUnit = string.codeUnitAt(index);
632-
if (codeUnit != SPACE && codeUnit != CARRIAGE_RETURN && !dart.notNull(JSString[_isWhitespace](codeUnit))) {
621+
if (codeUnit != SPACE && codeUnit != CARRIAGE_RETURN && !dart.notNull(JSString._isWhitespace(codeUnit))) {
633622
break;
634623
}
635624
index = dart.notNull(index) + 1;
636625
}
637626
return index;
638627
}
639-
static [_skipTrailingWhitespace](string, index) {
628+
static _skipTrailingWhitespace(string, index) {
640629
let SPACE = 32;
641630
let CARRIAGE_RETURN = 13;
642631
while (dart.notNull(index) > 0) {
643632
let codeUnit = string.codeUnitAt(dart.notNull(index) - 1);
644-
if (codeUnit != SPACE && codeUnit != CARRIAGE_RETURN && !dart.notNull(JSString[_isWhitespace](codeUnit))) {
633+
if (codeUnit != SPACE && codeUnit != CARRIAGE_RETURN && !dart.notNull(JSString._isWhitespace(codeUnit))) {
645634
break;
646635
}
647636
index = dart.notNull(index) - 1;
@@ -656,14 +645,14 @@ var _interceptors;
656645
let firstCode = result.codeUnitAt(0);
657646
let startIndex = 0;
658647
if (firstCode == NEL) {
659-
startIndex = JSString[_skipLeadingWhitespace](result, 1);
648+
startIndex = JSString._skipLeadingWhitespace(result, 1);
660649
if (startIndex == result.length)
661650
return "";
662651
}
663652
let endIndex = result.length;
664653
let lastCode = result.codeUnitAt(dart.notNull(endIndex) - 1);
665654
if (lastCode == NEL) {
666-
endIndex = JSString[_skipTrailingWhitespace](result, dart.notNull(endIndex) - 1);
655+
endIndex = JSString._skipTrailingWhitespace(result, dart.notNull(endIndex) - 1);
667656
}
668657
if (startIndex == 0 && endIndex == result.length)
669658
return result;
@@ -679,11 +668,11 @@ var _interceptors;
679668
return result;
680669
let firstCode = result.codeUnitAt(0);
681670
if (firstCode == NEL) {
682-
startIndex = JSString[_skipLeadingWhitespace](result, 1);
671+
startIndex = JSString._skipLeadingWhitespace(result, 1);
683672
}
684673
} else {
685674
result = this;
686-
startIndex = JSString[_skipLeadingWhitespace](this, 0);
675+
startIndex = JSString._skipLeadingWhitespace(this, 0);
687676
}
688677
if (startIndex == 0)
689678
return result;
@@ -702,11 +691,11 @@ var _interceptors;
702691
return result;
703692
let lastCode = result.codeUnitAt(dart.notNull(endIndex) - 1);
704693
if (lastCode == NEL) {
705-
endIndex = JSString[_skipTrailingWhitespace](result, dart.notNull(endIndex) - 1);
694+
endIndex = JSString._skipTrailingWhitespace(result, dart.notNull(endIndex) - 1);
706695
}
707696
} else {
708697
result = this;
709-
endIndex = JSString[_skipTrailingWhitespace](this, this.length);
698+
endIndex = JSString._skipTrailingWhitespace(this, this.length);
710699
}
711700
if (endIndex == result.length)
712701
return result;

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

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ var _internal;
361361
}
362362
return new MappedIterable$(S, T)[_](dart.as(iterable, core.Iterable$(S)), func);
363363
}
364-
[_](iterable, f) {
364+
_(iterable, f) {
365365
this[_iterable] = iterable;
366366
this[_f] = f;
367367
super.IterableBase();
@@ -388,14 +388,14 @@ var _internal;
388388
return this[_f](this[_iterable][core.$elementAt](index));
389389
}
390390
}
391-
dart.defineNamedConstructor(MappedIterable, _);
391+
dart.defineNamedConstructor(MappedIterable, '_');
392392
return MappedIterable;
393393
});
394394
let MappedIterable = MappedIterable$();
395395
let EfficientLengthMappedIterable$ = dart.generic(function(S, T) {
396396
class EfficientLengthMappedIterable extends MappedIterable$(S, T) {
397397
EfficientLengthMappedIterable(iterable, func) {
398-
super[_](dart.as(iterable, core.Iterable$(S)), func);
398+
super._(dart.as(iterable, core.Iterable$(S)), func);
399399
}
400400
}
401401
EfficientLengthMappedIterable[dart.implements] = () => [EfficientLength];
@@ -549,7 +549,7 @@ var _internal;
549549
}
550550
return new TakeIterable$(E)[_](iterable, takeCount);
551551
}
552-
[_](iterable, takeCount) {
552+
_(iterable, takeCount) {
553553
this[_iterable] = iterable;
554554
this[_takeCount] = takeCount;
555555
super.IterableBase();
@@ -558,14 +558,14 @@ var _internal;
558558
return new (TakeIterator$(E))(this[_iterable][core.$iterator], this[_takeCount]);
559559
}
560560
}
561-
dart.defineNamedConstructor(TakeIterable, _);
561+
dart.defineNamedConstructor(TakeIterable, '_');
562562
return TakeIterable;
563563
});
564564
let TakeIterable = TakeIterable$();
565565
let EfficientLengthTakeIterable$ = dart.generic(function(E) {
566566
class EfficientLengthTakeIterable extends TakeIterable$(E) {
567567
EfficientLengthTakeIterable(iterable, takeCount) {
568-
super[_](iterable, takeCount);
568+
super._(iterable, takeCount);
569569
}
570570
get [core.$length]() {
571571
let iterableLength = this[_iterable][core.$length];
@@ -652,7 +652,7 @@ var _internal;
652652
}
653653
return new SkipIterable$(E)[_](iterable, count);
654654
}
655-
[_](iterable, skipCount) {
655+
_(iterable, skipCount) {
656656
this[_iterable] = iterable;
657657
this[_skipCount] = skipCount;
658658
super.IterableBase();
@@ -672,14 +672,14 @@ var _internal;
672672
return new (SkipIterator$(E))(this[_iterable][core.$iterator], this[_skipCount]);
673673
}
674674
}
675-
dart.defineNamedConstructor(SkipIterable, _);
675+
dart.defineNamedConstructor(SkipIterable, '_');
676676
return SkipIterable;
677677
});
678678
let SkipIterable = SkipIterable$();
679679
let EfficientLengthSkipIterable$ = dart.generic(function(E) {
680680
class EfficientLengthSkipIterable extends SkipIterable$(E) {
681681
EfficientLengthSkipIterable(iterable, skipCount) {
682-
super[_](iterable, skipCount);
682+
super._(iterable, skipCount);
683683
}
684684
get [core.$length]() {
685685
let length = dart.notNull(this[_iterable][core.$length]) - dart.notNull(this[_skipCount]);
@@ -869,7 +869,6 @@ var _internal;
869869
return BidirectionalIterator;
870870
});
871871
let BidirectionalIterator = BidirectionalIterator$();
872-
let _rangeCheck = dart.JsSymbol('_rangeCheck');
873872
let IterableMixinWorkaround$ = dart.generic(function(T) {
874873
class IterableMixinWorkaround extends core.Object {
875874
static contains(iterable, element) {
@@ -1105,15 +1104,15 @@ var _internal;
11051104
start = dart.notNull(list[core.$length]) - 1;
11061105
return Lists.lastIndexOf(list, element, start);
11071106
}
1108-
static [_rangeCheck](list, start, end) {
1107+
static _rangeCheck(list, start, end) {
11091108
core.RangeError.checkValidRange(start, end, list[core.$length]);
11101109
}
11111110
getRangeList(list, start, end) {
1112-
IterableMixinWorkaround[_rangeCheck](list, start, end);
1111+
IterableMixinWorkaround._rangeCheck(list, start, end);
11131112
return new (SubListIterable$(T))(dart.as(list, core.Iterable$(T)), start, end);
11141113
}
11151114
static setRangeList(list, start, end, from, skipCount) {
1116-
IterableMixinWorkaround[_rangeCheck](list, start, end);
1115+
IterableMixinWorkaround._rangeCheck(list, start, end);
11171116
let length = dart.notNull(end) - dart.notNull(start);
11181117
if (length == 0)
11191118
return;
@@ -1134,7 +1133,7 @@ var _internal;
11341133
Lists.copy(otherList, otherStart, list, start, length);
11351134
}
11361135
static replaceRangeList(list, start, end, iterable) {
1137-
IterableMixinWorkaround[_rangeCheck](list, start, end);
1136+
IterableMixinWorkaround._rangeCheck(list, start, end);
11381137
if (!dart.is(iterable, EfficientLength)) {
11391138
iterable = iterable[core.$toList]();
11401139
}
@@ -1159,7 +1158,7 @@ var _internal;
11591158
}
11601159
}
11611160
static fillRangeList(list, start, end, fillValue) {
1162-
IterableMixinWorkaround[_rangeCheck](list, start, end);
1161+
IterableMixinWorkaround._rangeCheck(list, start, end);
11631162
for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
11641163
list[core.$set](i, fillValue);
11651164
}
@@ -1585,28 +1584,24 @@ var _internal;
15851584
function printToConsole(line) {
15861585
_js_primitives.printString(`${line}`);
15871586
}
1588-
let _doSort = dart.JsSymbol('_doSort');
1589-
let _INSERTION_SORT_THRESHOLD = dart.JsSymbol('_INSERTION_SORT_THRESHOLD');
1590-
let _insertionSort = dart.JsSymbol('_insertionSort');
1591-
let _dualPivotQuicksort = dart.JsSymbol('_dualPivotQuicksort');
15921587
class Sort extends core.Object {
15931588
static sort(a, compare) {
1594-
Sort[_doSort](a, 0, dart.notNull(a[core.$length]) - 1, compare);
1589+
Sort._doSort(a, 0, dart.notNull(a[core.$length]) - 1, compare);
15951590
}
15961591
static sortRange(a, from, to, compare) {
15971592
if (dart.notNull(from) < 0 || dart.notNull(to) > dart.notNull(a[core.$length]) || dart.notNull(to) < dart.notNull(from)) {
15981593
throw "OutOfRange";
15991594
}
1600-
Sort[_doSort](a, from, dart.notNull(to) - 1, compare);
1595+
Sort._doSort(a, from, dart.notNull(to) - 1, compare);
16011596
}
1602-
static [_doSort](a, left, right, compare) {
1603-
if (dart.notNull(right) - dart.notNull(left) <= dart.notNull(Sort[_INSERTION_SORT_THRESHOLD])) {
1604-
Sort[_insertionSort](a, left, right, compare);
1597+
static _doSort(a, left, right, compare) {
1598+
if (dart.notNull(right) - dart.notNull(left) <= dart.notNull(Sort._INSERTION_SORT_THRESHOLD)) {
1599+
Sort._insertionSort(a, left, right, compare);
16051600
} else {
1606-
Sort[_dualPivotQuicksort](a, left, right, compare);
1601+
Sort._dualPivotQuicksort(a, left, right, compare);
16071602
}
16081603
}
1609-
static [_insertionSort](a, left, right, compare) {
1604+
static _insertionSort(a, left, right, compare) {
16101605
for (let i = dart.notNull(left) + 1; dart.notNull(i) <= dart.notNull(right); i = dart.notNull(i) + 1) {
16111606
let el = a[core.$get](i);
16121607
let j = i;
@@ -1617,8 +1612,8 @@ var _internal;
16171612
a[core.$set](j, el);
16181613
}
16191614
}
1620-
static [_dualPivotQuicksort](a, left, right, compare) {
1621-
dart.assert(dart.notNull(right) - dart.notNull(left) > dart.notNull(Sort[_INSERTION_SORT_THRESHOLD]));
1615+
static _dualPivotQuicksort(a, left, right, compare) {
1616+
dart.assert(dart.notNull(right) - dart.notNull(left) > dart.notNull(Sort._INSERTION_SORT_THRESHOLD));
16221617
let sixth = ((dart.notNull(right) - dart.notNull(left) + 1) / 6).truncate();
16231618
let index1 = dart.notNull(left) + dart.notNull(sixth);
16241619
let index5 = dart.notNull(right) - dart.notNull(sixth);
@@ -1782,8 +1777,8 @@ var _internal;
17821777
a[core.$set](dart.notNull(less) - 1, pivot1);
17831778
a[core.$set](right, a[core.$get](dart.notNull(great) + 1));
17841779
a[core.$set](dart.notNull(great) + 1, pivot2);
1785-
Sort[_doSort](a, left, dart.notNull(less) - 2, compare);
1786-
Sort[_doSort](a, dart.notNull(great) + 2, right, compare);
1780+
Sort._doSort(a, left, dart.notNull(less) - 2, compare);
1781+
Sort._doSort(a, dart.notNull(great) + 2, right, compare);
17871782
if (pivots_are_equal) {
17881783
return;
17891784
}
@@ -1841,9 +1836,9 @@ var _internal;
18411836
}
18421837
}
18431838
}
1844-
Sort[_doSort](a, less, great, compare);
1839+
Sort._doSort(a, less, great, compare);
18451840
} else {
1846-
Sort[_doSort](a, less, great, compare);
1841+
Sort._doSort(a, less, great, compare);
18471842
}
18481843
}
18491844
}

0 commit comments

Comments
 (0)