lib/runtime/dart/collection.js - Issue 1649583002: allow JS builtin to be typed as needed

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

Issue 1649583002: allow JS builtin to be typed as needed (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master

Patch Set: Created 4 years, 11 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

Index: lib/runtime/dart/collection.js

diff --git a/lib/runtime/dart/collection.js b/lib/runtime/dart/collection.js

index 6f31f0b17cff132fd040166e8fce97511e404b27..7992bb4381866269c086145abc9b4d26aaafaf07 100644

--- a/lib/runtime/dart/collection.js

+++ b/lib/runtime/dart/collection.js

@@ -4121,7 +4121,7 @@ dart_library.library('dart/collection', null, /* Imports */[

if (dart.notNull(index) < 0) return null;

this[_length] = dart.notNull(this[_length]) - 1;

this[_keys] = null;

- return dart.as(bucket.splice(index, 2)[1], V);

+ return bucket.splice(index, 2)[1];

}

clear() {

if (dart.notNull(this[_length]) > 0) {

@@ -4231,7 +4231,7 @@ dart_library.library('dart/collection', null, /* Imports */[

}

[_getBucket](table, key) {

let hash = this[_computeHashCode](key);

- return dart.as(table[hash], core.List);

+ return table[hash];

}

[_findBucketIndex](bucket, key) {

if (bucket == null) return -1;

@@ -4342,7 +4342,7 @@ dart_library.library('dart/collection', null, /* Imports */[

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 2) {

- if (dart.notNull(this[_equals](dart.as(bucket[i], K), dart.as(key, K)))) return i;

+ if (dart.notNull(this[_equals](bucket[i], dart.as(key, K)))) return i;

}

return -1;

}

@@ -4383,7 +4383,7 @@ dart_library.library('dart/collection', null, /* Imports */[

dart.as(f, dart.functionType(dart.void, [E]));

let keys = dart.as(dart.dsend(this[_map], _computeKeys), core.List);

for (let i = 0, length = keys.length; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- f(dart.as(keys[i], E));

+ f(keys[i]);

if (keys !== dart.dload(this[_map], _keys)) {

dart.throw(new core.ConcurrentModificationError(this[_map]));

}

@@ -4426,7 +4426,7 @@ dart_library.library('dart/collection', null, /* Imports */[

this[_current] = null;

return false;

} else {

- this[_current] = dart.as(keys[offset], E);

+ this[_current] = keys[offset];

this[_offset] = dart.notNull(offset) + 1;

return true;

}

@@ -4525,7 +4525,7 @@ dart_library.library('dart/collection', null, /* Imports */[

let bucket = this[_getBucket](rest, key);

let index = this[_findBucketIndex](bucket, key);

if (dart.notNull(index) < 0) return null;

- let cell = dart.as(bucket[index], LinkedHashMapCell);

+ let cell = bucket[index];

return dart.as(cell[_value], V);

}

set(key, value) {

@@ -4557,7 +4557,7 @@ dart_library.library('dart/collection', null, /* Imports */[

} else {

let index = this[_findBucketIndex](bucket, key);

if (dart.notNull(index) >= 0) {

- let cell = dart.as(bucket[index], LinkedHashMapCell);

+ let cell = bucket[index];

cell[_value] = value;

} else {

let cell = this[_newLinkedCell](key, value);

@@ -4588,7 +4588,7 @@ dart_library.library('dart/collection', null, /* Imports */[

let bucket = this[_getBucket](rest, key);

let index = this[_findBucketIndex](bucket, key);

if (dart.notNull(index) < 0) return null;

- let cell = dart.as(bucket.splice(index, 1)[0], LinkedHashMapCell);

+ let cell = bucket.splice(index, 1)[0];

this[_unlinkCell](cell);

return dart.as(cell[_value], V);

}

@@ -4686,13 +4686,13 @@ dart_library.library('dart/collection', null, /* Imports */[

}

[_getBucket](table, key) {

let hash = this[_computeHashCode](key);

- return dart.as(table[hash], core.List);

+ return table[hash];

}

[_findBucketIndex](bucket, key) {

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- let cell = dart.as(bucket[i], LinkedHashMapCell);

+ let cell = bucket[i];

if (dart.equals(cell[_key], key)) return i;

}

return -1;

@@ -4759,7 +4759,7 @@ dart_library.library('dart/collection', null, /* Imports */[

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- let cell = dart.as(bucket[i], LinkedHashMapCell);

+ let cell = bucket[i];

if (dart.notNull(core.identical(cell[_key], key))) return i;

}

return -1;

@@ -4801,7 +4801,7 @@ dart_library.library('dart/collection', null, /* Imports */[

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- let cell = dart.as(bucket[i], LinkedHashMapCell);

+ let cell = bucket[i];

if (dart.notNull(this[_equals](dart.as(cell[_key], K), dart.as(key, K)))) return i;

}

return -1;

@@ -5112,7 +5112,7 @@ dart_library.library('dart/collection', null, /* Imports */[

}

[_getBucket](table, element) {

let hash = this[_computeHashCode](element);

- return dart.as(table[hash], core.List);

+ return table[hash];

}

[_findBucketIndex](bucket, element) {

if (bucket == null) return -1;

@@ -5214,7 +5214,7 @@ dart_library.library('dart/collection', null, /* Imports */[

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- if (dart.notNull(this[_equality](dart.as(bucket[i], E), dart.as(element, E)))) return i;

+ if (dart.notNull(this[_equality](bucket[i], dart.as(element, E)))) return i;

}

return -1;

}

@@ -5270,7 +5270,7 @@ dart_library.library('dart/collection', null, /* Imports */[

this[_current] = null;

return false;

} else {

- this[_current] = dart.as(elements[offset], E);

+ this[_current] = elements[offset];

this[_offset] = dart.notNull(offset) + 1;

return true;

}

@@ -5416,7 +5416,7 @@ dart_library.library('dart/collection', null, /* Imports */[

let bucket = this[_getBucket](rest, object);

let index = this[_findBucketIndex](bucket, object);

if (dart.notNull(index) < 0) return false;

- let cell = dart.as(bucket.splice(index, 1)[0], LinkedHashSetCell);

+ let cell = bucket.splice(index, 1)[0];

this[_unlinkCell](cell);

return true;

}

@@ -5521,13 +5521,13 @@ dart_library.library('dart/collection', null, /* Imports */[

}

[_getBucket](table, element) {

let hash = this[_computeHashCode](element);

- return dart.as(table[hash], core.List);

+ return table[hash];

}

[_findBucketIndex](bucket, element) {

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- let cell = dart.as(bucket[i], LinkedHashSetCell);

+ let cell = bucket[i];

if (dart.equals(cell[_element], element)) return i;

}

return -1;

@@ -5605,7 +5605,7 @@ dart_library.library('dart/collection', null, /* Imports */[

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- let cell = dart.as(bucket[i], LinkedHashSetCell);

+ let cell = bucket[i];

if (dart.notNull(core.identical(cell[_element], element))) return i;

}

return -1;

@@ -5632,7 +5632,7 @@ dart_library.library('dart/collection', null, /* Imports */[

if (bucket == null) return -1;

let length = bucket.length;

for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {

- let cell = dart.as(bucket[i], LinkedHashSetCell);

+ let cell = bucket[i];

if (dart.notNull(this[_equality](dart.as(cell[_element], E), dart.as(element, E)))) return i;

}

return -1;

« no previous file with comments | « lib/runtime/dart/_native_typed_data.js ('k') | lib/runtime/dart/convert.js » ('j') | test/browser/language_tests.js » ('J')