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

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

Issue 1090313002: 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/_native_typed_data.js ('k') | lib/runtime/dart/collection.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/async.js
diff --git a/lib/runtime/dart/async.js b/lib/runtime/dart/async.js
index 1a903cf608c52099f578034ad25c200bb009cedd..15c5bd361976c27fabfbdf633ff1666af7eef2af 100644
--- a/lib/runtime/dart/async.js
+++ b/lib/runtime/dart/async.js
@@ -18,10 +18,18 @@ var async;
}
}
let _getBestStackTrace = Symbol('_getBestStackTrace');
+ let error$ = Symbol('error');
+ let stackTrace$ = Symbol('stackTrace');
class AsyncError extends core.Object {
+ get error() {
+ return this[error$];
+ }
+ get stackTrace() {
+ return this[stackTrace$];
+ }
AsyncError(error, stackTrace) {
- this.error = error;
- this.stackTrace = stackTrace;
+ this[error$] = error;
+ this[stackTrace$] = stackTrace;
}
toString() {
return this.error.toString();
@@ -846,13 +854,14 @@ var async;
let _removeAfterFiring = Symbol('_removeAfterFiring');
let _onPause = Symbol('_onPause');
let _onResume = Symbol('_onResume');
+ let _controller$ = Symbol('_controller');
let _onCancel = Symbol('_onCancel');
let _recordCancel = Symbol('_recordCancel');
let _recordPause = Symbol('_recordPause');
let _recordResume = Symbol('_recordResume');
+ let _STATE_CANCEL_ON_ERROR = Symbol('_STATE_CANCEL_ON_ERROR');
let _zone = Symbol('_zone');
let _state = Symbol('_state');
- let _STATE_CANCEL_ON_ERROR = Symbol('_STATE_CANCEL_ON_ERROR');
let _onData = Symbol('_onData');
let _onError = Symbol('_onError');
let _onDone = Symbol('_onDone');
@@ -1198,8 +1207,11 @@ var async;
let _BufferingStreamSubscription = _BufferingStreamSubscription$();
let _ControllerSubscription$ = dart.generic(function(T) {
class _ControllerSubscription extends _BufferingStreamSubscription$(T) {
+ get [_controller]() {
+ return this[_controller$];
+ }
_ControllerSubscription(controller, onData, onError, onDone, cancelOnError) {
- this[_controller] = controller;
+ this[_controller$] = controller;
super._BufferingStreamSubscription(onData, onError, onDone, cancelOnError);
}
[_onCancel]() {
@@ -1651,11 +1663,19 @@ var async;
return _DoneSubscription;
});
let _DoneSubscription = _DoneSubscription$();
+ let libraryName$ = Symbol('libraryName');
+ let uri$ = Symbol('uri');
class DeferredLibrary extends core.Object {
+ get libraryName() {
+ return this[libraryName$];
+ }
+ get uri() {
+ return this[uri$];
+ }
DeferredLibrary(libraryName, opts) {
let uri = opts && 'uri' in opts ? opts.uri : null;
- this.libraryName = libraryName;
- this.uri = uri;
+ this[libraryName$] = libraryName;
+ this[uri$] = uri;
}
load() {
throw 'DeferredLibrary not supported. ' + 'please use the `import "lib.dart" deferred as lib` syntax.';
@@ -1838,12 +1858,20 @@ var async;
return Future;
});
let Future = Future$();
+ let message$ = Symbol('message');
+ let duration$ = Symbol('duration');
class TimeoutException extends core.Object {
+ get message() {
+ return this[message$];
+ }
+ get duration() {
+ return this[duration$];
+ }
TimeoutException(message, duration) {
if (duration === void 0)
duration = null;
- this.message = message;
- this.duration = duration;
+ this[message$] = message;
+ this[duration$] = duration;
}
toString() {
let result = "TimeoutException";
@@ -3010,26 +3038,58 @@ var async;
return _AsyncStreamControllerDispatch;
});
let _AsyncStreamControllerDispatch = _AsyncStreamControllerDispatch$();
+ let _onListen$ = Symbol('_onListen');
+ let _onPause$ = Symbol('_onPause');
+ let _onResume$ = Symbol('_onResume');
+ let _onCancel$ = Symbol('_onCancel');
let _AsyncStreamController$ = dart.generic(function(T) {
class _AsyncStreamController extends dart.mixin(_StreamController$(T), _AsyncStreamControllerDispatch$(T)) {
+ get [_onListen]() {
+ return this[_onListen$];
+ }
+ get [_onPause]() {
+ return this[_onPause$];
+ }
+ get [_onResume]() {
+ return this[_onResume$];
+ }
+ get [_onCancel]() {
+ return this[_onCancel$];
+ }
_AsyncStreamController(onListen, onPause, onResume, onCancel) {
- this[_onListen] = onListen;
- this[_onPause] = onPause;
- this[_onResume] = onResume;
- this[_onCancel] = onCancel;
+ this[_onListen$] = onListen;
+ this[_onPause$] = onPause;
+ this[_onResume$] = onResume;
+ this[_onCancel$] = onCancel;
super._StreamController();
}
}
return _AsyncStreamController;
});
let _AsyncStreamController = _AsyncStreamController$();
+ let _onListen$0 = Symbol('_onListen');
+ let _onPause$0 = Symbol('_onPause');
+ let _onResume$0 = Symbol('_onResume');
+ let _onCancel$0 = Symbol('_onCancel');
let _SyncStreamController$ = dart.generic(function(T) {
class _SyncStreamController extends dart.mixin(_StreamController$(T), _SyncStreamControllerDispatch$(T)) {
+ get [_onListen]() {
+ return this[_onListen$0];
+ }
+ get [_onPause]() {
+ return this[_onPause$0];
+ }
+ get [_onResume]() {
+ return this[_onResume$0];
+ }
+ get [_onCancel]() {
+ return this[_onCancel$0];
+ }
_SyncStreamController(onListen, onPause, onResume, onCancel) {
- this[_onListen] = onListen;
- this[_onPause] = onPause;
- this[_onResume] = onResume;
- this[_onCancel] = onCancel;
+ this[_onListen$0] = onListen;
+ this[_onPause$0] = onPause;
+ this[_onResume$0] = onResume;
+ this[_onCancel$0] = onCancel;
super._StreamController();
}
}
@@ -3562,9 +3622,9 @@ var async;
return _BroadcastSubscriptionWrapper;
});
let _BroadcastSubscriptionWrapper = _BroadcastSubscriptionWrapper$();
+ let _STATE_FOUND = Symbol('_STATE_FOUND');
let _current = Symbol('_current');
let _futureOrPrefetch = Symbol('_futureOrPrefetch');
- let _STATE_FOUND = Symbol('_STATE_FOUND');
let _STATE_DONE = Symbol('_STATE_DONE');
let _STATE_MOVING = Symbol('_STATE_MOVING');
let _STATE_EXTRA_DATA = Symbol('_STATE_EXTRA_DATA');
@@ -4591,9 +4651,108 @@ var async;
}
}
_Zone[dart.implements] = () => [Zone];
- let _delegateCache = Symbol('_delegateCache');
+ let _runUnary$ = Symbol('_runUnary');
+ let _run$ = Symbol('_run');
+ let _runBinary$ = Symbol('_runBinary');
+ let _registerCallback$ = Symbol('_registerCallback');
+ let _registerUnaryCallback$ = Symbol('_registerUnaryCallback');
+ let _registerBinaryCallback$ = Symbol('_registerBinaryCallback');
+ let _errorCallback$ = Symbol('_errorCallback');
+ let _scheduleMicrotask$ = Symbol('_scheduleMicrotask');
+ let _createTimer$ = Symbol('_createTimer');
+ let _createPeriodicTimer$ = Symbol('_createPeriodicTimer');
+ let _print$ = Symbol('_print');
+ let _fork$ = Symbol('_fork');
+ let _handleUncaughtError$ = Symbol('_handleUncaughtError');
+ let parent$ = Symbol('parent');
let _map = Symbol('_map');
+ let _map$ = Symbol('_map');
+ let _delegateCache = Symbol('_delegateCache');
class _CustomZone extends _Zone {
+ get [_runUnary]() {
+ return this[_runUnary$];
+ }
+ set [_runUnary](value) {
+ this[_runUnary$] = value;
+ }
+ get [_run]() {
+ return this[_run$];
+ }
+ set [_run](value) {
+ this[_run$] = value;
+ }
+ get [_runBinary]() {
+ return this[_runBinary$];
+ }
+ set [_runBinary](value) {
+ this[_runBinary$] = value;
+ }
+ get [_registerCallback]() {
+ return this[_registerCallback$];
+ }
+ set [_registerCallback](value) {
+ this[_registerCallback$] = value;
+ }
+ get [_registerUnaryCallback]() {
+ return this[_registerUnaryCallback$];
+ }
+ set [_registerUnaryCallback](value) {
+ this[_registerUnaryCallback$] = value;
+ }
+ get [_registerBinaryCallback]() {
+ return this[_registerBinaryCallback$];
+ }
+ set [_registerBinaryCallback](value) {
+ this[_registerBinaryCallback$] = value;
+ }
+ get [_errorCallback]() {
+ return this[_errorCallback$];
+ }
+ set [_errorCallback](value) {
+ this[_errorCallback$] = value;
+ }
+ get [_scheduleMicrotask]() {
+ return this[_scheduleMicrotask$];
+ }
+ set [_scheduleMicrotask](value) {
+ this[_scheduleMicrotask$] = value;
+ }
+ get [_createTimer]() {
+ return this[_createTimer$];
+ }
+ set [_createTimer](value) {
+ this[_createTimer$] = value;
+ }
+ get [_createPeriodicTimer]() {
+ return this[_createPeriodicTimer$];
+ }
+ set [_createPeriodicTimer](value) {
+ this[_createPeriodicTimer$] = value;
+ }
+ get [_print]() {
+ return this[_print$];
+ }
+ set [_print](value) {
+ this[_print$] = value;
+ }
+ get [_fork]() {
+ return this[_fork$];
+ }
+ set [_fork](value) {
+ this[_fork$] = value;
+ }
+ get [_handleUncaughtError]() {
+ return this[_handleUncaughtError$];
+ }
+ set [_handleUncaughtError](value) {
+ this[_handleUncaughtError$] = value;
+ }
+ get parent() {
+ return this[parent$];
+ }
+ get [_map$]() {
+ return this[_map];
+ }
get [_delegate]() {
if (this[_delegateCache] != null)
return this[_delegateCache];
@@ -4601,21 +4760,21 @@ var async;
return this[_delegateCache];
}
_CustomZone(parent, specification, map) {
- this.parent = parent;
+ this[parent$] = parent;
this[_map] = map;
- this[_runUnary] = null;
- this[_run] = null;
- this[_runBinary] = null;
- this[_registerCallback] = null;
- this[_registerUnaryCallback] = null;
- this[_registerBinaryCallback] = null;
- this[_errorCallback] = null;
- this[_scheduleMicrotask] = null;
- this[_createTimer] = null;
- this[_createPeriodicTimer] = null;
- this[_print] = null;
- this[_fork] = null;
- this[_handleUncaughtError] = null;
+ this[_runUnary$] = null;
+ this[_run$] = null;
+ this[_runBinary$] = null;
+ this[_registerCallback$] = null;
+ this[_registerUnaryCallback$] = null;
+ this[_registerBinaryCallback$] = null;
+ this[_errorCallback$] = null;
+ this[_scheduleMicrotask$] = null;
+ this[_createTimer$] = null;
+ this[_createPeriodicTimer$] = null;
+ this[_print$] = null;
+ this[_fork$] = null;
+ this[_handleUncaughtError$] = null;
this[_delegateCache] = null;
super._Zone();
this[_run] = specification.run != null ? new _ZoneFunction(this, specification.run) : this.parent[_run];
@@ -4690,13 +4849,13 @@ var async;
}
}
get(key) {
- let result = this[_map].get(key);
- if (dart.notNull(result != null) || dart.notNull(this[_map].containsKey(key)))
+ let result = this[_map$].get(key);
+ if (dart.notNull(result != null) || dart.notNull(this[_map$].containsKey(key)))
return result;
if (this.parent != null) {
let value = this.parent.get(key);
if (value != null) {
- this[_map].set(key, value);
+ this[_map$].set(key, value);
}
return value;
}
@@ -4883,7 +5042,7 @@ var async;
let valueMap = null;
if (zoneValues == null) {
if (dart.is(zone, _Zone)) {
- valueMap = zone[_map];
+ valueMap = zone[_map$];
} else {
valueMap = new collection.HashMap();
}
@@ -4982,7 +5141,7 @@ var async;
get parent() {
return null;
}
- get [_map]() {
+ get [_map$]() {
return _RootZone[_rootMap];
}
get [_delegate]() {
« no previous file with comments | « lib/runtime/dart/_native_typed_data.js ('k') | lib/runtime/dart/collection.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698