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

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

Issue 1093143004: fixes #52, fields shadowing getters/setters or other fields (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
« no previous file with comments | « lib/runtime/dart/async.js ('k') | lib/runtime/dart/convert.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/collection.js
diff --git a/lib/runtime/dart/collection.js b/lib/runtime/dart/collection.js
index 209233c939d4186e49028d79b293a7b147855fb3..3fc79f9c7371125d12e2a9c01bc0a5ef18a45c1f 100644
--- a/lib/runtime/dart/collection.js
+++ b/lib/runtime/dart/collection.js
@@ -967,8 +967,8 @@ var collection;
return IterableBase;
});
let IterableBase = IterableBase$();
- let _iterator = Symbol('_iterator');
let _NOT_MOVED_YET = Symbol('_NOT_MOVED_YET');
+ let _iterator = Symbol('_iterator');
let _state = Symbol('_state');
let _move = Symbol('_move');
let _HAS_NEXT_AND_NEXT_IN_CURRENT = Symbol('_HAS_NEXT_AND_NEXT_IN_CURRENT');
@@ -976,8 +976,8 @@ var collection;
let HasNextIterator$ = dart.generic(function(E) {
class HasNextIterator extends core.Object {
HasNextIterator(iterator) {
- this[_iterator] = iterator;
- this[_state] = HasNextIterator[_NOT_MOVED_YET];
+ dart.initField(HasNextIterator, this, _iterator, iterator);
+ dart.initField(HasNextIterator, this, _state, HasNextIterator[_NOT_MOVED_YET]);
}
get hasNext() {
if (this[_state] == HasNextIterator[_NOT_MOVED_YET])
@@ -1272,9 +1272,9 @@ var collection;
let LinkedListEntry$ = dart.generic(function(E) {
class LinkedListEntry extends core.Object {
LinkedListEntry() {
- this[_list] = null;
- this[_next] = null;
- this[_previous] = null;
+ dart.initField(LinkedListEntry, this, _list, null);
+ dart.initField(LinkedListEntry, this, _next, null);
+ dart.initField(LinkedListEntry, this, _previous, null);
}
get list() {
return this[_list];
@@ -1919,7 +1919,7 @@ var collection;
let MapView$ = dart.generic(function(K, V) {
class MapView extends core.Object {
MapView(map) {
- this[_map] = map;
+ dart.initField(MapView, this, _map, map);
}
get(key) {
return this[_map].get(key);
@@ -2096,9 +2096,9 @@ var collection;
let DoubleLinkedQueueEntry$ = dart.generic(function(E) {
class DoubleLinkedQueueEntry extends core.Object {
DoubleLinkedQueueEntry(e) {
- this[_element] = e;
- this[_previous] = null;
- this[_next] = null;
+ dart.initField(DoubleLinkedQueueEntry, this, _element, e);
+ dart.initField(DoubleLinkedQueueEntry, this, _previous, null);
+ dart.initField(DoubleLinkedQueueEntry, this, _next, null);
}
[_link](previous, next) {
this[_next] = next;
@@ -3734,10 +3734,10 @@ var collection;
let HashMapKeyIterator$ = dart.generic(function(E) {
class HashMapKeyIterator extends core.Object {
HashMapKeyIterator(map, keys) {
- this[_map] = map;
- this[_keys] = keys;
- this[_offset] = 0;
- this[_current] = null;
+ dart.initField(HashMapKeyIterator, this, _map, map);
+ dart.initField(HashMapKeyIterator, this, _keys, keys);
+ dart.initField(HashMapKeyIterator, this, _offset, 0);
+ dart.initField(HashMapKeyIterator, this, _current, null);
}
get current() {
return this[_current];
@@ -4101,10 +4101,10 @@ var collection;
let _LinkedCustomHashMap = _LinkedCustomHashMap$();
class LinkedHashMapCell extends core.Object {
LinkedHashMapCell(key, value) {
- this[_key] = key;
- this[_value] = value;
- this[_next] = null;
- this[_previous] = null;
+ dart.initField(LinkedHashMapCell, this, _key, key);
+ dart.initField(LinkedHashMapCell, this, _value, value);
+ dart.initField(LinkedHashMapCell, this, _next, null);
+ dart.initField(LinkedHashMapCell, this, _previous, null);
}
}
let LinkedHashMapKeyIterable$ = dart.generic(function(E) {
@@ -4145,10 +4145,10 @@ var collection;
let LinkedHashMapKeyIterator$ = dart.generic(function(E) {
class LinkedHashMapKeyIterator extends core.Object {
LinkedHashMapKeyIterator(map, modifications) {
- this[_map] = map;
- this[_modifications] = modifications;
- this[_cell] = null;
- this[_current] = null;
+ dart.initField(LinkedHashMapKeyIterator, this, _map, map);
+ dart.initField(LinkedHashMapKeyIterator, this, _modifications, modifications);
+ dart.initField(LinkedHashMapKeyIterator, this, _cell, null);
+ dart.initField(LinkedHashMapKeyIterator, this, _current, null);
this[_cell] = dart.as(dart.dload(this[_map], _first), LinkedHashMapCell);
}
get current() {
@@ -4481,10 +4481,10 @@ var collection;
let HashSetIterator$ = dart.generic(function(E) {
class HashSetIterator extends core.Object {
HashSetIterator(set, elements) {
- this[_set] = set;
- this[_elements] = elements;
- this[_offset] = 0;
- this[_current] = null;
+ dart.initField(HashSetIterator, this, _set, set);
+ dart.initField(HashSetIterator, this, _elements, elements);
+ dart.initField(HashSetIterator, this, _offset, 0);
+ dart.initField(HashSetIterator, this, _current, null);
}
get current() {
return this[_current];
@@ -4866,18 +4866,18 @@ var collection;
let _LinkedCustomHashSet = _LinkedCustomHashSet$();
class LinkedHashSetCell extends core.Object {
LinkedHashSetCell(element) {
- this[_element] = element;
- this[_next] = null;
- this[_previous] = null;
+ dart.initField(LinkedHashSetCell, this, _element, element);
+ dart.initField(LinkedHashSetCell, this, _next, null);
+ dart.initField(LinkedHashSetCell, this, _previous, null);
}
}
let LinkedHashSetIterator$ = dart.generic(function(E) {
class LinkedHashSetIterator extends core.Object {
LinkedHashSetIterator(set, modifications) {
- this[_set] = set;
- this[_modifications] = modifications;
- this[_cell] = null;
- this[_current] = null;
+ dart.initField(LinkedHashSetIterator, this, _set, set);
+ dart.initField(LinkedHashSetIterator, this, _modifications, modifications);
+ dart.initField(LinkedHashSetIterator, this, _cell, null);
+ dart.initField(LinkedHashSetIterator, this, _current, null);
this[_cell] = dart.as(dart.dload(this[_set], _first), LinkedHashSetCell);
}
get current() {
« no previous file with comments | « lib/runtime/dart/async.js ('k') | lib/runtime/dart/convert.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698